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/i386ex/clock/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/i386ex/console/Makefile.am | 10 ++++--- c/src/lib/libbsp/i386/i386ex/include/Makefile.am | 6 ++--- c/src/lib/libbsp/i386/i386ex/network/Makefile.am | 18 ++++++------- c/src/lib/libbsp/i386/i386ex/start/Makefile.am | 19 +++++++------ c/src/lib/libbsp/i386/i386ex/startup/Makefile.am | 27 ++++++++++--------- c/src/lib/libbsp/i386/i386ex/timer/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/pc386/3c509/Makefile.am | 17 ++++++------ c/src/lib/libbsp/i386/pc386/clock/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/pc386/console/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/pc386/include/Makefile.am | 8 +++--- c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am | 13 ++++----- c/src/lib/libbsp/i386/pc386/start/Makefile.am | 31 +++++++++++----------- c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 21 +++++++-------- c/src/lib/libbsp/i386/pc386/timer/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am | 12 ++++----- c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/shared/comm/Makefile.am | 7 ++--- c/src/lib/libbsp/i386/shared/io/Makefile.am | 7 ++--- c/src/lib/libbsp/i386/shared/irq/Makefile.am | 7 ++--- c/src/lib/libbsp/i386/shared/pci/Makefile.am | 7 ++--- c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am | 11 ++++---- c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am | 10 ++++--- c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am | 8 +++--- c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am | 17 ++++++------ c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am | 19 +++++++------ c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am | 27 ++++++++++--------- c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am | 10 ++++--- c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am | 11 ++++---- 30 files changed, 205 insertions(+), 195 deletions(-) (limited to 'c/src/lib/libbsp/i386') diff --git a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am index cfcc5d0e38..016b81894f 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/clock.rel +PGM = $(ARCH)/clock.rel -## C source names C_FILES = ckinit.c -clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -20,11 +19,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(clock_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = ckinit.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am index 6a4eba54bd..13810f58b0 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.am @@ -6,12 +6,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 VPATH = @srcdir@:@srcdir@/../../shared/io -PGM = ${ARCH}/console.rel +PGM = $(ARCH)/console.rel ## sources C_FILES = console.c printk.c -console_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -23,11 +23,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(console_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = console.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am index fdc80607dc..43cf28d6c2 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am @@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = bsp.h coverhd.h -noinst_HEADERS = $(H_FILES) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -13,9 +12,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) all-local: $(PREINSTALL_FILES) +EXTRA_DIST = bsp.h coverhd.h + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am index a1d9825440..622d9ccfb3 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.am @@ -4,14 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/network.rel +PGM = $(ARCH)/network.rel -## C source names C_FILES = network.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = netexterns.h uti596.h -noinst_HEADERS = $(H_FILES) OBJS = $(C_O_FILES) @@ -22,17 +20,17 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): ${OBJS} +$(PGM): $(OBJS) $(make-rel) +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + if HAS_NETWORKING -all-local: ${ARCH} $(PGM) -else -all-local: +all-local: $(ARCH) $(OBJS) $(PGM) endif -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) +EXTRA_DIST = netexterns.h network.c uti596.h include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am index 27fc0369cc..00e98eb654 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.am @@ -1,17 +1,17 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -PGMS = ${ARCH}/start.o +PGMS = $(ARCH)/start.o -# Assembly source names, if any, go here -- minus the .S S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) H_FILES = 80386ex.h -noinst_HEADERS = $(H_FILES) + +OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -27,11 +27,10 @@ endif $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o -all-local: $(ARCH) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) -EXTRA_DIST = 80386ex.inc macros.inc start.S +EXTRA_DIST = 80386ex.h 80386ex.inc macros.inc start.S include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am index 0cfef970f2..b6bff49c66 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.am @@ -4,24 +4,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = \ - @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io +VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io -PGM = ${ARCH}/startup.rel +PGM = $(ARCH)/startup.rel -## C source names C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ - irq.c irq_init.c i386-stub.c i386-stub-glue.c uart.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + irq.c irq_init.c i386-stub.c i386-stub-glue.c uart.c \ + gnatinstallhandler.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -## Assembly source names S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -32,17 +30,20 @@ include $(RTEMS_ROOT)/make/leaf.cfg AM_CPPFLAGS += -DBSP_IS_I386EX=1 -$(PGM): ${startup_rel_OBJECTS} +$(PGM): $(startup_rel_OBJECTS) $(make-rel) $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(INSTALL_DATA) $< $@ +UNUSED_C_FILES = setvec.c + TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds -all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) -UNUSED_C_FILES = setvec.c -EXTRA_DIST = README bspstart.c linkcmds $(UNUSED_C_FILES) +.PRECIOUS: $(PGM) + +EXTRA_DIST = README bspstart.c linkcmds setvec.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am index 8f377f2007..5e87c956a3 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.am @@ -4,12 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/timer.rel +PGM = $(ARCH)/timer.rel -## sources C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -21,11 +20,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(timer_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = timer.c timerisr.S include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am index 6bef023a8c..54941a5a93 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/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 diff --git a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am index 3cf4acc84a..982f1d6b89 100644 --- a/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/3c509/Makefile.am @@ -4,14 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/3c509.rel +PGM = $(ARCH)/3c509.rel -## C source names C_FILES = 3c509.c elink.c -X3c509_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) H_FILES = 3c509.h elink.h -noinst_HEADERS = $(H_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -25,13 +23,16 @@ AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ $(PGM): $(X3c509_rel_OBJECTS) $(make-rel) -if HAS_NETWORKING -all-local: ${ARCH} $(PGM) -endif # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile -EXTRA_DIST = 3c509.c elink.c +if HAS_NETWORKING +all-local: $(ARCH) $(X3c509_rel_OBJECTS) $(PGM) +endif + +.PRECIOUS: $(PGM) + +EXTRA_DIST = 3c509.c 3c509.h elink.c elink.h include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am index ec33e3e531..c8a411e6de 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/clock/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/clock.rel +PGM = $(ARCH)/clock.rel -## C source names C_FILES = ckinit.c rtc.c -clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -20,11 +19,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(clock_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = ckinit.c rtc.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/console/Makefile.am b/c/src/lib/libbsp/i386/pc386/console/Makefile.am index 60af714fe3..1846bc26c1 100644 --- a/c/src/lib/libbsp/i386/pc386/console/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/console/Makefile.am @@ -6,13 +6,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 VPATH = @srcdir@:@srcdir@/../../shared/io -PGM = ${ARCH}/console.rel +PGM = $(ARCH)/console.rel -## sources C_FILES = console.c inch.c outch.c printk.c S_FILES = videoAsm.S -console_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -24,11 +23,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(console_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = console.c inch.c outch.c videoAsm.S include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.am b/c/src/lib/libbsp/i386/pc386/include/Makefile.am index e17a9968b1..332b5955cd 100644 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.am @@ -11,7 +11,6 @@ WD80X3 = wd80x3.h endif H_FILES = bsp.h crt.h $(WD80X3) -noinst_HEADERS = $(H_FILES) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -22,10 +21,11 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ -$(PROJECT_INCLUDE)/coverhd.h +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \ + $(PROJECT_INCLUDE)/coverhd.h all-local: $(PREINSTALL_FILES) +EXTRA_DIST = bsp.h crt.h wd80x3.h + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am index 0634c5a66f..e68eeeb6dc 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/ne2000.rel +PGM = $(ARCH)/ne2000.rel -## C source names C_FILES = ne2000.c -ne2000_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +ne2000_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -22,12 +21,14 @@ AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ $(PGM): $(ne2000_rel_OBJECTS) $(make-rel) +# the .rel file built here will be put into libbsp.a by +# ../wrapup/Makefile + if HAS_NETWORKING -all-local: ${ARCH} $(PGM) +all-local: $(ARCH) $(ne2000_rel_OBJECTS) $(PGM) endif -# the .rel file built here will be put into libbsp.a by -# ../wrapup/Makefile +.PRECIOUS: $(PGM) EXTRA_DIST = ne2000.c diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index 32ef8a28df..f8e467dab2 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -1,14 +1,15 @@ -# -# $Id$ -# +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 -PGMS = ${ARCH}/start.o ${ARCH}/start16.bin +PGMS = $(ARCH)/start.o $(ARCH)/start16.bin -# Assembly source names, if any, go here -- minus the .S S_FILES = start16.S start.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +OBJS = $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -23,25 +24,23 @@ endif LINKCMDS = $(top_srcdir)/startup/linkcmds -${ARCH}/start16.o: start16.S - ${COMPILE.S} $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $< +$(ARCH)/start16.o: start16.S + $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $< -${ARCH}/start16.bin: ${ARCH}/start16.o - $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \ - --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o +$(ARCH)/start16.bin: $(ARCH)/start16.o + $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o $(OBJCOPY) -O binary $(basename $@).obj $@ -$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: ${ARCH}/start16.bin +$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: $(ARCH)/start16.bin $(INSTALL_DATA) $< $@ $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \ -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \ + $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o -all-local: $(ARCH) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) EXTRA_DIST = start.S start16.S diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index aa01e3c529..ac225d520b 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -4,25 +4,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = \ - @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci +VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci -PGM = ${ARCH}/startup.rel +PGM = $(ARCH)/startup.rel -## C source names C_FILES = bsplibc.c bsppost.c bspstart.c exit.c irq.c irq_init.c bootcard.c \ main.c sbrk.c i386-stub.c i386-stub-glue.c uart.c pcibios.c \ gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -## Assembly source names S_FILES = ldsegs.S irq_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -32,7 +29,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg AM_CPPFLAGS += -DUSE_INIT_FINI -$(PGM): ${startup_rel_OBJECTS} +$(PGM): $(startup_rel_OBJECTS) $(make-rel) $(PROJECT_RELEASE)/lib/linkcmds: linkcmds @@ -40,8 +37,10 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds -all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) -EXTRA_DIST = bspstart.c exit.c sbrk.c ldsegs.S linkcmds +.PRECIOUS: $(PGM) + +EXTRA_DIST = bspstart.c exit.c ldsegs.S linkcmds sbrk.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am index 8f377f2007..5e87c956a3 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/timer/Makefile.am @@ -4,12 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/timer.rel +PGM = $(ARCH)/timer.rel -## sources C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -21,11 +20,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(timer_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = timer.c timerisr.S include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am index a38c375424..fafd810eb4 100644 --- a/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/wd8003.rel +PGM = $(ARCH)/wd8003.rel -## C source names C_FILES = wd8003.c -wd8003_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +wd8003_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -22,12 +21,13 @@ AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ $(PGM): $(wd8003_rel_OBJECTS) $(make-rel) +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + if HAS_NETWORKING -all-local: ${ARCH} $(PGM) +all-local: $(ARCH) $(wd8003_rel_OBJECTS) $(PGM) endif -# the .rel file built here will be put into libbsp.a by -# ../wrapup/Makefile +.PRECIOUS: $(PGM) EXTRA_DIST = wd8003.c diff --git a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am index 0454256b83..25c26d5fa9 100644 --- a/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am @@ -11,12 +11,9 @@ NETWORK = ne2000 wd8003 3c509 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 diff --git a/c/src/lib/libbsp/i386/shared/comm/Makefile.am b/c/src/lib/libbsp/i386/shared/comm/Makefile.am index a1b858529f..7ce8233a6e 100644 --- a/c/src/lib/libbsp/i386/shared/comm/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/comm/Makefile.am @@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = uart.h -noinst_HEADERS = $(H_FILES) C_FILES = i386-stub-glue.c i386-stub.c uart.c @@ -16,8 +15,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) -EXTRA_DIST = $(C_FILES) $(noinst_DATA) +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = GDB.HOWTO i386-stub-glue.c i386-stub.c uart.c uart.h include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/shared/io/Makefile.am b/c/src/lib/libbsp/i386/shared/io/Makefile.am index ca645178cb..4f8c55b1bd 100644 --- a/c/src/lib/libbsp/i386/shared/io/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/io/Makefile.am @@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = bspIo.h -noinst_HEADERS = $(H_FILES) C_FILES = printk.c @@ -14,8 +13,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) -EXTRA_DIST = $(C_FILES) +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = bspIo.h printk.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/shared/irq/Makefile.am b/c/src/lib/libbsp/i386/shared/irq/Makefile.am index f82e61db64..2984151f42 100644 --- a/c/src/lib/libbsp/i386/shared/irq/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/irq/Makefile.am @@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = irq.h irq_asm.h -noinst_HEADERS = $(H_FILES) C_FILES = irq.c irq_init.c S_FILES = irq_asm.S @@ -15,8 +14,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) -EXTRA_DIST = $(C_FILES) $(S_FILES) +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = irq.c irq.h irq_asm.S irq_asm.h irq_init.c include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/shared/pci/Makefile.am b/c/src/lib/libbsp/i386/shared/pci/Makefile.am index d5311ad210..c14031956d 100644 --- a/c/src/lib/libbsp/i386/shared/pci/Makefile.am +++ b/c/src/lib/libbsp/i386/shared/pci/Makefile.am @@ -5,7 +5,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = pcibios.h -noinst_HEADERS = $(H_FILES) C_FILES = pcibios.c @@ -14,8 +13,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) -EXTRA_DIST = $(C_FILES) +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = pcibios.c pcibios.h include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am index ec33e3e531..c8a411e6de 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/clock.rel +PGM = $(ARCH)/clock.rel -## C source names C_FILES = ckinit.c rtc.c -clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -20,11 +19,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(clock_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = ckinit.c rtc.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am index 6a4eba54bd..13810f58b0 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am @@ -6,12 +6,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 VPATH = @srcdir@:@srcdir@/../../shared/io -PGM = ${ARCH}/console.rel +PGM = $(ARCH)/console.rel ## sources C_FILES = console.c printk.c -console_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) +console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -23,11 +23,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(console_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = console.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am index 718cdd3acd..78f90cedb4 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am @@ -8,8 +8,7 @@ if HAS_NETWORKING NETWORK_H_FILES = wd80x3.h endif -H_FILES = bsp.h coverhd.h $(NETWORK_H_FILES) -noinst_HEADERS = $(H_FILES) +H_FILES = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES) $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -17,9 +16,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) \ -$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) all-local: $(PREINSTALL_FILES) +EXTRA_DIST = bsp.h coverhd.h wd80x3.h + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am index 2188e6cdf8..b8fef43a99 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am @@ -4,11 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/network.rel +PGM = $(ARCH)/network.rel -## C source names C_FILES = ne2000.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) OBJS = $(C_O_FILES) @@ -22,17 +21,17 @@ include $(top_srcdir)/../../../../../../automake/lib.am AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \ -DBOOTP_COMPAT -$(PGM): ${OBJS} +$(PGM): $(OBJS) $(make-rel) +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + if HAS_NETWORKING -all-local: ${ARCH} $(PGM) -else -all-local: +all-local: $(ARCH) $(OBJS) $(PGM) endif -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +.PRECIOUS: $(PGM) -EXTRA_DIST = $(C_FILES) +EXTRA_DIST = ne2000.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am index 303858640b..1770aeb84e 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/start/Makefile.am @@ -1,17 +1,17 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -PGMS = ${ARCH}/start.o +PGMS = $(ARCH)/start.o -# Assembly source names, if any, go here -- minus the .S S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) + +OBJS = $(S_O_FILES) H_FILES = 80386ex.h -noinst_HEADERS = $(H_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -27,11 +27,10 @@ endif $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o -all-local: $(ARCH) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) -EXTRA_DIST = 80386ex.inc macros.inc ts_1325.inc start.S +EXTRA_DIST = 80386ex.h 80386ex.inc macros.inc start.S ts_1325.inc include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am index 311b2c6d07..539d1eb519 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am @@ -4,24 +4,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 -VPATH = \ - @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io +VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io -PGM = ${ARCH}/startup.rel +PGM = $(ARCH)/startup.rel -## C source names C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ - irq.c irq_init.c i386-stub.c i386-stub-glue.c uart.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + irq.c irq_init.c i386-stub.c i386-stub-glue.c uart.c \ + gnatinstallhandler.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -## Assembly source names S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -32,17 +30,20 @@ include $(RTEMS_ROOT)/make/leaf.cfg AM_CPPFLAGS += -DUSE_INIT_FINI -$(PGM): ${startup_rel_OBJECTS} +$(PGM): $(startup_rel_OBJECTS) $(make-rel) $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(INSTALL_DATA) $< $@ +UNUSED_C_FILES = setvec.c + TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds -all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) -UNUSED_C_FILES = setvec.c -EXTRA_DIST = README bspstart.c linkcmds $(UNUSED_C_FILES) +.PRECIOUS: $(PGM) + +EXTRA_DIST = README bspstart.c linkcmds setvec.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am index 8f377f2007..b7655da651 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/timer.rel +PGM = $(ARCH)/timer.rel ## sources C_FILES = timer.c S_FILES = timerisr.S -timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o) +timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/lib.am @@ -21,11 +21,13 @@ include $(top_srcdir)/../../../../../../automake/lib.am $(PGM): $(timer_rel_OBJECTS) $(make-rel) -all-local: ${ARCH} $(PGM) - # the .rel file built here will be put into libbsp.a by # ../wrapup/Makefile +all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM) + +.PRECIOUS: $(PGM) + EXTRA_DIST = timer.c timerisr.S include $(top_srcdir)/../../../../../../automake/local.am 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