diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-17 13:14:34 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-10-17 13:14:34 +0000 |
| commit | 8dc51855b95bc6e885ae0e84a900ed21d1a3f5df (patch) | |
| tree | d39cf388e8234e34a1ef1906b6400352c09e9c35 | |
| parent | 2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-8dc51855b95bc6e885ae0e84a900ed21d1a3f5df.tar.bz2 | |
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use SUBDIRS = @subdirs@, require automake-1.5.
* configure.ac: Replace hst_subdirs with AC_CONFIG_SUBDIRS to make
autoconf-2.52 happy.
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/configure.ac | 23 |
3 files changed, 18 insertions, 15 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 12ec2ee754..25d459dce4 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Use SUBDIRS = @subdirs@, require automake-1.5. + * configure.ac: Replace hst_subdirs with AC_CONFIG_SUBDIRS to make + autoconf-2.52 happy. + 2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * .cvsignore: Add autom4te.cache for autoconf > 2.52. diff --git a/c/src/Makefile.am b/c/src/Makefile.am index 717ad34e74..17bd0f578b 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -2,10 +2,10 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../aclocal -SUBDIRS = make @hst_subdirs@ wrapup tests +SUBDIRS = @subdirs@ # NOTE: The wildcard on the install should pick up everything except # the tests directory. This significantly minimizes the install size. diff --git a/c/src/configure.ac b/c/src/configure.ac index b20700ca69..b27605f9d8 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -30,39 +30,36 @@ AC_CONFIG_SUBDIRS(make) ## Exclude exec from building if multilibs are enabled if test x"$multilib" = x"no"; then -hst_subdirs="$hst_subdirs exec" +AC_CONFIG_SUBDIRS(exec) fi -hst_subdirs="$hst_subdirs lib" -hst_subdirs="$hst_subdirs lib/libcpu" -hst_subdirs="$hst_subdirs lib/libbsp" -hst_subdirs="$hst_subdirs libfs" -hst_subdirs="$hst_subdirs libmisc" +AC_CONFIG_SUBDIRS(lib) +AC_CONFIG_SUBDIRS(lib/libcpu) +AC_CONFIG_SUBDIRS(lib/libbsp) +AC_CONFIG_SUBDIRS(libfs) +AC_CONFIG_SUBDIRS(libmisc) if test "$RTEMS_CPU" != "unix"; then ## HACK: Suppress libchip for unix -hst_subdirs="$hst_subdirs libchip" + AC_CONFIG_SUBDIRS(libchip) fi if test "$HAS_NETWORKING" = "yes"; then - hst_subdirs="$hst_subdirs libnetworking librpc" + AC_CONFIG_SUBDIRS(libnetworking librpc) if test "$RTEMS_HAS_RDBG" = "yes"; then RTEMS_CHECK_RDBG(RTEMS_BSP) fi fi if test "$HAS_RDBG" = "yes"; then - hst_subdirs="$hst_subdirs librdbg" + AC_CONFIG_SUBDIRS(librdbg) fi AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" ) AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" ) if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then - hst_subdirs="$hst_subdirs librtems++"; + AC_CONFIG_SUBDIRS(librtems++) fi -AC_CONFIG_SUBDIRS($hst_subdirs) -AC_SUBST(hst_subdirs) - AC_CONFIG_SUBDIRS(wrapup tests) RTEMS_PROJECT_ROOT |