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

	* at91rm9200/Makefile.am, mc9328mxl/Makefile.am,
	shared/Makefile.am: Remove build-variant support.

4 files changed, 20 insertions, 104 deletions

diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog
index 99622a9578..43026e9ffe 100644
--- a/c/src/lib/libcpu/arm/ChangeLog
+++ b/c/src/lib/libcpu/arm/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* at91rm9200/Makefile.am, mc9328mxl/Makefile.am,
+	shared/Makefile.am: Remove build-variant support.
+
 2005-01-02	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* ChangeLog: Merge-in at91rm9200/ChangeLog, mc9328mxl/ChangeLog,
diff --git a/c/src/lib/libcpu/arm/at91rm9200/Makefile.am b/c/src/lib/libcpu/arm/at91rm9200/Makefile.am
index eee55f8f73..c5c0974184 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/Makefile.am
+++ b/c/src/lib/libcpu/arm/at91rm9200/Makefile.am
@@ -2,10 +2,7 @@
 ## $Id$
 ##
 
-CLEANFILES =
-EXTRA_DIST =
-EXTRA_PROGRAMS =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -18,83 +15,38 @@ include_HEADERS += include/at91rm9200.h include/at91rm9200_dbgu.h \
     include/at91rm9200_mem.h include/at91rm9200_pmc.h include/bits.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
-
 ## dbgu
-EXTRA_PROGRAMS += dbgu.rel
-CLEANFILES += dbgu.rel
+noinst_PROGRAMS += dbgu.rel
 dbgu_rel_SOURCES = dbgu/dbgu.c
 dbgu_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 dbgu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += dbgu_g.rel
-CLEANFILES += dbgu_g.rel
-dbgu_g_rel_SOURCES = $(dbgu_rel_SOURCES)
-dbgu_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-dbgu_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += dbgu$(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
-
 ## pmc
-EXTRA_PROGRAMS += pmc.rel
-CLEANFILES += pmc.rel
+noinst_PROGRAMS += pmc.rel
 pmc_rel_SOURCES = pmc/pmc.c
 pmc_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 pmc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += pmc_g.rel
-CLEANFILES += pmc_g.rel
-pmc_g_rel_SOURCES = $(pmc_rel_SOURCES)
-pmc_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-pmc_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += pmc$(LIB_VARIANT).rel
-
 ## interrupt
 include_HEADERS += irq/irq.h
 
-EXTRA_PROGRAMS += irq.rel
-CLEANFILES += irq.rel
+noinst_PROGRAMS += irq.rel
 irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c \
     ../../../libbsp/arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \
     ../../../libbsp/arm/shared/irq/irq_asm.S irq/irq.h
 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
 endif
 
 ## --
@@ -152,7 +104,7 @@ $(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/Makefile.am b/c/src/lib/libcpu/arm/mc9328mxl/Makefile.am
index 4759f4f798..81a832c4e4 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/Makefile.am
+++ b/c/src/lib/libcpu/arm/mc9328mxl/Makefile.am
@@ -2,10 +2,7 @@
 ## $Id$
 ##
 
-CLEANFILES =
-EXTRA_DIST =
-EXTRA_PROGRAMS =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -15,53 +12,26 @@ include_libcpudir = $(includedir)/libcpu
 include_HEADERS = include/mc9328mxl.h
 
 ## clock
-EXTRA_PROGRAMS += clock.rel
-CLEANFILES += clock.rel
+noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = clock/clockdrv.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
-
 ## 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
-
 ## interrupt
 include_HEADERS += irq/irq.h
 
-EXTRA_PROGRAMS += irq.rel
-CLEANFILES += irq.rel
+noinst_PROGRAMS += irq.rel
 irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c \
     ../../../libbsp/arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \
     ../../../libbsp/arm/shared/irq/irq_asm.S irq/irq.h
 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
 endif
 
 ## --
@@ -95,7 +65,7 @@ $(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/arm/shared/Makefile.am b/c/src/lib/libcpu/arm/shared/Makefile.am
index f5374c3965..78ea2d82dc 100644
--- a/c/src/lib/libcpu/arm/shared/Makefile.am
+++ b/c/src/lib/libcpu/arm/shared/Makefile.am
@@ -2,9 +2,7 @@
 ## $Id$
 ##
 
-EXTRA_PROGRAMS =
-CLEANFILES =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -15,19 +13,10 @@ include_libcpudir = $(includedir)/libcpu
 include_libcpu_HEADERS = include/mmu.h
 
 ## arm920
-EXTRA_PROGRAMS += arm920.rel
-CLEANFILES += arm920.rel
+noinst_PROGRAMS += arm920.rel
 arm920_rel_SOURCES = arm920/mmu.c
 arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/src
 arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += arm920_g.rel
-CLEANFILES += arm920_g.rel
-arm920_g_rel_SOURCES = $(arm920_rel_SOURCES)
-arm920_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/src
-arm920_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += arm920$(LIB_VARIANT).rel
 endif
 
 all-local: $(PREINSTALL_FILES)
@@ -46,7 +35,7 @@ $(PROJECT_INCLUDE)/libcpu/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirst
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am