10 files changed, 74 insertions, 72 deletions
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