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

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

3 files changed, 29 insertions, 98 deletions

diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 57281fdaa9..c8eea7c4de 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-02	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am, wrapup/Makefile.am: Remove build-variant support.
+
 2004-11-20      Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
 
         PR 703/filesystem
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
index c222b64480..6c81216ab4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
@@ -15,11 +15,11 @@ 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_bspdir = $(includedir)/bsp
 
@@ -31,79 +31,33 @@ EXTRA_DIST = times-mbx821 times-mbx860
 
 dist_project_lib_DATA += startup/linkcmds
 
-EXTRA_PROGRAMS += pclock.rel
-CLEANFILES += pclock.rel
+noinst_PROGRAMS += pclock.rel
 pclock_rel_SOURCES = clock/p_clock.c
 pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += pclock_g.rel
-CLEANFILES += pclock_g.rel
-pclock_g_rel_SOURCES = $(pclock_rel_SOURCES)
-pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += pclock$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += console.rel
-CLEANFILES += console.rel
+noinst_PROGRAMS += console.rel
 console_rel_SOURCES = console/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 += irq.rel
-CLEANFILES += irq.rel
+noinst_PROGRAMS += irq.rel
 irq_rel_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c
 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
-
-EXTRA_PROGRAMS += ide.rel
-CLEANFILES += ide.rel
+noinst_PROGRAMS += ide.rel
 ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_ide.c
 ide_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += ide_g.rel
-CLEANFILES += ide_g.rel
-ide_g_rel_SOURCES = $(ide_rel_SOURCES)
-ide_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-ide_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += ide$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += vectors.rel
-CLEANFILES += vectors.rel
+noinst_PROGRAMS += vectors.rel
 vectors_rel_SOURCES = vectors/vectors.h vectors/vectors_init.c \
     vectors/vectors.S
 vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += vectors_g.rel
-CLEANFILES += vectors_g.rel
-vectors_g_rel_SOURCES = $(vectors_rel_SOURCES)
-vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += vectors$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += startup.rel
-CLEANFILES += startup.rel
+noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     startup/imbx8xx.c ../../shared/main.c startup/mmutlbtab.c \
@@ -111,31 +65,13 @@ startup_rel_SOURCES = ../../shared/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
-
 if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-EXTRA_PROGRAMS += network.rel
-CLEANFILES += network.rel
+noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/network.c
 network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-EXTRA_PROGRAMS += network_g.rel
-CLEANFILES += network_g.rel
-network_g_rel_SOURCES = $(network_rel_SOURCES)
-network_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
-    $(network_CPPFLAGS)
-network_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += network$(LIB_VARIANT).rel
 endif
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
@@ -202,8 +138,8 @@ $(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)
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
index 16d68e5cac..39738ec8a4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
@@ -4,33 +4,24 @@
 
 include $(top_srcdir)/../../../../automake/compile.am
 
-EXTRA_LIBRARIES = ../libbsp.a
+noinst_LIBRARIES = ../libbsp.a
 CLEANFILES = ../libbsp.a
 ___libbsp_a_SOURCES =
 
-___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \
-    ../ide$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \
-    ../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel
+___libbsp_a_LIBADD = ../pclock.rel ../irq.rel ../ide.rel ../startup.rel \
+    ../console.rel ../vectors.rel
 if HAS_NETWORKING
-___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel
+___libbsp_a_LIBADD += ../network.rel
 endif
 
-___libbsp_a_LIBADD += \
-    ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \
-    ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/mpc8xx/clock$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/mpc8xx/console-generic$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/mpc8xx/cpm$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/mpc8xx/mmu$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/mpc8xx/timer$(LIB_VARIANT).rel \
-    ../../../../libcpu/powerpc/mpc8xx/exceptions$(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 += ../../../../libcpu/powerpc/shared/cpuIdent.rel \
+    ../../../../libcpu/powerpc/shared/cache.rel \
+    ../@exceptions@/rtems-cpu.rel \
+    ../../../../libcpu/powerpc/mpc8xx/clock.rel \
+    ../../../../libcpu/powerpc/mpc8xx/console-generic.rel \
+    ../../../../libcpu/powerpc/mpc8xx/cpm.rel \
+    ../../../../libcpu/powerpc/mpc8xx/mmu.rel \
+    ../../../../libcpu/powerpc/mpc8xx/timer.rel \
+    ../../../../libcpu/powerpc/mpc8xx/exceptions.rel
 
 include $(top_srcdir)/../../../../automake/local.am