4 files changed, 21 insertions, 136 deletions
diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog
index e9ae65f230..9c482ec1e4 100644
--- a/c/src/lib/libcpu/sh/ChangeLog
+++ b/c/src/lib/libcpu/sh/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* sh7032/Makefile.am, sh7045/Makefile.am, sh7750/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/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am
index 1a2e8bc16d..0f7d52169c 100644
--- a/c/src/lib/libcpu/sh/sh7032/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am
@@ -5,8 +5,7 @@
 include $(top_srcdir)/../../../automake/compile.am
 
 CLEANFILES =
-EXTRA_PROGRAMS =
-noinst_DATA =
+noinst_PROGRAMS =
 
 if sh7032
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid
@@ -18,79 +17,34 @@ include_sh_HEADERS = include/sci.h include/sh7_pfc.h include/sh7_sci.h
 include_rtems_score_HEADERS = include/ispsh7032.h include/iosh7032.h
 
 # clock
-EXTRA_PROGRAMS += clock.rel
-CLEANFILES += clock.rel
+noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = clock/ckinit.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
-
 # delay
-EXTRA_PROGRAMS += delay.rel
-CLEANFILES += delay.rel
+noinst_PROGRAMS += delay.rel
 delay_rel_SOURCES = delay/delay.c
 delay_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 delay_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += delay_g.rel
-CLEANFILES += delay_g.rel
-delay_g_rel_SOURCES = $(delay_rel_SOURCES)
-delay_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-delay_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += delay$(LIB_VARIANT).rel
-
 # sci
-EXTRA_PROGRAMS += sci.rel
-CLEANFILES += sci.rel
+noinst_PROGRAMS += sci.rel
 sci_rel_SOURCES = sci/sci.c
 sci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += sci_g.rel
-CLEANFILES += sci_g.rel
-sci_g_rel_SOURCES = $(sci_rel_SOURCES)
-sci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-sci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += sci$(LIB_VARIANT).rel
-
 # score
-EXTRA_PROGRAMS += score.rel
-CLEANFILES += score.rel
+noinst_PROGRAMS += score.rel
 score_rel_SOURCES =score/cpu_asm.c score/ispsh7032.c
 score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += score_g.rel
-CLEANFILES += score_g.rel
-score_g_rel_SOURCES = $(score_rel_SOURCES)
-score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += score$(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
 
 all-local: $(PREINSTALL_FILES)
diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am
index d4c803d911..e7b6827ace 100644
--- a/c/src/lib/libcpu/sh/sh7045/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am
@@ -5,8 +5,7 @@
 include $(top_srcdir)/../../../automake/compile.am
 
 CLEANFILES =
-EXTRA_PROGRAMS =
-noinst_DATA =
+noinst_PROGRAMS =
 
 if sh7045
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid
@@ -19,64 +18,28 @@ include_sh_HEADERS = include/io_types.h include/sci.h include/sh7_pfc.h \
 include_rtems_score_HEADERS = include/ispsh7045.h include/iosh7045.h
 
 # clock
-EXTRA_PROGRAMS += clock.rel
-CLEANFILES += clock.rel
+noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = clock/ckinit.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
-
 # sci
-EXTRA_PROGRAMS += sci.rel
-CLEANFILES += sci.rel
+noinst_PROGRAMS += sci.rel
 sci_rel_SOURCES = sci/sci.c sci/sci_termios.c
 sci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += sci_g.rel
-CLEANFILES += sci_g.rel
-sci_g_rel_SOURCES = $(sci_rel_SOURCES)
-sci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-sci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += sci$(LIB_VARIANT).rel
-
 # score
-EXTRA_PROGRAMS += score.rel
-CLEANFILES += score.rel
+noinst_PROGRAMS += score.rel
 score_rel_SOURCES = score/cpu_asm.c score/ispsh7045.c
 score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += score_g.rel
-CLEANFILES += score_g.rel
-score_g_rel_SOURCES = $(score_rel_SOURCES)
-score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += score$(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
 
 all-local: $(PREINSTALL_FILES)
diff --git a/c/src/lib/libcpu/sh/sh7750/Makefile.am b/c/src/lib/libcpu/sh/sh7750/Makefile.am
index 0c4d271716..473873f2a6 100644
--- a/c/src/lib/libcpu/sh/sh7750/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7750/Makefile.am
@@ -5,8 +5,7 @@
 include $(top_srcdir)/../../../automake/compile.am
 
 CLEANFILES =
-EXTRA_PROGRAMS =
-noinst_DATA =
+noinst_PROGRAMS =
 
 if sh7750
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid
@@ -20,64 +19,28 @@ include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h \
     include/rtems/score/ispsh7750.h include/rtems/score/sh4_regs.h
 
 ## clock
-EXTRA_PROGRAMS += clock.rel
-CLEANFILES += clock.rel
+noinst_PROGRAMS += clock.rel
 clock_rel_SOURCES = clock/ckinit.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
-
 ## sci
-EXTRA_PROGRAMS += sci.rel
-CLEANFILES += sci.rel
+noinst_PROGRAMS += sci.rel
 sci_rel_SOURCES = sci/sh4uart.c
 sci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += sci_g.rel
-CLEANFILES += sci_g.rel
-sci_g_rel_SOURCES = $(sci_rel_SOURCES)
-sci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-sci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += sci$(LIB_VARIANT).rel
-
 ## score
-EXTRA_PROGRAMS += score.rel
-CLEANFILES += score.rel
+noinst_PROGRAMS += score.rel
 score_rel_SOURCES = score/cpu_asm.c score/ispsh7750.c
 score_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += score_g.rel
-CLEANFILES += score_g.rel
-score_g_rel_SOURCES = $(score_rel_SOURCES)
-score_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-score_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += score$(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
 
 ## --