2005-01-02 Ralf Corsepius <ralf.corsepius@rtems.org>

	* mpc505/Makefile.am, mpc5xx/Makefile.am, mpc6xx/Makefile.am,
	mpc8260/Makefile.am, mpc8xx/Makefile.am, ppc403/Makefile.am,
	shared/Makefile.am: Remove build-variant support.

1 files changed, 7 insertions, 62 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
index 5fb2e02029..d4ba1b01d9 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
@@ -4,8 +4,7 @@
 
 CLEANFILES =
 EXTRA_DIST =
-EXTRA_PROGRAMS =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -16,102 +15,48 @@ include_libcpudir = $(includedir)/libcpu
 include_HEADERS = include/mpc8xx.h
 
 ## clock
-EXTRA_PROGRAMS += clock.rel
-CLEANFILES += clock.rel
+noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = clock/clock.c
 clock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-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)
-
-noinst_DATA += clock$(LIB_VARIANT).rel
-
 ## console-generic
 include_mpc8xx_HEADERS = include/console.h
 
-EXTRA_PROGRAMS += console-generic.rel
-CLEANFILES += console-generic.rel
+noinst_PROGRAMS += console-generic.rel
 console_generic_rel_SOURCES = console-generic/console-generic.c
 console_generic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 console_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += console-generic_g.rel
-CLEANFILES += console-generic_g.rel
-console_generic_g_rel_SOURCES = $(console_generic_rel_SOURCES)
-console_generic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-console_generic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += console-generic$(LIB_VARIANT).rel
-
 ## cpm
 include_mpc8xx_HEADERS += include/cpm.h
 
-EXTRA_PROGRAMS += cpm.rel
-CLEANFILES += cpm.rel
+noinst_PROGRAMS += cpm.rel
 cpm_rel_SOURCES = cpm/cp.c cpm/dpram.c
 cpm_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 cpm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += cpm_g.rel
-CLEANFILES += cpm_g.rel
-cpm_g_rel_SOURCES = $(cpm_rel_SOURCES)
-cpm_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-cpm_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += cpm$(LIB_VARIANT).rel
-
 ## exceptions
 include_libcpu_HEADERS = exceptions/raw_exception.h
 
-EXTRA_PROGRAMS += exceptions.rel
-CLEANFILES += exceptions.rel
+noinst_PROGRAMS += 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_mpc8xx_HEADERS += include/mmu.h
 
-EXTRA_PROGRAMS += mmu.rel
-CLEANFILES += mmu.rel
+noinst_PROGRAMS += mmu.rel
 mmu_rel_SOURCES = mmu/mmu.c
 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
-
 ## timer
-EXTRA_PROGRAMS += timer.rel
-CLEANFILES += timer.rel
+noinst_PROGRAMS += timer.rel
 timer_rel_SOURCES = timer/timer.c
 timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-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)
-
-noinst_DATA += timer$(LIB_VARIANT).rel
 endif
 
 ## --