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

	* Makefile.am: Remove build-variant support.

1 files changed, 21 insertions, 85 deletions

diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am
index 9e83551133..82f8315314 100644
--- a/c/src/lib/libbsp/sparc/leon/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/Makefile.am
@@ -11,11 +11,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 =
 
 # wrapup is the one that actually builds and installs the library
 # from the individual .rel files built in other directories
@@ -25,15 +25,14 @@ include_HEADERS += include/leon.h
 include_HEADERS += include/coverhd.h
 
 EXTRA_DIST = ../../sparc/shared/start.S
-start$(LIB_VARIANT).$(OBJEXT): ../../sparc/shared/start.S
+start.$(OBJEXT): ../../sparc/shared/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 += startup.rel
-CLEANFILES += startup.rel
+noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = ../../sparc/shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../sparc/shared/bspstart.c ../../shared/main.c \
     ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \
@@ -41,111 +40,48 @@ startup_rel_SOURCES = ../../sparc/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
-
-EXTRA_PROGRAMS += gnatsupp.rel
-CLEANFILES += gnatsupp.rel
+noinst_PROGRAMS += gnatsupp.rel
 gnatsupp_rel_SOURCES = gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
 gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += gnatsupp_g.rel
-CLEANFILES += gnatsupp_g.rel
-gnatsupp_g_rel_SOURCES = $(gnatsupp_rel_SOURCES)
-gnatsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-gnatsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += gnatsupp$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += console.rel
-CLEANFILES += console.rel
+noinst_PROGRAMS += console.rel
 console_rel_SOURCES = console/console.c console/consolereserveresources.c \
     console/debugputs.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 += 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
-
-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
-
 if HAS_NETWORKING
 leon_open_eth_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-EXTRA_PROGRAMS += leon_open_eth.rel
-CLEANFILES += leon_open_eth.rel
+noinst_PROGRAMS += leon_open_eth.rel
 leon_open_eth_rel_SOURCES = leon_open_eth/leon_open_eth.c
 leon_open_eth_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \
     $(leon_open_eth_CPPFLAGS)
 leon_open_eth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += leon_open_eth_g.rel
-CLEANFILES += leon_open_eth_g.rel
-leon_open_eth_g_rel_SOURCES = $(leon_open_eth_rel_SOURCES)
-leon_open_eth_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \
     $(leon_open_eth_CPPFLAGS)
-leon_open_eth_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += leon_open_eth$(LIB_VARIANT).rel
 endif
 
-EXTRA_LIBRARIES = libbsp.a
-CLEANFILES += libbsp.a
+noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \
-    clock$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel \
-    gnatsupp$(LIB_VARIANT).rel
+libbsp_a_LIBADD = startup.rel console.rel clock.rel timer.rel gnatsupp.rel
 
 if HAS_NETWORKING
-libbsp_a_LIBADD += leon_open_eth$(LIB_VARIANT).rel
+libbsp_a_LIBADD += leon_open_eth.rel
 endif
 
-libbsp_a_LIBADD += ../../../libcpu/sparc/cache$(LIB_VARIANT).rel \
-    ../../../libcpu/sparc/reg_win$(LIB_VARIANT).rel \
-    ../../../libcpu/sparc/syscall$(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/sparc/cache.rel \
+    ../../../libcpu/sparc/reg_win.rel ../../../libcpu/sparc/syscall.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
@@ -189,16 +125,16 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(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/local.am