1 files changed, 60 insertions, 65 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
index d35d245ec5..59c0bae3f5 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
@@ -6,98 +6,91 @@ include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
 EXTRA_DIST =
-CLEANDIRS =
+EXTRA_PROGRAMS =
+CLEANFILES =
 noinst_DATA =
 
+if mpc6xx
 include_libcpudir = $(includedir)/libcpu
 include_libcpu_HEADERS = exceptions/raw_exception.h
 
 # 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
+EXTRA_PROGRAMS += exceptions.rel
+CLEANFILES += exceptions.rel
+exceptions_rel_SOURCES = exceptions/raw_exception.c exceptions/asm_utils.S
+exceptions_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+exceptions_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += exceptions_g.rel
+CLEANFILES += exceptions_g.rel
+exceptions_g_rel_SOURCES = $(exceptions_rel_SOURCES)
+exceptions_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+exceptions_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += exceptions$(LIB_VARIANT).rel
 
 # mmu
 include_libcpu_HEADERS += mmu/bat.h mmu/pte121.h
-mmu_C_FILES = mmu/bat.c mmu/pte121.c
-mmu_S_FILES = mmu/mmuAsm.S
-EXTRA_DIST += $(mmu_C_FILES) $(mmu_S_FILES)
-
-mmu_rel_OBJECTS = $(mmu_C_FILES:mmu/%.c=mmu/$(ARCH)/%.$(OBJEXT)) \
-    $(mmu_S_FILES:mmu/%.S=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)/%.$(OBJEXT): mmu/%.S mmu/$(ARCH)/$(dirstamp)
-	${CCASCOMPILE} -o $@ -c $<
-mmu/$(ARCH)/mmu.rel: $(mmu_rel_OBJECTS)
-	$(make-rel)
-CLEANDIRS += mmu/o-optimize mmu/o-debug
-noinst_DATA += mmu/$(ARCH)/mmu.rel
+
+EXTRA_PROGRAMS += mmu.rel
+CLEANFILES += mmu.rel
+mmu_rel_SOURCES = mmu/bat.c mmu/bat.h mmu/pte121.c mmu/pte121.h \
+    mmu/mmuAsm.S
+mmu_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+EXTRA_PROGRAMS += mmu_g.rel
+CLEANFILES += mmu_g.rel
+mmu_g_rel_SOURCES = $(mmu_rel_SOURCES)
+mmu_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+mmu_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
+noinst_DATA += mmu$(LIB_VARIANT).rel
 
 # clock
 include_libcpu_HEADERS += clock/c_clock.h
 
-clock_C_FILES = clock/c_clock.c
-EXTRA_DIST += $(clock_C_FILES)
+EXTRA_PROGRAMS += clock.rel
+CLEANFILES += clock.rel
+clock_rel_SOURCES = clock/c_clock.c clock/c_clock.h
+clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-clock_rel_OBJECTS = $(clock_C_FILES:clock/%.c=clock/$(ARCH)/%.$(OBJEXT))
+EXTRA_PROGRAMS += clock_g.rel
+CLEANFILES += clock_g.rel
+clock_g_rel_SOURCES = $(clock_rel_SOURCES)
+clock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-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
+noinst_DATA += clock$(LIB_VARIANT).rel
 
 # timer
+EXTRA_PROGRAMS += timer.rel
+CLEANFILES += timer.rel
+timer_rel_SOURCES = timer/timer.c
+timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
+timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-timer_C_FILES = timer/timer.c
-EXTRA_DIST += $(timer_C_FILES)
-
-timer_rel_OBJECTS = $(timer_C_FILES:timer/%.c=timer/$(ARCH)/%.$(OBJEXT))
+EXTRA_PROGRAMS += timer_g.rel
+CLEANFILES += timer_g.rel
+timer_g_rel_SOURCES = $(timer_rel_SOURCES)
+timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-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
+noinst_DATA += timer$(LIB_VARIANT).rel
+endif
 
 ## ----
 all-local: $(PREINSTALL_FILES)
 
+PREINSTALL_DIRS =
 PREINSTALL_FILES =
 
+if mpc6xx
 $(PROJECT_INCLUDE)/libcpu/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
 	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_DIRS += $(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
@@ -114,7 +107,9 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h
 $(PROJECT_INCLUDE)/libcpu/c_clock.h: clock/c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
+endif
 
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am