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

	* ppc403/clock/Makefile.am: Remove.
	* ppc403/console/Makefile.am: Remove.
	* ppc403/ictrl/Makefile.am: Remove.
	* ppc403/timer/Makefile.am: Remove.
	* ppc403/tty_drv/Makefile.am: Remove.
	* ppc403/vectors/Makefile.am: Remove.
	* ppc403/Makefile.am: Merge-in Makefile.ams above.
	* configure.ac: Reflect changes to ppc403/Makefile.ams.

9 files changed, 139 insertions, 203 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 28d3d8f157..2530f16a6b 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,10 +1,21 @@
 2003-12-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* ppc403/clock/Makefile.am: Remove.
+	* ppc403/console/Makefile.am: Remove.
+	* ppc403/ictrl/Makefile.am: Remove.
+	* ppc403/timer/Makefile.am: Remove.
+	* ppc403/tty_drv/Makefile.am: Remove.
+	* ppc403/vectors/Makefile.am: Remove.
+	* ppc403/Makefile.am: Merge-in Makefile.ams above.
+	* configure.ac: Reflect changes to ppc403/Makefile.ams.
+
+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.
+	* configure.ac: Reflect changes to mpc505/Makefile.ams.
 
 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 53526ba562..a73db4f8ff 100644
--- a/c/src/lib/libcpu/powerpc/configure.ac
+++ b/c/src/lib/libcpu/powerpc/configure.ac
@@ -48,17 +48,8 @@ AM_CONDITIONAL(ppc405, test "$RTEMS_CPU_MODEL" = "ppc405")
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 mpc505/Makefile
-mpc505/timer/Makefile
-mpc505/vectors/Makefile
-mpc505/ictrl/Makefile
 mpc8xx/Makefile
 ppc403/Makefile
-ppc403/clock/Makefile
-ppc403/console/Makefile
-ppc403/tty_drv/Makefile
-ppc403/ictrl/Makefile
-ppc403/timer/Makefile
-ppc403/vectors/Makefile
 mpc6xx/Makefile
 mpc8260/Makefile
 shared/Makefile
diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
index 605b1a86b4..9d552e0062 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
@@ -2,12 +2,136 @@
 ## $Id$
 ##
 
+CLEANDIRS =
+EXTRA_DIST =
+noinst_DATA =
+
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+## 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
 if ppc403
-SUBDIRS = console clock timer vectors ictrl
+console_C_FILES = console/console.c
+endif
+EXTRA_DIST += console/console.c
+if ppc405
+console_C_FILES = console/console405.c
+endif
+EXTRA_DIST += console/console405.c
+
+console_rel_OBJECTS = \
+    $(console_C_FILES:console/%.c=console/$(ARCH)/%.$(OBJEXT))
+console/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) console/$(ARCH)
+	@: > console/$(ARCH)/$(dirstamp)
+console/$(ARCH)/%.$(OBJEXT): console/%.c console/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+console/$(ARCH)/console.rel: $(console_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += console/o-optimize console/o-debug
+noinst_DATA += console/$(ARCH)/console.rel
+
+## ictrl
+include_HEADERS = ictrl/ictrl.h
+ictrl_C_FILES = ictrl/ictrl.c
+EXTRA_DIST += $(ictrl_C_FILES)
+
+ictrl_rel_OBJECTS = $(ictrl_C_FILES:ictrl/%.c=ictrl/$(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
+
+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
+
+## tty_drv
+if ppc405
+include_HEADERS += tty_drv/tty_drv.h
+tty_drv_C_FILES = tty_drv/tty_drv.c
+EXTRA_DIST += $(tty_drv_C_FILES)
+
+tty_drv_rel_OBJECTS = \
+    $(tty_drv_C_FILES:tty_drv/%.c=tty_drv/$(ARCH)/%.$(OBJEXT))
+
+tty_drv/$(ARCH)/$(dirstamp):
+	@$(mkdir_p) tty_drv/$(ARCH)
+	@: > tty_drv/$(ARCH)/$(dirstamp)
+tty_drv/$(ARCH)/%.$(OBJEXT): tty_drv/%.c tty_drv/$(ARCH)/$(dirstamp)
+	${COMPILE} -o $@ -c $<
+tty_drv/$(ARCH)/tty_drv.rel: $(tty_drv_rel_OBJECTS)
+	$(make-rel)
+CLEANDIRS += tty_drv/o-optimize tty_drv/o-debug
+noinst_DATA += tty_drv/$(ARCH)/tty_drv.rel
 endif
+
+## vectors
+vectors_S_FILES = vectors/vectors.S vectors/align_h.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/%.c vectors/$(ARCH)/$(dirstamp)
+	${COMPILE} -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
+
 if ppc405
-SUBDIRS = console tty_drv clock timer vectors ictrl
+$(PROJECT_INCLUDE)/tty_drv.h: tty_drv/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h
 endif
 
-include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
deleted file mode 100644
index 782163209d..0000000000
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/clock.rel
-
-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: $(clock_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = clock.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
deleted file mode 100644
index 9fedef0f85..0000000000
--- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/console.rel
-
-if ppc403
-C_FILES = console.c
-endif
-if ppc405
-C_FILES = console405.c
-endif
-
-console_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_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(console_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = console.c console.c.polled console405.c
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
deleted file mode 100644
index 64fb3c80d3..0000000000
--- a/c/src/lib/libcpu/powerpc/ppc403/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/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
deleted file mode 100644
index 1aa152675d..0000000000
--- a/c/src/lib/libcpu/powerpc/ppc403/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/ppc403/tty_drv/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
deleted file mode 100644
index 37b8f963e2..0000000000
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##
-## $Id$
-##
-
-PGM = $(ARCH)/tty_drv.rel
-
-include_HEADERS = tty_drv.h
-
-C_FILES = tty_drv.c
-
-tty_drv_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): $(tty_drv_rel_OBJECTS)
-	$(make-rel)
-
-all-local: $(tty_drv_rel_OBJECTS) $(PGM)
-
-.PRECIOUS: $(PGM)
-
-EXTRA_DIST = tty_drv.c tty_drv.h
-
-PREINSTALL_FILES =
-
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/tty_drv.h: tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h
-
-include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
deleted file mode 100644
index cc37d04e38..0000000000
--- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##
-## $Id$
-##
-
-PGM = ${ARCH}/vectors.rel
-
-## Assembly sources
-S_FILES = vectors.S align_h.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 = $(S_FILES) README
-
-include $(top_srcdir)/../../../automake/local.am