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

5 files changed, 29 insertions, 25 deletions

diff --git a/c/src/lib/libcpu/hppa1.1/clock/Makefile.am b/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
index 0bd02826f5..b79f23bd38 100644
--- a/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C source names
 C_FILES = clock.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
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = clock.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/include/Makefile.am b/c/src/lib/libcpu/hppa1.1/include/Makefile.am
index 5d9a1326c9..f99916c405 100644
--- a/c/src/lib/libcpu/hppa1.1/include/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/include/Makefile.am
@@ -5,21 +5,21 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = runway.h semaphore.h
-noinst_HEADERS = $(H_FILES)
 
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid 
 #       file name conflicts
 
-TMPINSTALL_FILES = \
-$(PROJECT_INCLUDE)/hppa1.1 \
-$(H_FILES:%=$(PROJECT_INCLUDE)/hppa1.1/%)
-
 $(PROJECT_INCLUDE)/hppa1.1:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/hppa1.1/%.h: %.h
 	$(INSTALL_DATA) $@ $<
 
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/hppa1.1 \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/hppa1.1/%.h)
+
 all-local: $(TMPINSTALL_FILES)
 
+EXTRA_DIST = runway.h semaphore.h
+
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/milli/Makefile.am b/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
index 3bb6ef40c6..d642f8ec89 100644
--- a/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/milli.rel
+PGM = $(ARCH)/milli.rel
 
-## Assembly source names
 S_FILES = milli.S
 
-milli_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o)
+milli_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(milli_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(milli_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(S_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = milli.S
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
index 9be0beb05f..96f8324776 100644
--- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/semaphore.rel
+PGM = $(ARCH)/semaphore.rel
 
-## C source names
 C_FILES = semaphore.c
 
-semaphore_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+semaphore_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(semaphore_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(semaphore_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = semaphore.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/timer/Makefile.am b/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
index 1fea2a053a..d586fcac77 100644
--- a/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C source names
 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
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(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