summaryrefslogtreecommitdiffstats
path: root/c/src/libmisc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-21 14:02:27 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-21 14:02:27 +0000
commit2543311206e8f64cddd8a633e3f145aadd262712 (patch)
tree3d7ad2ed749e4c9b4f5d68c4e1a2bce77f11a0b8 /c/src/libmisc
parented13346130e127a28aa93f78cb2182dd01c98102 (diff)
downloadrtems-2543311206e8f64cddd8a633e3f145aadd262712.tar.bz2
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.
Diffstat (limited to 'c/src/libmisc')
-rw-r--r--c/src/libmisc/ChangeLog7
-rw-r--r--c/src/libmisc/configure.in4
-rw-r--r--c/src/libmisc/rootfs/Makefile.am3
-rw-r--r--c/src/libmisc/wrapup/Makefile.am6
4 files changed, 18 insertions, 2 deletions
diff --git a/c/src/libmisc/ChangeLog b/c/src/libmisc/ChangeLog
index ff0043e6b0..64dc33bf1f 100644
--- a/c/src/libmisc/ChangeLog
+++ b/c/src/libmisc/ChangeLog
@@ -1,3 +1,10 @@
+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>
* Added support for populating the initial "root" filesystem
diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in
index 0ddca985dd..9665269699 100644
--- a/c/src/libmisc/configure.in
+++ b/c/src/libmisc/configure.in
@@ -13,9 +13,9 @@ AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
RTEMS_ENABLE_BARE
+RTEMS_ENABLE_NETWORKING
RTEMS_ENV_RTEMSBSP
-
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
@@ -26,8 +26,10 @@ RTEMS_CANONICALIZE_TOOLS
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
AC_OUTPUT(
diff --git a/c/src/libmisc/rootfs/Makefile.am b/c/src/libmisc/rootfs/Makefile.am
index 891cbd88e1..28a4fd4b5a 100644
--- a/c/src/libmisc/rootfs/Makefile.am
+++ b/c/src/libmisc/rootfs/Makefile.am
@@ -15,6 +15,7 @@ H_FILES = mkrootfs.h
OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
$(PROJECT_INCLUDE)/rtems:
@@ -32,7 +33,9 @@ $(LIB): $(OBJS)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+if HAS_NETWORKING
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am
index ed6b42b9fc..c98725f2c1 100644
--- a/c/src/libmisc/wrapup/Makefile.am
+++ b/c/src/libmisc/wrapup/Makefile.am
@@ -11,12 +11,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
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 \
../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
../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)
$(INSTALL_DATA) $< $@