From 81d4759187ad0fa8e19f22c73a738f2553857286 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Oct 2001 13:31:45 +0000 Subject: 2001-10-16 Ralf Corsepius * configure.ac: Use AC_CONFIG_SUBDIRS for posix and itron. Reflect changes to configuration of rtems, score and sapi subdirs. --- cpukit/ChangeLog | 6 ++++++ cpukit/Makefile.am | 2 +- cpukit/configure.ac | 20 ++------------------ 3 files changed, 9 insertions(+), 19 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index b2646d62d7..f36deb433f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2001-10-16 Ralf Corsepius + + * configure.ac: Use AC_CONFIG_SUBDIRS for posix and itron. + Reflect changes to configuration of rtems, score and sapi subdirs. + * Makefile.am: require automake-1.5. + 2001-10-11 Ralf Corsepius * .cvsignore: Add autom4te.cache for autoconf > 2.52. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 537c7d7e6c..4886cff1e3 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../aclocal if HAS_POSIX diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 92969c9a83..ea637bdaf1 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -54,12 +54,11 @@ AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes") AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes") if test "$HAS_POSIX_API" = "yes"; then - cfg_subdirs="posix" + AC_CONFIG_SUBDIRS(posix) fi if test "$HAS_ITRON_API" = "yes"; then - cfg_subdirs="$cfg_subdirs itron" + AC_CONFIG_SUBDIRS(itron) fi -AC_CONFIG_SUBDIRS($cfg_subdirs) AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU) RTEMS_DEFINE_POSIX_API @@ -78,36 +77,21 @@ AC_CONFIG_FILES([Makefile rtems/Makefile rtems/src/Makefile rtems/include/Makefile -rtems/include/rtems/Makefile -rtems/include/rtems/rtems/Makefile rtems/optman/Makefile rtems/inline/Makefile -rtems/inline/rtems/Makefile -rtems/inline/rtems/rtems/Makefile rtems/macros/Makefile -rtems/macros/rtems/Makefile -rtems/macros/rtems/rtems/Makefile sapi/Makefile sapi/src/Makefile sapi/include/Makefile -sapi/include/rtems/Makefile sapi/include/rtems/sptables.h sapi/inline/Makefile -sapi/inline/rtems/Makefile sapi/macros/Makefile -sapi/macros/rtems/Makefile sapi/optman/Makefile score/Makefile score/cpu/Makefile score/include/Makefile -score/include/rtems/Makefile -score/include/rtems/score/Makefile score/inline/Makefile -score/inline/rtems/Makefile -score/inline/rtems/score/Makefile score/macros/Makefile -score/macros/rtems/Makefile -score/macros/rtems/score/Makefile score/src/Makefile wrapup/Makefile wrapup/rtems/Makefile -- cgit v1.2.3