Patch rtems-rc-19991117-9.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

to convert the libc directory to automake and "dozens of
small fixes for Makefile.ins/configure.ins below c/src/lib."

41 files changed, 67 insertions, 44 deletions

diff --git a/c/src/lib/libcpu/Makefile.in b/c/src/lib/libcpu/Makefile.in
index d527af8dc8..9594812447 100644
--- a/c/src/lib/libcpu/Makefile.in
+++ b/c/src/lib/libcpu/Makefile.in
@@ -7,6 +7,11 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = .
 
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
+
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
@@ -19,6 +24,18 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 SUBDIRS = $(wildcard $(RTEMS_CPU))
 
+#HACK: Don't let them fail here
+dist:
+distdir:
+
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(srcdir) && $(AUTOCONF)
diff --git a/c/src/lib/libcpu/hppa1.1/clock/Makefile.in b/c/src/lib/libcpu/hppa1.1/clock/Makefile.in
index 5670ecbcbd..67e5e01bfc 100644
--- a/c/src/lib/libcpu/hppa1.1/clock/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/hppa1.1/include/Makefile.in b/c/src/lib/libcpu/hppa1.1/include/Makefile.in
index 69962db1af..24734a0bc5 100644
--- a/c/src/lib/libcpu/hppa1.1/include/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/include/Makefile.in
@@ -13,7 +13,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-H_FILES = $(srcdir)/runway.h $(srcdir)/semaphore.h 
+H_FILES = $(srcdir)/runway.h $(srcdir)/semaphore.h
 
 SRCS = $(H_FILES)
 
@@ -23,7 +23,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
 
-INSTALLDIRS = $(PROJECT_INCLUDE)/hppa1.1
+INSTALLDIRS = $(PROJECT_INCLUDE)
 
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
diff --git a/c/src/lib/libcpu/hppa1.1/milli/Makefile.in b/c/src/lib/libcpu/hppa1.1/milli/Makefile.in
index 8c07e39d1a..f3df9c6b07 100644
--- a/c/src/lib/libcpu/hppa1.1/milli/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/milli/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
index 794de08314..78df5df270 100644
--- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in
@@ -37,7 +37,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
 
-INSTALLDIRS = $(PROJECT_INCLUDE)/hppa1.1
+INSTALLDIRS = $(PROJECT_INCLUDE)
 
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
@@ -59,7 +59,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/hppa1.1/timer/Makefile.in b/c/src/lib/libcpu/hppa1.1/timer/Makefile.in
index 08bbf81e83..fadc889d54 100644
--- a/c/src/lib/libcpu/hppa1.1/timer/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in
index f1a418ece2..c93e8e9a0d 100644
--- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in
+++ b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.in
@@ -61,7 +61,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/mips64orion/clock/Makefile.in b/c/src/lib/libcpu/mips64orion/clock/Makefile.in
index 5004fa945d..1b81495d54 100644
--- a/c/src/lib/libcpu/mips64orion/clock/Makefile.in
+++ b/c/src/lib/libcpu/mips64orion/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/mips64orion/timer/Makefile.in b/c/src/lib/libcpu/mips64orion/timer/Makefile.in
index 4f981a0df6..83b5d9f771 100644
--- a/c/src/lib/libcpu/mips64orion/timer/Makefile.in
+++ b/c/src/lib/libcpu/mips64orion/timer/Makefile.in
@@ -59,7 +59,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/Makefile.in b/c/src/lib/libcpu/powerpc/Makefile.in
index c1df8aea49..755737150c 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/Makefile.in
@@ -22,7 +22,7 @@ ifeq ($(wildcard $(RTEMS_CPU_MODEL)),$(RTEMS_CPU_MODEL))
 SHARED_LIB = shared
 endif 
 
-SUBDIRS =  $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup
+SUBDIRS = $(SHARED_LIB) $(wildcard $(RTEMS_CPU_MODEL)) wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.in b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.in
index 3b1b15f228..5046a93550 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.in b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.in
index 793c416887..7e34eee6c4 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc750/clock/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/clock/Makefile.in
index 0c3a02fb35..281fcbcf4a 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/clock/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/clock/Makefile.in
@@ -32,6 +32,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/libcpu
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in
index 702a1cc37c..a776f6477d 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in
@@ -63,7 +63,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 preinstall: $(INSTALLDIRS) $(H_FILES)
diff --git a/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in
index 274927c172..d56494a2f7 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in
@@ -63,7 +63,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 preinstall: $(INSTALLDIRS) $(H_FILES)
diff --git a/c/src/lib/libcpu/powerpc/mpc750/wrapup/Makefile.in b/c/src/lib/libcpu/powerpc/mpc750/wrapup/Makefile.in
index 20d9003998..1d5e480a5f 100644
--- a/c/src/lib/libcpu/powerpc/mpc750/wrapup/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc750/wrapup/Makefile.in
@@ -14,7 +14,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 VPATH = @srcdir@
 
 # PROC_SPECIFIC_O_PIECES = exceptions mmu clock
-PROC_SPECIFIC_O_PIECES = exceptions mmu 
+PROC_SPECIFIC_O_PIECES = exceptions mmu
 GENERIC_PIECES =
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
diff --git a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.in b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.in
index dfd133eaf1..f673eac6e4 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.in b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.in
index 06cb13abc5..1d1ff23889 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.in b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.in
index f1ef92cbe5..6a5762c3c8 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.in b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.in
index f3f8d2fd38..8ca776f4ab 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in
index 5ac2b435a0..a7c96691ef 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in
index 5bb92efb9e..87a24d51af 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in
index 2a52daf5d7..2fb7308cc5 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in
index 17c65db495..bb6bc888bc 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in
index df95503c19..81cd10c2f8 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in
index a4ae18f116..ee004019c3 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.in
index 9d8d10ee23..af8c0b4e70 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.in
@@ -63,7 +63,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in
index 68f727435c..c8215c3c83 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in
index e525c472a6..83770293c2 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in
index 5617ae594e..523533363f 100644
--- a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	${make-rel}
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.in b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.in
index 740015b9f7..a011997583 100644
--- a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.in b/c/src/lib/libcpu/sh/sh7032/include/Makefile.in
index fb379f14eb..4e6e7d1a82 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/include/Makefile.in
@@ -13,7 +13,7 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-H_FILES = $(srcdir)/null.h $(srcdir)/sci.h  $(srcdir)/sh7_pfc.h \
+H_FILES = $(srcdir)/null.h $(srcdir)/sci.h $(srcdir)/sh7_pfc.h \
     $(srcdir)/sh7_sci.h
 
 SRCS = $(H_FILES)
diff --git a/c/src/lib/libcpu/sh/sh7032/null/Makefile.in b/c/src/lib/libcpu/sh/sh7032/null/Makefile.in
index c7e0160feb..df868721a1 100644
--- a/c/src/lib/libcpu/sh/sh7032/null/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/null/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.in b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.in
index 2548c0b478..25dff54db7 100644
--- a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.in
@@ -6,7 +6,7 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ../../..
-subdir = sh/sh7045/sci
+subdir = sh/sh7032/sci
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -24,8 +24,8 @@ H_FILES =
 
 # Assembly source names, if any, go here -- minus the .s
 S_PIECES =
-S_FILES = $(S_PIECES:%=%.s)
-S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o)
+S_FILES = $(S_PIECES:%=%.S)
+S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS = $(C_FILES) $(H_FILES) $(S_FILES)
 OBJS = $(C_O_FILES) $(S_O_FILES)
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in
index ce19bbb25c..87ab7ebfee 100644
--- a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.in b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.in
index 9265994df8..c7804aad7a 100644
--- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	${make-rel}
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7045/null/Makefile.in b/c/src/lib/libcpu/sh/sh7045/null/Makefile.in
index 94b08d5a73..3f67f1653e 100644
--- a/c/src/lib/libcpu/sh/sh7045/null/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7045/null/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.in b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.in
index 2548c0b478..82a034ff17 100644
--- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.in b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.in
index 8bf33bee32..53e80340cd 100644
--- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.in
+++ b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+${PGM}: ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.in b/c/src/lib/libcpu/sparc/reg_win/Makefile.in
index 9218275812..0d2cbb5507 100644
--- a/c/src/lib/libcpu/sparc/reg_win/Makefile.in
+++ b/c/src/lib/libcpu/sparc/reg_win/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)
diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.in b/c/src/lib/libcpu/sparc/syscall/Makefile.in
index 88712707cd..044017f846 100644
--- a/c/src/lib/libcpu/sparc/syscall/Makefile.in
+++ b/c/src/lib/libcpu/sparc/syscall/Makefile.in
@@ -57,7 +57,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-${PGM}: ${SRCS} ${OBJS}
+$(PGM): ${OBJS}
 	$(make-rel)
 
 all: ${ARCH} $(SRCS) $(PGM)