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/mpc5xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc5xx/Makefile.am
index 2e035eac11..78fc6f9505 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/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/mpc5xx.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_mpc5xx_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
-
 ## 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_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
-
 ## irq
 include_libcpu_HEADERS += irq/irq.h
 
-EXTRA_PROGRAMS += irq.rel
-CLEANFILES += irq.rel
+noinst_PROGRAMS += irq.rel
 irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq_asm.S
 irq_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += irq_g.rel
-CLEANFILES += irq_g.rel
-irq_g_rel_SOURCES = $(irq_rel_SOURCES)
-irq_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-irq_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += irq$(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
-
 ## vectors
 include_libcpu_HEADERS += vectors/vectors.h
 
-EXTRA_PROGRAMS += vectors.rel
-CLEANFILES += vectors.rel
+noinst_PROGRAMS += vectors.rel
 vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.S
 vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += vectors_g.rel
-CLEANFILES += vectors_g.rel
-vectors_g_rel_SOURCES = $(vectors_rel_SOURCES)
-vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += vectors$(LIB_VARIANT).rel
 endif
 
 ## --