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

	* libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am
	support/Makefile.am, wrapup/Makefile.am:
	Remove build-variant support.

6 files changed, 98 insertions, 296 deletions

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 720f75765f..471840ae6d 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-01	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am
+	support/Makefile.am, wrapup/Makefile.am:
+	Remove build-variant support.
+
 2004-11-22	Joel Sherrill <joel@OARcorp.com>
 
 	* libchip/network/if_fxp.c: Add entry for another module ID code.
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 43513c5b37..bffd71822c 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -4,34 +4,23 @@
 
 include $(top_srcdir)/automake/compile.am
 
-noinst_DATA =
-
 if LIBCHIP
 include_libchipdir = $(includedir)/libchip
 include_libchip_HEADERS =
 endif
 
 EXTRA_DIST =
-EXTRA_LIBRARIES =
-EXTRA_PROGRAMS =
-CLEANFILES =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
 
 # ide
 if LIBCHIP
 include_libchip_HEADERS += ide/ata.h ide/ide_ctrl_cfg.h ide/ide_ctrl.h \
     ide/ide_ctrl_io.h
 
-EXTRA_LIBRARIES += libide.a
-CLEANFILES += libide.a
+noinst_LIBRARIES += libide.a
 libide_a_SOURCES = ide/ata.c ide/ide_controller.c ide/ata_internal.h
 libide_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += libide_g.a
-CLEANFILES += libide_g.a
-libide_g_a_SOURCES = $(libide_a_SOURCES)
-libide_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-
-noinst_DATA += libide$(LIB_VARIANT).a
 endif
 
 # network
@@ -42,21 +31,11 @@ include_libchip_HEADERS += network/cs8900.h network/i82586var.h \
     network/open_eth.h
 
 libnetchip_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-EXTRA_LIBRARIES += libnetchip.a
-CLEANFILES += libnetchip.a
+noinst_LIBRARIES += libnetchip.a
 libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \
     network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c
 libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     $(libnetchip_CPPFLAGS)
-
-EXTRA_LIBRARIES += libnetchip_g.a
-CLEANFILES += libnetchip_g.a
-libnetchip_g_a_SOURCES = $(libnetchip_a_SOURCES)
-libnetchip_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
-    $(libnetchip_CPPFLAGS)
-
-# FIXME: Why is this lib installed?
-project_lib_DATA = libnetchip$(LIB_VARIANT).a
 endif
 endif
 
@@ -69,20 +48,12 @@ if LIBCHIP
 include_libchip_HEADERS += rtc/rtc.h rtc/icm7170.h rtc/m48t08.h \
     rtc/mc146818a.h
 
-EXTRA_LIBRARIES += librtcio.a
-CLEANFILES += librtcio.a
+noinst_LIBRARIES += librtcio.a
 librtcio_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 librtcio_a_SOURCES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \
     rtc/icm7170_reg2.c rtc/icm7170_reg4.c rtc/icm7170_reg8.c rtc/m48t08.c \
     rtc/m48t08_reg.c rtc/m48t08_reg2.c rtc/m48t08_reg4.c rtc/m48t08_reg8.c \
     rtc/mc146818a.c rtc/mc146818a_ioreg.c
-
-EXTRA_LIBRARIES += librtcio_g.a
-CLEANFILES += librtcio_g.a
-librtcio_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-librtcio_g_a_SOURCES = $(librtcio_a_SOURCES)
-
-noinst_DATA += librtcio$(LIB_VARIANT).a
 endif
 
 EXTRA_DIST += rtc/README.ds1643 rtc/README.icm7170 rtc/README.m48t08 \
@@ -93,8 +64,7 @@ if LIBCHIP
 include_libchip_HEADERS += serial/mc68681.h serial/ns16550.h serial/z85c30.h \
     serial/serial.h serial/sersupp.h
 
-EXTRA_LIBRARIES += libserialio.a
-CLEANFILES += libserialio.a
+noinst_LIBRARIES += libserialio.a
 libserialio_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
     serial/mc68681_reg.c serial/mc68681_reg2.c serial/mc68681_reg4.c \
@@ -102,13 +72,6 @@ libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
     serial/z85c30_reg.c serial/serprobe.c serial/termios_baud2index.c \
     serial/termios_baud2num.c serial/mc68681_p.h serial/ns16550_p.h \
     serial/z85c30_p.h
-
-EXTRA_LIBRARIES += libserialio_g.a
-CLEANFILES += libserialio_g.a
-libserialio_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-libserialio_g_a_SOURCES = $(libserialio_a_SOURCES)
-
-noinst_DATA += libserialio$(LIB_VARIANT).a
 endif
 
 EXTRA_DIST += serial/README.mc68681 serial/README.ns16550 \
@@ -118,22 +81,13 @@ EXTRA_DIST += serial/README.mc68681 serial/README.ns16550 \
 if HAS_MP
 include_HEADERS = shmdr/shm_driver.h shmdr/mpci.h
 
-EXTRA_PROGRAMS += shmdr.rel
-CLEANFILES += shmdr.rel
+project_lib_PROGRAMS = shmdr.rel
 shmdr_rel_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
     shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
     shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c shmdr/send.c \
     shmdr/setckvec.c
 shmdr_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 shmdr_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += shmdr_g.rel
-CLEANFILES += shmdr_g.rel
-shmdr_g_rel_SOURCES = $(no_shmdr_rel_SOURCES)
-shmdr_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-shmdr_g_rel_LDFLAGS = $(RTEMS_REL_LDFLAGS)
-
-project_lib_DATA = shmdr$(LIB_VARIANT).rel
 endif
 
 EXTRA_DIST += shmdr/README
@@ -151,11 +105,6 @@ $(PROJECT_INCLUDE)/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
 
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
 if LIBCHIP
 $(PROJECT_INCLUDE)/libchip/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/libchip
@@ -210,10 +159,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mii.h
 $(PROJECT_INCLUDE)/libchip/open_eth.h: network/open_eth.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h
-
-$(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a: libnetchip$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a
 endif
 endif
 
@@ -266,12 +211,12 @@ $(PROJECT_INCLUDE)/mpci.h: shmdr/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
 
-$(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel: shmdr$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr$(LIB_VARIANT).rel
+$(PROJECT_LIB)/shmdr.rel: shmdr.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/shmdr.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/shmdr.rel
 endif
 
-CLEANFILES += $(PREINSTALL_FILES)
+CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
 
diff --git a/c/src/librdbg/Makefile.am b/c/src/librdbg/Makefile.am
index 7e181ed8b5..168419f27e 100644
--- a/c/src/librdbg/Makefile.am
+++ b/c/src/librdbg/Makefile.am
@@ -16,17 +16,8 @@ include_rdbgdir = $(includedir)/rdbg
 
 include_rdbg_HEADERS = include/rdbg/rdbg.h include/rdbg/servrpc.h
 
-EXTRA_LIBRARIES = librdbg.a
-CLEANFILES += librdbg.a
+noinst_LIBRARIES = librdbg.a
 librdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
-
-EXTRA_LIBRARIES += librdbg_g.a
-CLEANFILES += librdbg_g.a
-librdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-librdbg_g_a_SOURCES = $(librdbg_a_SOURCES)
-
-project_lib_DATA = librdbg$(LIB_VARIANT).a
-
 librdbg_a_SOURCES = src/rdbg.c src/servcon.c src/servbkpt.c src/servrpc.c \
     src/excep.c src/servtgt.c src/servtsp.c src/servutil.c src/_servtgt.c \
     src/ptrace.c
@@ -182,12 +173,6 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 PREINSTALL_DIRS =
 PREINSTALL_FILES =
-TMPINSTALL_FILES =
-
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
 
 if HAS_RDBG
 $(PROJECT_INCLUDE)/rdbg/$(dirstamp):
@@ -202,10 +187,6 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/rdbg.h
 $(PROJECT_INCLUDE)/rdbg/servrpc.h: include/rdbg/servrpc.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/servrpc.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/servrpc.h
-
-$(PROJECT_LIB)/librdbg$(LIB_VARIANT).a: librdbg$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
 endif
 
 if HAS_RDBG
@@ -258,6 +239,5 @@ endif
 
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
-CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am
index bf0fa59818..12bbc663f1 100644
--- a/c/src/optman/Makefile.am
+++ b/c/src/optman/Makefile.am
@@ -6,235 +6,120 @@ include $(top_srcdir)/automake/compile.am
 
 EXEEXT =
 
-EXTRA_PROGRAMS =
-CLEANFILES =
-project_lib_DATA =
+project_lib_PROGRAMS =
 
-EXTRA_PROGRAMS += no-ext.rel
-CLEANFILES += no-ext.rel
+project_lib_PROGRAMS += no-ext.rel
 no_ext_rel_SOURCES = sapi/no-ext.c
 no_ext_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_ext_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-ext_g.rel
-CLEANFILES += no-ext_g.rel
-no_ext_g_rel_SOURCES = $(no_ext_rel_SOURCES)
-no_ext_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_ext_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-ext$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-io.rel
-CLEANFILES += no-io.rel
+project_lib_PROGRAMS += no-io.rel
 no_io_rel_SOURCES = sapi/no-io.c
 no_io_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_io_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-io_g.rel
-CLEANFILES += no-io_g.rel
-no_io_g_rel_SOURCES = $(no_io_rel_SOURCES)
-no_io_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_io_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-io$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-dpmem.rel
-CLEANFILES += no-dpmem.rel
+project_lib_PROGRAMS += no-dpmem.rel
 no_dpmem_rel_SOURCES = rtems/no-dpmem.c
 no_dpmem_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_dpmem_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-dpmem_g.rel
-CLEANFILES += no-dpmem_g.rel
-no_dpmem_g_rel_SOURCES = $(no_dpmem_rel_SOURCES)
-no_dpmem_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_dpmem_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-dpmem$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-event.rel
-CLEANFILES += no-event.rel
+project_lib_PROGRAMS += no-event.rel
 no_event_rel_SOURCES = rtems/no-event.c
 no_event_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_event_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-event_g.rel
-CLEANFILES += no-event_g.rel
-no_event_g_rel_SOURCES = $(no_event_rel_SOURCES)
-no_event_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_event_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-event$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-msg.rel
-CLEANFILES += no-msg.rel
+project_lib_PROGRAMS += no-msg.rel
 no_msg_rel_SOURCES = rtems/no-msg.c
 no_msg_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_msg_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-msg_g.rel
-CLEANFILES += no-msg_g.rel
-no_msg_g_rel_SOURCES = $(no_msg_rel_SOURCES)
-no_msg_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_msg_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-msg$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-mp.rel
-CLEANFILES += no-mp.rel
+project_lib_PROGRAMS += no-mp.rel
 no_mp_rel_SOURCES = rtems/no-mp.c
 no_mp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_mp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-mp_g.rel
-CLEANFILES += no-mp_g.rel
-no_mp_g_rel_SOURCES = $(no_mp_rel_SOURCES)
-no_mp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_mp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-mp$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-part.rel
-CLEANFILES += no-part.rel
+project_lib_PROGRAMS += no-part.rel
 no_part_rel_SOURCES = rtems/no-part.c
 no_part_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_part_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-part_g.rel
-CLEANFILES += no-part_g.rel
-no_part_g_rel_SOURCES = $(no_part_rel_SOURCES)
-no_part_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_part_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-part$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-region.rel
-CLEANFILES += no-region.rel
+project_lib_PROGRAMS += no-region.rel
 no_region_rel_SOURCES = rtems/no-region.c
 no_region_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_region_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-region_g.rel
-CLEANFILES += no-region_g.rel
-no_region_g_rel_SOURCES = $(no_region_rel_SOURCES)
-no_region_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_region_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-region$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-rtmon.rel
-CLEANFILES += no-rtmon.rel
+project_lib_PROGRAMS += no-rtmon.rel
 no_rtmon_rel_SOURCES = rtems/no-rtmon.c
 no_rtmon_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_rtmon_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-rtmon_g.rel
-CLEANFILES += no-rtmon_g.rel
-no_rtmon_g_rel_SOURCES = $(no_rtmon_rel_SOURCES)
-no_rtmon_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_rtmon_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-rtmon$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-sem.rel
-CLEANFILES += no-sem.rel
+project_lib_PROGRAMS += no-sem.rel
 no_sem_rel_SOURCES = rtems/no-sem.c
 no_sem_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_sem_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-sem_g.rel
-CLEANFILES += no-sem_g.rel
-no_sem_g_rel_SOURCES = $(no_sem_rel_SOURCES)
-no_sem_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_sem_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-sem$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-signal.rel
-CLEANFILES += no-signal.rel
+project_lib_PROGRAMS += no-signal.rel
 no_signal_rel_SOURCES = rtems/no-signal.c
 no_signal_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_signal_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-signal_g.rel
-CLEANFILES += no-signal_g.rel
-no_signal_g_rel_SOURCES = $(no_signal_rel_SOURCES)
-no_signal_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_signal_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-signal$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += no-timer.rel
-CLEANFILES += no-timer.rel
+project_lib_PROGRAMS += no-timer.rel
 no_timer_rel_SOURCES = rtems/no-timer.c
 no_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 no_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += no-timer_g.rel
-CLEANFILES += no-timer_g.rel
-no_timer_g_rel_SOURCES = $(no_timer_rel_SOURCES)
-no_timer_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-no_timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-project_lib_DATA += no-timer$(LIB_VARIANT).rel
-
 all-local: $(TMPINSTALL_FILES)
 
 TMPINSTALL_FILES =
 
-$(PROJECT_LIB)/$(dirstamp):
-	@$(mkdir_p) $(PROJECT_LIB)
-	@: > $(PROJECT_LIB)/$(dirstamp)
-TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel: no-ext$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-ext$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-ext.rel: no-ext.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-ext.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-ext.rel
 
-$(PROJECT_LIB)/no-io$(LIB_VARIANT).rel: no-io$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-io$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-io.rel: no-io.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-io.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-io.rel
 
-$(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel: no-dpmem$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-dpmem$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-dpmem.rel: no-dpmem.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-dpmem.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-dpmem.rel
 
-$(PROJECT_LIB)/no-event$(LIB_VARIANT).rel: no-event$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-event$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-event.rel: no-event.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-event.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-event.rel
 
-$(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel: no-msg$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-msg$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-msg.rel: no-msg.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-msg.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-msg.rel
 
-$(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel: no-mp$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-mp$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-mp.rel: no-mp.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-mp.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-mp.rel
 
-$(PROJECT_LIB)/no-part$(LIB_VARIANT).rel: no-part$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-part$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-part.rel: no-part.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-part.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-part.rel
 
-$(PROJECT_LIB)/no-region$(LIB_VARIANT).rel: no-region$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-region$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-region.rel: no-region.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-region.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-region.rel
 
-$(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel: no-rtmon$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-rtmon$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-rtmon.rel: no-rtmon.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-rtmon.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-rtmon.rel
 
-$(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel: no-sem$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-sem$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-sem.rel: no-sem.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-sem.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-sem.rel
 
-$(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel: no-signal$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-signal$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-signal.rel: no-signal.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-signal.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-signal.rel
 
-$(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel: no-timer$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer$(LIB_VARIANT).rel
+$(PROJECT_LIB)/no-timer.rel: no-timer.rel $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $(PROJECT_LIB)/no-timer.rel
+TMPINSTALL_FILES += $(PROJECT_LIB)/no-timer.rel
 
-CLEANFILES += $(TMPINSTALL_FILES)
+CLEANFILES = $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/support/Makefile.am b/c/src/support/Makefile.am
index 04b5b05114..2427bdee38 100644
--- a/c/src/support/Makefile.am
+++ b/c/src/support/Makefile.am
@@ -6,16 +6,9 @@ include $(top_srcdir)/automake/compile.am
 
 AM_CPPFLAGS += -DRTEMS_BSP=\"@RTEMS_BSP@\"
 
-EXTRA_LIBRARIES = libsupport.a
-CLEANFILES = libsupport.a
+noinst_LIBRARIES = libsupport.a
+
 libsupport_a_SOURCES = version.c
 libsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 
-EXTRA_LIBRARIES += libsupport_g.a
-CLEANFILES += libsupport_g.a
-libsupport_g_a_SOURCES = $(libsupport_a_SOURCES)
-libsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-
-noinst_DATA = libsupport$(LIB_VARIANT).a
-
 include $(top_srcdir)/automake/local.am
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 5e2adaf76c..5ccc8e9c49 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -7,86 +7,79 @@
 include $(top_srcdir)/automake/compile.am
 
 ## Setup the variant build subdirectory
-ARCH_OPTIMIZE_V = o-optimize
-ARCH_DEBUG_V = o-debug
-
-ARCH__V = $(ARCH_OPTIMIZE_V)
-ARCH = $(ARCH_$(VARIANT_V)_V)
-
-project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
+project_lib_DATA = o-optimize/librtemsbsp.a
 CLEANFILES = o-optimize/librtemsbsp.a
-CLEANFILES += o-debug/librtemsbsp_g.a
 
-SRCS = ../support/libsupport$(LIB_VARIANT).a
+SRCS = ../support/libsupport.a
 
 if HAS_LIBBSP
 if HAS_WRAPUP_LIBBSP
 SRCS += \
-    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
+    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/o-optimize/libbsp.a
 else
-SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp$(LIB_VARIANT).a
+SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
 endif
 endif
 
 if HAS_NETWORKING
-SRCS += ../libnetworking/pppd/libpppd$(LIB_VARIANT).a
-SRCS += ../libnetworking/rtems_servers/libftpd$(LIB_VARIANT).a
-SRCS += ../libnetworking/rtems_telnetd/libtelnetd$(LIB_VARIANT).a
+SRCS += ../libnetworking/pppd/libpppd.a
+SRCS += ../libnetworking/rtems_servers/libftpd.a
+SRCS += ../libnetworking/rtems_telnetd/libtelnetd.a
 endif
 
 if HAS_RDBG
-SRCS += ../librdbg/librdbg$(LIB_VARIANT).a
+SRCS += ../librdbg/librdbg.a
 endif
 
 # FIXME: ATM, there is no libcpu.a, anymore.
-# SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
+# SRCS += $(wildcard $(PROJECT_LIB)/libcpu.a)
 
 if LIBCHIP
-SRCS += ../libchip/librtcio$(LIB_VARIANT).a
-SRCS += ../libchip/libserialio$(LIB_VARIANT).a
-SRCS += ../libchip/libide$(LIB_VARIANT).a
+SRCS += ../libchip/librtcio.a
+SRCS += ../libchip/libserialio.a
+SRCS += ../libchip/libide.a
 if HAS_NETWORKING
-SRCS += ../libchip/libnetchip$(LIB_VARIANT).a
+SRCS += ../libchip/libnetchip.a
 endif
 endif
 
-SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
+SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor.$(OBJEXT))
 
 if HAS_MP
-SRCS += ../libchip/shmdr$(LIB_VARIANT).rel
+SRCS += ../libchip/shmdr.rel
 endif
 
 all-local: $(TMPINSTALL_FILES)
 
-$(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS)
+o-optimize/librtemsbsp.a: $(SRCS)
 	rm -f $@
-	$(mkdir_p) $(ARCH)
-	rm -rf $(ARCH)/*.a $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
+	$(mkdir_p) o-optimize
+	rm -rf o-optimize/*.a o-optimize/*.$(OBJEXT) o-optimize/*.rel
 	for f in $(SRCS); do \
 	  case $$f in \
 	  *.$(OBJEXT) | *.rel) \
-	    if test -f $(ARCH)/`basename $$f`; then \
-	      if cmp $$f $(ARCH)/`basename $$f`; then \
+	    if test -f o-optimize/`basename $$f`; then \
+	      if cmp $$f o-optimize/`basename $$f`; then \
 		true; \
 	      else \
 		echo 1>&2 "ERROR -- `basename $$f` in multiple files"; \
 		exit 1; \
 	      fi; \
 	    else \
-	      cp $$f $(ARCH)/; \
-	      chmod a-w $(ARCH)/`basename $$f`; \
+	      cp $$f o-optimize/; \
+	      chmod a-w o-optimize/`basename $$f`; \
 	    fi; \
 	    ;; \
 	  *.a) \
-	    cd $(ARCH); \
+	    cd o-optimize; \
 	      $(AR) xv ../$$f || exit 1; \
 	      chmod a-w * ; \
             cd ..; \
 	    ;; \
 	  esac; \
 	done
-	$(AR) rc $@ $(ARCH)/*
-	rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
+	$(AR) rc $@ o-optimize/*
+	rm -f o-optimize/*.$(OBJEXT) o-optimize/*.rel
 	$(RANLIB) $@
 
 TMPINSTALL_FILES =
@@ -96,9 +89,9 @@ $(PROJECT_LIB)/$(dirstamp):
 	@: > $(PROJECT_LIB)/$(dirstamp)
 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
 
-$(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
+$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp.a
 
 CLEANFILES += $(TMPINSTALL_FILES)