5 files changed, 79 insertions, 94 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 2ba2a1776f..28d3d8f157 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,5 +1,13 @@
 2003-12-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* mpc505/ictrl/Makefile.am: Remove.
+	* mpc505/timer/Makefile.am: Remove.
+	* mpc505/vectors/Makefile.am: Remove.
+	* mpc505/Makefile.am: Merge-in Makefile.ams above.
+	* configure.ac: Reflect changes to mpc8xx/Makefile.ams.
+
+2003-12-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* mpc8xx/clock/Makefile.am: Remove.
 	* mpc8xx/console-generic/Makefile.am: Remove.
 	* mpc8xx/cpm/Makefile.am: Remove.
diff --git a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
index fe5d626d4f..3e6bac1b71 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
@@ -2,7 +2,76 @@
 ## $Id$
 ##
 
-SUBDIRS = ictrl vectors timer
+CLEANDIRS =
+EXTRA_DIST =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = ictrl/ictrl.h
+
+# ictrl
+ictrl_C_FILES = ictrl/ictrl.c
+EXTRA_DIST += $(ictrl_C_FILES)
+
+ictrl_rel_OBJECTS = $(ictrl_C_FILES:ictrl/%.c=icrtl/$(ARCH)/%.$(OBJEXT))
+
+ictrl/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) ictrl/$(ARCH)
+	@: > ictrl/$(ARCH)/$(dirstamp)
+ictrl/$(ARCH)/%.$(OBJEXT): ictrl/%.c ictrl/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+ictrl/$(ARCH)/ictrl.rel: $(ictrl_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += ictrl/o-optimize ictrl/o-debug
+noinst_DATA += ictrl/$(ARCH)/ictrl.rel
+
+## timer
+timer_C_FILES = timer/timer.c
+EXTRA_DIST += $(timer_C_FILES)
+
+timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=timer/$(ARCH)/%.$(OBJEXT))
+
+timer/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) timer/$(ARCH)
+	@: > timer/$(ARCH)/$(dirstamp)
+timer/$(ARCH)/%.$(OBJEXT): timer/%.c timer/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+timer/$(ARCH)/timer.rel: $(timer_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += timer/o-optimize timer/o-debug
+noinst_DATA += timer/$(ARCH)/timer.rel
+
+## vector
+vectors_S_FILES = vectors.S
+EXTRA_DIST += $(vectors_S_FILES)
+
+vectors_rel_OBJECTS = \
+    $(vectors_S_FILES:vectors/%.S=vectors/${ARCH}/%.$(OBJEXT))
+
+vectors/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) vectors/$(ARCH)
+	@: > vectors/$(ARCH)/$(dirstamp)
+vectors/$(ARCH)/%.$(OBJEXT): vectors/%.S vectors/$(ARCH)/$(dirstamp)
+	${CCASCOMPILE} -o $@ -c $<
+vectors/$(ARCH)/vectors.rel: $(vectors_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += vectors/o-optimize vectors/o-debug
+noinst_DATA += vectors/$(ARCH)/vectors.rel
+
+## --
+
+all-local: $(PREINSTALL_FILES)
+
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/ictrl.h: ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
 
-include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
deleted file mode 100644
index 64fb3c80d3..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/ictrl.rel
-
-C_FILES = ictrl.c
-
-include_HEADERS = ictrl.h
-
-ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(ictrl_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = ictrl.c ictrl.h
-
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/ictrl.h: ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
deleted file mode 100644
index 1aa152675d..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/timer.rel
-
-C_FILES = timer.c
-
-timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(timer_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(timer_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = timer.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
deleted file mode 100644
index 10c36ba3da..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/vectors.rel
-
-## Assembly sources
-S_FILES = vectors.S
-
-vectors_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(vectors_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PGM)
-
-EXTRA_DIST = vectors.S
-
-include $(top_srcdir)/../../../automake/local.am