1 files changed, 6 insertions, 23 deletions
diff --git a/c/src/lib/libcpu/configure.in b/c/src/lib/libcpu/configure.in
index 616bea9571..715e517fe3 100644
--- a/c/src/lib/libcpu/configure.in
+++ b/c/src/lib/libcpu/configure.in
@@ -7,37 +7,20 @@ AC_INIT(README)
 RTEMS_TOP(../../../..)
 AC_CONFIG_AUX_DIR(../../../..)
 
-AC_PROG_MAKE_SET
 RTEMS_CANONICAL_TARGET_CPU
-
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-RTEMS_ENABLE_BARE
-
-RTEMS_ENV_RTEMSBSP
-
-AC_PROG_INSTALL
-
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
 
-RTEMS_PROJECT_ROOT
-
-dnl check target cc
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_CANONICALIZE_TOOLS
-
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
 # find all the CPU dependent library Makefiles
 if test -f $srcdir/$RTEMS_CPU/configure.in; then
-  cfg_subdirs="$RTEMS_CPU"
-else
-  RTEMS_CHECK_MAKEFILE($RTEMS_CPU)
+  RTEMS_CPU_SUBDIR="$RTEMS_CPU"
 fi
-AC_CONFIG_SUBDIRS($cfg_subdirs)
+AC_SUBST(RTEMS_CPU_SUBDIR)
+
+AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR)
 
 AC_OUTPUT( 
-Makefile
-$makefiles)
+Makefile)