Changeset 2543311 in rtems

Timestamp:

09/21/01 14:02:27 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ceb9f8f

Parents:

ed13346

Message:

2001-09-14 Joel Sherrill <joel@…>

• configure.in, rootfs/Makefile.am: Added conditional to make sure rootfs does not get built with networking is disabled. Also added include of compile.am to rootfs/Makefile.am.
• wrapup/Makefile.am: Added rootfs conditionally if networking enabled.

Files:

• c/src/libmisc/ChangeLog (modified) (1 diff)
• c/src/libmisc/configure.in (modified) (2 diffs)
• c/src/libmisc/rootfs/Makefile.am (modified) (2 diffs)
• c/src/libmisc/wrapup/Makefile.am (modified) (2 diffs)
• cpukit/libmisc/ChangeLog (modified) (1 diff)
• cpukit/libmisc/wrapup/Makefile.am (modified) (2 diffs)

c/src/libmisc/ChangeLog

@@ +1 @@
+2001-09-14      Joel Sherrill <joel@OARcorp.com>
+
+        * configure.in, rootfs/Makefile.am: Added conditional to make sure
+        rootfs does not get built with networking is disabled.  Also
+        added include of compile.am to rootfs/Makefile.am.
+        * wrapup/Makefile.am: Added rootfs conditionally if networking enabled.
+
 2001-09-19      Chris Johns <ccj@acm.org>
 

c/src/libmisc/configure.in

@@ -14 +14 @@
 
 RTEMS_ENABLE_BARE
+RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
-
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
@@ -27 +27 @@
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
 
 AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes")
 
 # Explicitly list all Makefiles here

c/src/libmisc/rootfs/Makefile.am

@@ -16 +16 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -33 +34 @@
     $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
 
+if HAS_NETWORKING
 all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+endif
 
 .PRECIOUS: $(LIB)

c/src/libmisc/wrapup/Makefile.am

@@ -12 +12 @@
 include $(top_srcdir)/../../../automake/lib.am
 
+if HAS_NETWORKING
+NETLIBS=../rootfs/$(ARCH)/librootfs-tmp.a
+endif
+
 TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
     ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
@@ -17 +21 @@
     ../shell/$(ARCH)/libshell-tmp.a \
     ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a ../devnull/$(ARCH)/libdevnull-tmp.a \
-    ../mw-fb/$(ARCH)/libmw-fb-tmp.a
+    ../mw-fb/$(ARCH)/libmw-fb-tmp.a $(NETLIBS)
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)

cpukit/libmisc/ChangeLog

@@ +1 @@
+2001-09-14      Joel Sherrill <joel@OARcorp.com>
+
+        * configure.in, rootfs/Makefile.am: Added conditional to make sure
+        rootfs does not get built with networking is disabled.  Also
+        added include of compile.am to rootfs/Makefile.am.
+        * wrapup/Makefile.am: Added rootfs conditionally if networking enabled.
+
 2001-09-19      Chris Johns <ccj@acm.org>
 

cpukit/libmisc/wrapup/Makefile.am

@@ -12 +12 @@
 include $(top_srcdir)/../../../automake/lib.am
 
+if HAS_NETWORKING
+NETLIBS=../rootfs/$(ARCH)/librootfs-tmp.a
+endif
+
 TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
     ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
@@ -17 +21 @@
     ../shell/$(ARCH)/libshell-tmp.a \
     ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a ../devnull/$(ARCH)/libdevnull-tmp.a \
-    ../mw-fb/$(ARCH)/libmw-fb-tmp.a
+    ../mw-fb/$(ARCH)/libmw-fb-tmp.a $(NETLIBS)
 
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)