2003-12-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* mpc8260/clock/Makefile.am: Remove.
	* mpc8260/console-generic/Makefile.am: Remove.
	* mpc8260/cpm/Makefile.am: Remove.
	* mpc8260/exceptions/Makefile.am: Remove.
	* mpc8260/mmu/Makefile.am: Remove.
	* mpc8260/timer/Makefile.am: Remove.
	* mpc8260/Makefile.am: Merge-in Makefile.ams above.

c/src/lib/libcpu/powerpc/ChangeLog

@@ -1,3 +1,13 @@
+2003-12-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* mpc8260/clock/Makefile.am: Remove.
+	* mpc8260/console-generic/Makefile.am: Remove.
+	* mpc8260/cpm/Makefile.am: Remove.
+	* mpc8260/exceptions/Makefile.am: Remove.
+	* mpc8260/mmu/Makefile.am: Remove.
+	* mpc8260/timer/Makefile.am: Remove.
+	* mpc8260/Makefile.am: Merge-in Makefile.ams above.
+
 2003-12-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* shared/include/Makefile.am: Remove.

c/src/lib/libcpu/powerpc/mpc8260/Makefile.am

@@ -2,14 +2,123 @@
 ## $Id$
 ##
 
-SUBDIRS = . console-generic clock timer exceptions mmu cpm
+EXTRA_DIST =
+CLEANDIRS =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
 
 include_mpc8260dir = $(includedir)/mpc8260
 
 include_HEADERS = include/mpc8260.h
 include_mpc8260_HEADERS = include/console.h include/mmu.h include/cpm.h
 
-all-local: $(PREINSTALL_FILES)
+include_libcpudir = $(includedir)/libcpu
+include_libcpu_HEADERS = exceptions/raw_exception.h
+
+## 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
+
+## 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
+
+## cpm
+cpm_C_FILES = cpm/cp.c cpm/dpram.c cpm/brg.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)/cp.rel: $(cpm_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += cpm/o-optimize cpm/o-debug
+noinst_DATA += cpm/$(ARCH)/cp.rel
+
+## exceptions
+exceptions_C_FILES = exceptions/raw_exception.c
+exceptions_S_FILES = exceptions/asm_utils.S
+
+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
+
+## --
 
 PREINSTALL_FILES =
 
@@ -37,5 +146,12 @@ $(PROJECT_INCLUDE)/mpc8260/cpm.h: include/cpm.h $(PROJECT_INCLUDE)/mpc8260/$(dir
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/cpm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/cpm.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

c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am

@@ -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

c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am

@@ -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

c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am

@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/cp.rel
-
-## C sources
-C_FILES = cp.c dpram.c brg.c
-
-cpm_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): $(cpm_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(PGM)
-
-EXTRA_DIST = $(C_FILES)
-
-include $(top_srcdir)/../../../automake/local.am

c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am

@@ -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

c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am

@@ -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

c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am

@@ -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