diff options
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libmisc/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libmisc/wrapup/Makefile.am | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index ff0043e6b0..64dc33bf1f 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/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/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am index ed6b42b9fc..c98725f2c1 100644 --- a/cpukit/libmisc/wrapup/Makefile.am +++ b/cpukit/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) $< $@ |