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.
	* mpc8xx/exceptions/Makefile.am: Remove.
	* mpc8xx/mmu/Makefile.am: Remove.
	* mpc8xx/timer/Makefile.am: Remove.
	* mpc8xx/Makefile.am: Merge-in Makefile.ams above.
	* configure.ac: Reflect changes to mpc8xx/Makefile.ams.

9 files changed, 131 insertions, 181 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 0ccc85d625..2ba2a1776f 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,5 +1,16 @@
 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.
+	* mpc8xx/exceptions/Makefile.am: Remove.
+	* mpc8xx/mmu/Makefile.am: Remove.
+	* mpc8xx/timer/Makefile.am: Remove.
+	* mpc8xx/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>
+
 	* configure.ac: Remove mpc6xx/*/Makefile,  mpc8260/*/Makefile.
 
 2003-12-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac
index 55b14fec0e..53526ba562 100644
--- a/c/src/lib/libcpu/powerpc/configure.ac
+++ b/c/src/lib/libcpu/powerpc/configure.ac
@@ -52,12 +52,6 @@ mpc505/timer/Makefile
 mpc505/vectors/Makefile
 mpc505/ictrl/Makefile
 mpc8xx/Makefile
-mpc8xx/clock/Makefile
-mpc8xx/console-generic/Makefile
-mpc8xx/cpm/Makefile
-mpc8xx/exceptions/Makefile
-mpc8xx/mmu/Makefile
-mpc8xx/timer/Makefile
 ppc403/Makefile
 ppc403/clock/Makefile
 ppc403/console/Makefile
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
index af7b86fffa..3910d15aa4 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
@@ -2,13 +2,124 @@
 ## $Id$
 ##
 
-SUBDIRS = . console-generic clock timer cpm mmu exceptions
+CLEANDIRS =
+EXTRA_DIST =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 include_mpc8xxdir = $(includedir)/mpc8xx
 
 include_HEADERS = include/mpc8xx.h
 include_mpc8xx_HEADERS = include/console.h include/cpm.h include/mmu.h
 
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS = exceptions/raw_exception.h
+
+## clock
+clock_C_FILES = clock/clock.c
+EXTRA_DIST += $(clock_C_FILES)
+
+clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=clock/${ARCH}/%.$(OBJEXT))
+
+clock/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) clock/$(ARCH)
+	@: > clock/$(ARCH)/$(dirstamp)
+clock/$(ARCH)/%.$(OBJEXT): clock/%.c clock/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+clock/$(ARCH)/clock.rel: $(clock_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += clock/o-optimize clock/o-debug
+noinst_DATA += clock/$(ARCH)/clock.rel
+
+## console-generic
+console_C_FILES = console-generic/console-generic.c
+EXTRA_DIST += $(console_C_FILES)
+
+console_rel_OBJECTS = \
+    $(console_C_FILES:console-generic/%.c=console-generic/${ARCH}/%.$(OBJEXT))
+
+console-generic/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) console-generic/$(ARCH)
+	@: > console-generic/$(ARCH)/$(dirstamp)
+console-generic/$(ARCH)/%.$(OBJEXT): console-generic/%.c console-generic/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+console-generic/$(ARCH)/console-generic.rel: $(console_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += console-generic/o-optimize console-generic/o-debug
+noinst_DATA += console-generic/$(ARCH)/console-generic.rel
+
+## cpm
+cpm_C_FILES = cpm/cp.c cpm/dpram.c
+EXTRA_DIST += $(cpm_C_FILES)
+
+cpm_rel_OBJECTS = $(cpm_C_FILES:cpm/%.c=cpm/${ARCH}/%.$(OBJEXT))
+
+cpm/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) cpm/$(ARCH)
+	@: > cpm/$(ARCH)/$(dirstamp)
+cpm/$(ARCH)/%.$(OBJEXT): cpm/%.c cpm/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+cpm/$(ARCH)/cpm.rel: $(cpm_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += cpm/o-optimize cpm/o-debug
+noinst_DATA += cpm/$(ARCH)/cpm.rel
+
+## exceptions
+exceptions_C_FILES = exceptions/raw_exception.c
+exceptions_S_FILES = exceptions/asm_utils.S
+EXTRA_DIST += $(exceptions_C_FILES) $(exceptions_S_FILES)
+
+exceptions_rel_OBJECTS = \
+    $(exceptions_C_FILES:exceptions/%.c=exceptions/$(ARCH)/%.$(OBJEXT)) \
+    $(exceptions_S_FILES:exceptions/%.S=exceptions/$(ARCH)/%.$(OBJEXT))
+
+exceptions/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) exceptions/$(ARCH)
+	@: > exceptions/$(ARCH)/$(dirstamp)
+exceptions/$(ARCH)/%.$(OBJEXT): exceptions/%.c exceptions/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+exceptions/$(ARCH)/%.$(OBJEXT): exceptions/%.S exceptions/$(ARCH)/$(dirstamp)
+	${CCASCOMPILE} -o $@ -c $<
+exceptions/$(ARCH)/exceptions.rel: $(exceptions_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += exceptions/o-optimize exceptions/o-debug
+noinst_DATA += exceptions/$(ARCH)/exceptions.rel
+
+## mmu
+mmu_C_FILES = mmu/mmu.c
+EXTRA_DIST += $(mmu_C_FILES)
+
+mmu_rel_OBJECTS = $(mmu_C_FILES:mmu/%.c=mmu/${ARCH}/%.$(OBJEXT))
+
+mmu/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) mmu/$(ARCH)
+	@: > mmu/$(ARCH)/$(dirstamp)
+mmu/$(ARCH)/%.$(OBJEXT): mmu/%.c mmu/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+mmu/$(ARCH)/mmu.rel: $(mmu_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += mmu/o-optimize mmu/o-debug
+noinst_DATA += mmu/$(ARCH)/mmu.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
+
+## --
 all-local: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
@@ -37,5 +148,12 @@ $(PROJECT_INCLUDE)/mpc8xx/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/mpc8xx/$(dirst
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/mmu.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/mmu.h
 
-include $(top_srcdir)/../../../automake/subdirs.am
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/raw_exception.h: exceptions/raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
deleted file mode 100644
index 7546da1651..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/clock.rel
-
-## C sources
-C_FILES = clock.c
-
-clock_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): $(clock_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PGM)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
deleted file mode 100644
index 2d59191662..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/console-generic.rel
-
-## C sources
-C_FILES = console-generic.c
-
-console_generic_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): $(console_generic_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PGM)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
deleted file mode 100644
index ba671d0aed..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/cp.rel
-
-## C sources
-C_FILES = cp.c dpram.c
-
-clock_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): $(clock_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PGM)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
deleted file mode 100644
index 119db740ca..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/exceptions.rel
-
-C_FILES = raw_exception.c
-
-S_FILES = asm_utils.S
-
-include_libcpudir = $(includedir)/libcpu
-include_libcpu_HEADERS = raw_exception.h
-
-exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
-    $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(PGM): $(exceptions_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
-
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
-	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
-$(PROJECT_INCLUDE)/libcpu/raw_exception.h: raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
deleted file mode 100644
index ce99af3358..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/mmu.rel
-
-## C sources
-C_FILES = mmu.c
-
-clock_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): $(clock_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PGM)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
deleted file mode 100644
index a7d562c8c9..0000000000
--- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/timer.rel
-
-## C sources
-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: $(PGM)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/../../../automake/local.am