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

	* mongoosev/Makefile.am, r46xx/Makefile.am, shared/Makefile.am,
	tx39/Makefile.am: Remove build-variant support.

5 files changed, 20 insertions, 95 deletions

diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index 57fde1b310..0e326e4c9c 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* mongoosev/Makefile.am, r46xx/Makefile.am, shared/Makefile.am,
+	tx39/Makefile.am: Remove build-variant support.
+
 2004-10-19	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* configure.ac: Remove RTEMS_ENABLE_BARE.
diff --git a/c/src/lib/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
index 64ee1999e6..29d500ad84 100644
--- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
@@ -2,10 +2,8 @@
 ## $Id$
 ##
 
-EXTRA_PROGRAMS =
+noinst_PROGRAMS =
 EXTRA_DIST =
-CLEANFILES =
-noinst_DATA =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -19,35 +17,17 @@ include_libchip_HEADERS = duart/mg5uart.h
 
 EXTRA_DIST += duart/README.mguart
 
-EXTRA_PROGRAMS += duart.rel
-CLEANFILES += duart.rel
+noinst_PROGRAMS += duart.rel
 duart_rel_SOURCES = duart/mg5uart.c duart/mg5uart.h duart/mg5uart_reg.c
 duart_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 duart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += duart_g.rel
-CLEANFILES += duart_g.rel
-duart_g_rel_SOURCES = $(duart_rel_SOURCES)
-duart_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-duart_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += duart$(LIB_VARIANT).rel
-
 ## vectorisrs
 
-EXTRA_PROGRAMS += vectorisrs.rel
-CLEANFILES += vectorisrs.rel
+noinst_PROGRAMS += vectorisrs.rel
 vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
 vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += vectorisrs_g.rel
-CLEANFILES += vectorisrs_g.rel
-vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
-vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += vectorisrs$(LIB_VARIANT).rel
 endif
 
 all-local: $(PREINSTALL_FILES)
@@ -75,7 +55,7 @@ $(PROJECT_INCLUDE)/libchip/mg5uart.h: duart/mg5uart.h $(PROJECT_INCLUDE)/libchip
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/r46xx/Makefile.am b/c/src/lib/libcpu/mips/r46xx/Makefile.am
index 2aa557673c..0449d4703a 100644
--- a/c/src/lib/libcpu/mips/r46xx/Makefile.am
+++ b/c/src/lib/libcpu/mips/r46xx/Makefile.am
@@ -2,58 +2,29 @@
 ## $Id$
 ##
 
-EXTRA_PROGRAMS =
-CLEANFILES =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
 if r46xx
-EXTRA_PROGRAMS += vectorisrs.rel
-CLEANFILES += vectorisrs.rel
+noinst_PROGRAMS += vectorisrs.rel
 vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
 vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += vectorisrs_g.rel
-CLEANFILES += vectorisrs_g.rel
-vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
-vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += vectorisrs$(LIB_VARIANT).rel
 endif
 
 if r46xx
-EXTRA_PROGRAMS += timer.rel
-CLEANFILES += timer.rel
+noinst_PROGRAMS += timer.rel
 timer_rel_SOURCES = ../timer/timer.c ../timer/gettime.S
 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
 
 if r46xx
-EXTRA_PROGRAMS += clock.rel
-CLEANFILES += clock.rel
+noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = ../clock/ckinit.c ../clock/clock.S ../clock/clock.h
 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
 endif
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/shared/Makefile.am b/c/src/lib/libcpu/mips/shared/Makefile.am
index f78595538b..314d9abb6b 100644
--- a/c/src/lib/libcpu/mips/shared/Makefile.am
+++ b/c/src/lib/libcpu/mips/shared/Makefile.am
@@ -2,10 +2,7 @@
 ## $Id$
 ##
 
-EXTRA_DIST =
-CLEANFILES =
-noinst_DATA =
-EXTRA_PROGRAMS =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -14,21 +11,12 @@ include_libcpudir = $(includedir)/libcpu
 
 include_libcpu_HEADERS = ../../shared/include/cache.h
 
-EXTRA_PROGRAMS += cache.rel
-CLEANFILES += cache.rel
+noinst_PROGRAMS += cache.rel
 cache_rel_SOURCES = cache/cache.c ../../shared/src/cache_aligned_malloc.c \
     ../../shared/src/cache_manager.c cache/cache_.h
 cache_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -I$(srcdir)/cache
 cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += cache_g.rel
-CLEANFILES += cache_g.rel
-cache_g_rel_SOURCES = $(cache_rel_SOURCES)
-cache_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -I$(srcdir)/cache
-cache_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += cache$(LIB_VARIANT).rel
-
 ## interrupts
 
 if tx39
@@ -39,22 +27,14 @@ if mongoosev
 interrupts_CPPFLAGS = -DMONGOOSEV
 endif
 
-EXTRA_PROGRAMS += interrupts.rel
-CLEANFILES += interrupts.rel
+noinst_PROGRAMS += interrupts.rel
 interrupts_rel_SOURCES = interrupts/installisrentries.c \
     interrupts/vectorexceptions.c interrupts/isr_entries.S
 interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     $(interrupts_CPPFLAGS)
 interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += interrupts_g.rel
-CLEANFILES += interrupts_g.rel
-interrupts_g_rel_SOURCES = $(interrupts_rel_SOURCES)
-interrupts_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
     $(interrupts_CPPFLAGS)
-interrupts_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += interrupts$(LIB_VARIANT).rel
 
 all-local: $(PREINSTALL_FILES)
 
@@ -72,7 +52,7 @@ $(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUD
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/tx39/Makefile.am b/c/src/lib/libcpu/mips/tx39/Makefile.am
index db48eb35cc..f5834df4d1 100644
--- a/c/src/lib/libcpu/mips/tx39/Makefile.am
+++ b/c/src/lib/libcpu/mips/tx39/Makefile.am
@@ -2,9 +2,7 @@
 ## $Id$
 ##
 
-EXTRA_PROGRAMS =
-CLEANFILES =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include $(top_srcdir)/../../../automake/compile.am
 
@@ -12,19 +10,10 @@ if tx39
 include_libcpudir = $(includedir)/libcpu
 include_libcpu_HEADERS = include/tx3904.h
 
-EXTRA_PROGRAMS += vectorisrs.rel
-CLEANFILES += vectorisrs.rel
+noinst_PROGRAMS += vectorisrs.rel
 vectorisrs_rel_SOURCES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
 vectorisrs_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 vectorisrs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += vectorisrs_g.rel
-CLEANFILES += vectorisrs_g.rel
-vectorisrs_g_rel_SOURCES = $(vectorisrs_rel_SOURCES)
-vectorisrs_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-vectorisrs_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += vectorisrs$(LIB_VARIANT).rel
 endif
 
 all-local: $(PREINSTALL_FILES)
@@ -43,7 +32,7 @@ $(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
 include $(top_srcdir)/../../../automake/local.am