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/powerpc/mpc6xx/clock/Makefile.am    | 14 ++++++--------
 .../lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am | 20 ++++++++++----------
 c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am      | 18 +++++++++---------
 c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am    | 11 ++++++-----
 4 files changed, 31 insertions(+), 32 deletions(-)

(limited to 'c/src/lib/libcpu/powerpc/mpc6xx')

diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
index 2a775bc037..fb711f3414 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
@@ -4,13 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-## C sources
 C_FILES = c_clock.c
 
 H_FILES = c_clock.h
-noinst_HEADERS = $(H_FILES)
 
-c_clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -20,17 +18,17 @@ $(PROJECT_INCLUDE)/libcpu:
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
-$(PROJECT_INCLUDE)/libcpu/c_clock.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
 AM_CFLAGS = $(CFLAGS_OS_V)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(PROJECT_INCLUDE)/libcpu/c_clock.h
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
 
-EXTRA_DIST = $(C_FILES)
+EXTRA_DIST = c_clock.c c_clock.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
index 0bb6ba34be..e1aca735af 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
@@ -4,18 +4,16 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/exceptions.rel
+PGM = $(ARCH)/exceptions.rel
 
-## C sources
 C_FILES = raw_exception.c
 
-## Assembly sources
 S_FILES = asm_utils.S
 
 H_FILES = raw_exception.h
-noinst_HEADERS = $(H_FILES)
 
-exceptions_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+exceptions_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
@@ -25,9 +23,6 @@ $(PROJECT_INCLUDE)/libcpu:
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
-$(PROJECT_INCLUDE)/libcpu/raw_exception.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -37,8 +32,13 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(exceptions_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(PROJECT_INCLUDE)/libcpu/raw_exception.h
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
index 041881a756..0c3ee63743 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
@@ -4,18 +4,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/mmu.rel
+PGM = $(ARCH)/mmu.rel
 
-## C sources
 C_FILES = bat.c
 
-## Assembly sources
 S_FILES = mmuAsm.S
 
 H_FILES = bat.h
-noinst_HEADERS = $(H_FILES)
 
-mmu_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+mmu_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
@@ -25,8 +22,6 @@ $(PROJECT_INCLUDE)/libcpu:
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu $(PROJECT_INCLUDE)/libcpu/bat.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -36,8 +31,13 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(mmu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(PROJECT_INCLUDE)/libcpu/bat.h
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = bat.c bat.h mmuAsm.S
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
index 39f0c9f3b6..a8bfed1b4a 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C sources
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
-- 
cgit v1.2.3