diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-25 17:12:07 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-25 17:12:07 +0000 |
| commit | e590416ad91d64618749602cde0884d2f22a6bea (patch) | |
| tree | 5c56e8d9c7e3a2e886afb79a610fba8ab22aa487 /c/src | |
| parent | 2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-e590416ad91d64618749602cde0884d2f22a6bea.tar.bz2 | |
2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in, Makefile.am: add exec to the GNU canonicalized
subdirectories.
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/configure.in | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 671f9002ec..3072ebc390 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,10 @@ 2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.in, Makefile.am: add exec to the GNU canonicalized + subdirectories. + +2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * configure.in: add librtems++ to the GNU canonicalized subdirectories. 2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/Makefile.am b/c/src/Makefile.am index a5a84b0538..60eb2a19fd 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_subdirs@ @hst_subdirs@ wrapup tests +SUBDIRS = @cfg_subdirs1@ @hst_subdirs1@ @cfg_subdirs@ @hst_subdirs@ wrapup tests rtems_bspdir = $(prefix)/@RTEMS_BSP@ diff --git a/c/src/configure.in b/c/src/configure.in index 44da082d7f..1de90c394a 100644 --- a/c/src/configure.in +++ b/c/src/configure.in @@ -25,11 +25,11 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_NETWORKING(RTEMS_BSP) ## Note: the order of the directories below is essential -cfg_subdirs="make" +cfg_subdirs1="make" ## Exclude exec from building if multilibs are enabled if test x"$multilib" = x"no"; then -cfg_subdirs="$cfg_subdirs exec" +hst_subdirs1="$hst_subdirs1 exec" fi cfg_subdirs="$cfg_subdirs lib" cfg_subdirs="$cfg_subdirs lib/libcpu lib/libbsp" @@ -58,9 +58,13 @@ 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) |