From 4e36a2f133c68aaf637e166385eff1a05b59f38e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 31 Jan 2000 15:27:02 +0000 Subject: Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from Ralf Corsepius that contain: * Modifications, (minor) corrections, cleanups to most existing Makefile.ams * Adds automake support to all remaining BSPs which have not yet been converted to automake. * Makefile.am for all remaining wrapup/Makefile.ams --- c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libbsp/i386/ts_386ex/wrapup') diff --git a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am index 6bef023a8c..54941a5a93 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am @@ -11,12 +11,9 @@ NETWORK = network endif BSP_FILES = startup clock console timer $(NETWORK) -GENERIC_FILES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(GENERIC_FILES), \ - ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg @@ -26,7 +23,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(LIB): ${OBJS} +$(LIB): $(OBJS) $(make-library) $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB) @@ -34,6 +31,8 @@ $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a -all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES) + +.PRECIOUS: $(LIB) include $(top_srcdir)/../../../../../../automake/local.am -- cgit v1.2.3