diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-27 14:04:18 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-27 14:04:18 +0000 |
| commit | d16ca93e7a0940804c6a8155670b06e7aaaa25ed (patch) | |
| tree | 6e52d2b7fd9c06cfbd8d29e7eeb84d1d1c66ac11 | |
| parent | 2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d16ca93e7a0940804c6a8155670b06e7aaaa25ed.tar.bz2 | |
2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: add lib/libbsp to the GNU canonicalized
subdirectories, remove cfg_subdirs, cfg_subdirs1, hst_subdirs1.
* Makefile.am: remove cfg_subdirs, cfg_subdirs1, hst_subdirs1.
* ChangeLog: Fix typos.
| -rw-r--r-- | c/src/ChangeLog | 11 | ||||
| -rw-r--r-- | c/src/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/configure.in | 18 |
3 files changed, 16 insertions, 15 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 4794112c35..b8e6f79469 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,10 +1,17 @@ 2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - * configure.in: add tests to the GNU canonicalized subdirectories, + * configure.in: add lib/libbsp to the GNU canonicalized + subdirectories, remove cfg_subdirs, cfg_subdirs1, hst_subdirs1. + * Makefile.am: remove cfg_subdirs, cfg_subdirs1, hst_subdirs1. + * ChangeLog: Fix typos. + +2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.in: add tests to the GNU canonicalized subdirectories. 2000-10-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - * configure.in: add lib/libcpu to the GNU canonicalized subdirectories, + * configure.in: add lib/libcpu to the GNU canonicalized subdirectories. 2000-10-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/Makefile.am b/c/src/Makefile.am index 60eb2a19fd..cddba02b70 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = @cfg_subdirs1@ @hst_subdirs1@ @cfg_subdirs@ @hst_subdirs@ wrapup tests +SUBDIRS = make @hst_subdirs@ wrapup tests rtems_bspdir = $(prefix)/@RTEMS_BSP@ diff --git a/c/src/configure.in b/c/src/configure.in index 3d31842f28..784e2a1e5a 100644 --- a/c/src/configure.in +++ b/c/src/configure.in @@ -25,15 +25,16 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_NETWORKING(RTEMS_BSP) ## Note: the order of the directories below is essential -cfg_subdirs1="make" +AC_CONFIG_SUBDIRS(make) ## Exclude exec from building if multilibs are enabled if test x"$multilib" = x"no"; then -hst_subdirs1="$hst_subdirs1 exec" +hst_subdirs="$hst_subdirs exec" fi -hst_subdirs1="$hst_subdirs1 lib lib/libcpu" -cfg_subdirs="$cfg_subdirs lib/libbsp" -hst_subdirs="libfs" +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" if test "$RTEMS_CPU" != "unix"; then @@ -58,16 +59,9 @@ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then hst_subdirs="$hst_subdirs librtems++"; fi -RTEMS_CONFIG_HOST_SUBDIRS($hst_subdirs1) -AC_SUBST(hst_subdirs1) RTEMS_CONFIG_HOST_SUBDIRS($hst_subdirs) AC_SUBST(hst_subdirs) -AC_CONFIG_SUBDIRS($cfg_subdirs1) -AC_SUBST(cfg_subdirs1) -AC_CONFIG_SUBDIRS($cfg_subdirs) -AC_SUBST(cfg_subdirs) - RTEMS_CONFIG_HOST_SUBDIRS(tests) RTEMS_PROJECT_ROOT |