Changeset 4a2faa7c in rtems

Timestamp:

10/24/00 22:06:58 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a0756c9a

Parents:

7ec7cf7

Message:

2000-10-24 Ralf Corsepius <corsepiu@…>

• Makefile.am, acinclude.m4, configure.in: Introduce GNU canonicalization to libfs/. The approach is currently a bit of a hack as GNU canonicalization does not support the per-BSP build some of the other directories require. As more of the tree is converted, this will become less of an issue.

Location:

c/src

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• acinclude.m4 (added)
• configure.in (modified) (5 diffs)

c/src/ChangeLog

@@ +1 @@
+2000-10-24      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * Makefile.am, acinclude.m4, configure.in: Introduce GNU
+        canonicalization to libfs/.
+        The approach is currently a bit of a hack as GNU canonicalization
+        does not support the per-BSP build some of the other directories
+        require.  As more of the tree is converted, this will become less 
+        of an issue.
+
 2000-10-18      Joel Sherrill <joel@OARcorp.com>
 

c/src/Makefile.am

@@ -6 +6 @@
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = @cfg_subdirs@ wrapup tests
+SUBDIRS = @cfg_subdirs@ @hst_subdirs@ @cfg_subdirs2@ wrapup tests
 
 rtems_bspdir = $(prefix)/@RTEMS_BSP@

c/src/configure.in

@@ -27 +27 @@
 ## Note: the order of the directories below is essential
 cfg_subdirs="make"
+
 ## Exclude exec from building if multilibs are enabled
 if test x"$multilib" = x"no"; then
@@ -33 +34 @@
 cfg_subdirs="$cfg_subdirs lib"
 cfg_subdirs="$cfg_subdirs lib/libcpu lib/libbsp"
-cfg_subdirs="$cfg_subdirs libfs libmisc"
+hst_subdirs="libfs"
+cfg_subdirs2="libmisc"
 
 if test "$RTEMS_CPU" != "unix"; then
 ## HACK: Suppress libchip for unix
-cfg_subdirs="$cfg_subdirs libchip"
+cfg_subdirs2="$cfg_subdirs2 libchip"
 fi
 
 if test "$HAS_NETWORKING" = "yes"; then
-  cfg_subdirs="$cfg_subdirs libnetworking librpc"
+  cfg_subdirs2="$cfg_subdirs2 libnetworking librpc"
   if test "$RTEMS_HAS_RDBG" = "yes"; then
     RTEMS_CHECK_RDBG(RTEMS_BSP)
@@ -48 +50 @@
 
 if test "$HAS_RDBG" = "yes"; then
-  cfg_subdirs="$cfg_subdirs librdbg"
+  cfg_subdirs2="$cfg_subdirs2 librdbg"
 fi
 AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" )
@@ -54 +56 @@
 
 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
-  cfg_subdirs="$cfg_subdirs librtems++";
+  cfg_subdirs2="$cfg_subdirs2 librtems++";
 fi 
+
+RTEMS_CONFIG_HOST_SUBDIRS($hst_subdirs)
+AC_SUBST(hst_subdirs)
 
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 AC_SUBST(cfg_subdirs)
+
+AC_CONFIG_SUBDIRS($cfg_subdirs2)
+AC_SUBST(cfg_subdirs2)
+
 AC_CONFIG_SUBDIRS(tests)
 
@@ -71 +80 @@
 wrapup/Makefile
 )
+
+RTEMS_OUTPUT_HOST_SUBDIRS(RTEMS_HOST_SUBDIRS)