RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-09-14 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2001-09-21 14:02:27 +00:00
parent ed13346130
commit 2543311206
6 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/libmisc/ChangeLog
View File

@@ -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

4
c/src/libmisc/configure.in
View File

@@ -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(

3
c/src/libmisc/rootfs/Makefile.am
View File

@@ -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)

6
c/src/libmisc/wrapup/Makefile.am
View File

@@ -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) $< $@