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/libcpu/i386/Makefile.am | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'c/src/lib/libcpu/i386/Makefile.am')

diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index 983bd47e8f..ee4972ff64 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -8,43 +8,41 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 LIBNAME = libcpu
 LIB = $(ARCH)/$(LIBNAME).a
 
-# C source names, if any, go here -- minus the .c
 C_FILES = cpu.c displayCpu.c page.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = cpu.h registers.h cpuModel.h
-noinst_HEADERS = $(H_FILES)
 
-# Assembly source names, if any, go here -- minus the .s
 S_FILES = cpu_asm.S cpuModel.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
 
-$(LIB): ${OBJS}
+$(LIB): $(OBJS)
 	$(make-library)
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+.PRECIOUS: $(LIB)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = cpu.c cpu.h cpuModel.S cpuModel.h cpu_asm.S displayCpu.c page.c \
+    registers.h
 
 include $(top_srcdir)/../../../../../automake/local.am
-- 
cgit v1.2.3