From 2543311206e8f64cddd8a633e3f145aadd262712 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 21 Sep 2001 14:02:27 +0000 Subject: 2001-09-14 Joel Sherrill * 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. --- c/src/libmisc/wrapup/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'c/src/libmisc/wrapup/Makefile.am') 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) $< $@ -- cgit v1.2.3