1 files changed, 23 insertions, 78 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 02b050bb80..79d6963f2d 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/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 =
 
 SUBDIRS = . tools
 
@@ -29,16 +29,15 @@ nodist_include_HEADERS += ../../shared/tod.h
 EXTRA_DIST = times
 
 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 startup/gdbinit \
     startup/linkcmds.flash
 
-EXTRA_PROGRAMS += startup.rel
-CLEANFILES += startup.rel
+noinst_PROGRAMS += startup.rel
 startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \
     startup/bspstart.c startup/init5206e.c ../../shared/bootcard.c \
@@ -47,89 +46,35 @@ 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 += 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 += i2c.rel
-CLEANFILES += i2c.rel
+noinst_PROGRAMS += i2c.rel
 i2c_rel_SOURCES = i2c/i2c.c i2c/i2cdrv.c
 i2c_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 i2c_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += i2c_g.rel
-CLEANFILES += i2c_g.rel
-i2c_g_rel_SOURCES = $(i2c_rel_SOURCES)
-i2c_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-i2c_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += i2c$(LIB_VARIANT).rel
-
-EXTRA_PROGRAMS += tod.rel
-CLEANFILES += tod.rel
+noinst_PROGRAMS += tod.rel
 tod_rel_SOURCES = tod/ds1307.c 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
-
-EXTRA_PROGRAMS += nvram.rel
-CLEANFILES += nvram.rel
+noinst_PROGRAMS += nvram.rel
 nvram_rel_SOURCES = nvram/nvram.c
 nvram_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 nvram_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-EXTRA_PROGRAMS += nvram_g.rel
-CLEANFILES += nvram_g.rel
-nvram_g_rel_SOURCES = $(nvram_rel_SOURCES)
-nvram_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
-nvram_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-noinst_DATA += nvram$(LIB_VARIANT).rel
-
-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 \
-    i2c$(LIB_VARIANT).rel tod$(LIB_VARIANT).rel nvram$(LIB_VARIANT).rel
-libbsp_a_LIBADD += \
-    ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \
-    ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/clock$(LIB_VARIANT).rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/mcfuart$(LIB_VARIANT).rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/timer$(LIB_VARIANT).rel \
-    ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus$(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 = startup.rel console.rel i2c.rel tod.rel nvram.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \
+    ../../../libcpu/@RTEMS_CPU@/mcf5206/clock.rel \
+    ../../../libcpu/@RTEMS_CPU@/mcf5206/mcfuart.rel \
+    ../../../libcpu/@RTEMS_CPU@/mcf5206/timer.rel \
+    ../../../libcpu/@RTEMS_CPU@/mcf5206/mbus.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
@@ -187,9 +132,9 @@ $(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.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
@@ -203,8 +148,8 @@ $(PROJECT_LIB)/linkcmds.flash: startup/linkcmds.flash $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.flash
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.flash
 
-CLEANFILES += $(PREINSTALL_FILES)
-DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES = $(PREINSTALL_FILES)
+DISTCLEANFILES += $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/../../../../automake/local.am