From 4e36a2f133c68aaf637e166385eff1a05b59f38e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
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 <corsepiu@faw.uni-ulm.de> 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/pc386/start/Makefile.am | 31 +++++++++++++--------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'c/src/lib/libbsp/i386/pc386/start/Makefile.am')

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
 
-- 
cgit v1.2.3