diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex')
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/clock/Makefile.am | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/console/Makefile.am | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/include/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/network/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/start/Makefile.am | 19 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/startup/Makefile.am | 27 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/timer/Makefile.am | 11 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.am | 11 |
8 files changed, 57 insertions, 56 deletions
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 |