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

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

3 files changed, 27 insertions, 94 deletions

diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
index e953bd9efa..bac17ba677 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am, wrapup/Makefile.am: Remove build-variant support.
+
 2004-09-24	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* configure.ac: Require automake > 1.9.
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
index e088442232..4535a684b6 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
@@ -15,68 +15,40 @@ dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
+
 nodist_include_HEADERS = include/bspopts.h
+DISTCLEANFILES = include/bspopts.h
 
-EXTRA_PROGRAMS =
-CLEANFILES =
-noinst_DATA =
+noinst_PROGRAMS =
 
 include_HEADERS += include/dmv170.h
 nodist_include_HEADERS += ../../shared/tod.h
 nodist_include_HEADERS += ../../shared/include/coverhd.h
 
 EXTRA_DIST = start/start.S
-start$(LIB_VARIANT).$(OBJEXT): start/start.S
+start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -DASM -o $@ -c $<
-project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT)
+project_lib_DATA = start.$(OBJEXT)
 
 dist_project_lib_DATA += startup/linkcmds
 
-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
-
-EXTRA_PROGRAMS += console.rel
-CLEANFILES += console.rel
+noinst_PROGRAMS += console.rel
 console_rel_SOURCES = console/conscfg.c console/debugio.c \
     ../../shared/console.c
 console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += console_g.rel
-CLEANFILES += console_g.rel
-console_g_rel_SOURCES = $(console_rel_SOURCES)
-console_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += console$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += scv64.rel
-CLEANFILES += scv64.rel
+noinst_PROGRAMS += scv64.rel
 scv64_rel_SOURCES = scv64/scv64.c
 scv64_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 scv64_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += scv64_g.rel
-CLEANFILES += scv64_g.rel
-scv64_g_rel_SOURCES = $(scv64_rel_SOURCES)
-scv64_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-scv64_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += scv64$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += startup.rel
-CLEANFILES += startup.rel
+noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/main.c ../../shared/sbrk.c startup/setvec.c \
@@ -84,57 +56,22 @@ startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
 startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += startup_g.rel
-CLEANFILES += startup_g.rel
-startup_g_rel_SOURCES = $(startup_rel_SOURCES)
-startup_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += startup$(LIB_VARIANT).rel
-
-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
-
-EXTRA_PROGRAMS += tod.rel
-CLEANFILES += tod.rel
+noinst_PROGRAMS += tod.rel
 tod_rel_SOURCES = tod/todcfg.c ../../shared/tod.c
 tod_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 tod_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += tod_g.rel
-CLEANFILES += tod_g.rel
-tod_g_rel_SOURCES = $(tod_rel_SOURCES)
-tod_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-tod_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += tod$(LIB_VARIANT).rel
-
 if HAS_NETWORKING
 sonic_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-EXTRA_PROGRAMS += sonic.rel
-CLEANFILES += sonic.rel
+noinst_PROGRAMS += sonic.rel
 sonic_rel_SOURCES = sonic/dmvsonic.c
 sonic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(sonic_CPPFLAGS)
 sonic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += sonic_g.rel
-CLEANFILES += sonic_g.rel
-sonic_g_rel_SOURCES = $(sonic_rel_SOURCES)
-sonic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(sonic_CPPFLAGS)
-sonic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += sonic$(LIB_VARIANT).rel
 endif
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
@@ -183,16 +120,16 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
-$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT)
+$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
 
 $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
-CLEANFILES += $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES = $(PREINSTALL_FILES)
+DISTCLEANFILES += $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/subdirs.am
diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
index ef41c6d0f6..d4f31edf38 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
@@ -4,24 +4,16 @@
 
 include $(top_srcdir)/../../../../automake/compile.am
 
-EXTRA_LIBRARIES = ../libbsp.a
+noinst_LIBRARIES = ../libbsp.a
 CLEANFILES = ../libbsp.a
 ___libbsp_a_SOURCES =
 
-___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \
-    ../console$(LIB_VARIANT).rel ../scv64$(LIB_VARIANT).rel \
-    ../timer$(LIB_VARIANT).rel ../tod$(LIB_VARIANT).rel
+___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../scv64.rel \
+    ../timer.rel ../tod.rel
 if HAS_NETWORKING
-___libbsp_a_LIBADD += ../sonic$(LIB_VARIANT).rel
+___libbsp_a_LIBADD += ../sonic.rel
 endif
-___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
-    ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel
-
-EXTRA_LIBRARIES += ../libbsp_g.a
-CLEANFILES += ../libbsp_g.a
-___libbsp_g_a_SOURCES = $(___libbsp_a_SOURCES)
-___libbsp_g_a_LIBADD = $(___libbsp_a_LIBADD)
-
-noinst_DATA = ../libbsp$(LIB_VARIANT).a
+___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel \
+    ../../../../libcpu/@RTEMS_CPU@/shared/cache.rel
 
 include $(top_srcdir)/../../../../automake/local.am