From 4cbf22a237d76cf5d3952aec61176ed6dffee571 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 2 Jan 2005 21:06:25 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am: Remove build-variant support. --- c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog | 4 + c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am | 89 +++---------- c/src/lib/libbsp/arm/armulator/ChangeLog | 4 + c/src/lib/libbsp/arm/armulator/Makefile.am | 77 +++-------- c/src/lib/libbsp/arm/csb336/ChangeLog | 4 + c/src/lib/libbsp/arm/csb336/Makefile.am | 77 +++-------- c/src/lib/libbsp/arm/csb337/ChangeLog | 4 + c/src/lib/libbsp/arm/csb337/Makefile.am | 81 +++-------- c/src/lib/libbsp/arm/edb7312/ChangeLog | 4 + c/src/lib/libbsp/arm/edb7312/Makefile.am | 101 +++----------- c/src/lib/libbsp/arm/vegaplus/ChangeLog | 4 + c/src/lib/libbsp/arm/vegaplus/Makefile.am | 88 +++--------- c/src/lib/libbsp/i386/i386ex/ChangeLog | 4 + c/src/lib/libbsp/i386/i386ex/Makefile.am | 94 +++---------- c/src/lib/libbsp/i386/pc386/ChangeLog | 4 + c/src/lib/libbsp/i386/pc386/Makefile.am | 178 +++++-------------------- c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 4 + c/src/lib/libbsp/i386/ts_386ex/Makefile.am | 93 +++---------- c/src/lib/libbsp/m68k/csb360/ChangeLog | 4 + c/src/lib/libbsp/m68k/csb360/Makefile.am | 60 +++------ c/src/lib/libbsp/m68k/dmv152/ChangeLog | 4 + c/src/lib/libbsp/m68k/dmv152/Makefile.am | 94 +++---------- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 4 + c/src/lib/libbsp/m68k/gen68302/Makefile.am | 96 +++---------- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 4 + c/src/lib/libbsp/m68k/gen68340/Makefile.am | 82 +++--------- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 4 + c/src/lib/libbsp/m68k/gen68360/Makefile.am | 99 +++----------- c/src/lib/libbsp/m68k/idp/ChangeLog | 4 + c/src/lib/libbsp/m68k/idp/Makefile.am | 82 +++--------- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 4 + c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am | 101 ++++---------- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 4 + c/src/lib/libbsp/m68k/mrm332/Makefile.am | 94 +++---------- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme136/Makefile.am | 95 +++---------- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme147/Makefile.am | 82 +++--------- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 95 +++---------- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme162/Makefile.am | 110 +++------------ c/src/lib/libbsp/m68k/mvme167/ChangeLog | 4 + c/src/lib/libbsp/m68k/mvme167/Makefile.am | 110 +++------------ c/src/lib/libbsp/m68k/ods68302/ChangeLog | 4 + c/src/lib/libbsp/m68k/ods68302/Makefile.am | 85 +++--------- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 4 + c/src/lib/libbsp/m68k/sim68000/Makefile.am | 83 +++--------- 48 files changed, 576 insertions(+), 1766 deletions(-) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog index 68184adcbf..c1532ff931 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-05 Joel Sherrill * startup/linkcmds: Add .gnu.linkonce.b section. diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am index 7b1930783a..779e8a7638 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/Makefile.am @@ -4,9 +4,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -15,21 +13,22 @@ 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 include_HEADERS += include/registers.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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/exit.c ../../shared/bootcard.c \ ../../shared/main.c ../../shared/sbrk.c \ @@ -37,88 +36,34 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.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 += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/clockdrv.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 = ../../arm/shared/comm/uart.c \ ../../arm/shared/comm/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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = ../../shared/timerstub.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 - include_HEADERS += irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c ../../arm/shared/irq/irq_init.c \ irq/bsp_irq_init.c ../../arm/shared/irq/irq_asm.S irq/bsp_irq_asm.S \ irq/irq.h 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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = - -libbsp_a_LIBADD= clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ - startup$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel irq$(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= clock.rel console.rel startup.rel timer.rel irq.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -160,9 +105,9 @@ $(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 @@ -172,8 +117,8 @@ $(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index 4319295a71..50a49e997b 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-05 Joel Sherrill * startup/linkcmds: Add .gnu.linkonce.b section. diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am index 1c6fadffe4..0add1387be 100644 --- a/c/src/lib/libbsp/arm/armulator/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/Makefile.am @@ -4,9 +4,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -15,19 +13,20 @@ 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 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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/trap.S ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/main.c ../../shared/sbrk.c \ @@ -35,68 +34,24 @@ startup_rel_SOURCES = startup/trap.S ../../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 += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/clockdrv.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/console-io.c ../../shared/console-polled.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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = ../../shared/timerstub.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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(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 clock.rel console.rel timer.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -134,16 +89,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/local.am diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog index bacf265d52..ca8a97362e 100644 --- a/c/src/lib/libbsp/arm/csb336/ChangeLog +++ b/c/src/lib/libbsp/arm/csb336/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-05 Joel Sherrill * startup/linkcmds: Add .gnu.linkonce.b section and account for memory diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index 0974989ab2..2ca10dd7a1 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -11,23 +11,22 @@ 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 = 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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/exit.c startup/memmap.c \ ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \ @@ -35,66 +34,30 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.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/uart.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 - 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/lan91c11x.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 -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 +libbsp_a_LIBADD = startup.rel console.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/arm920$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq$(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/@RTEMS_CPU@/shared/arm920.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -132,16 +95,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/local.am diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog index 82d9eb6d56..a8bb89a3df 100644 --- a/c/src/lib/libbsp/arm/csb337/ChangeLog +++ b/c/src/lib/libbsp/arm/csb337/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-05 Joel Sherrill * startup/linkcmds: Add .gnu.linkonce.b section. diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 4a5ce41f55..91295b9bf4 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -11,23 +11,22 @@ 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 = 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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/exit.c startup/memmap.c \ ../../shared/bootcard.c ../../shared/main.c ../../shared/sbrk.c \ @@ -35,68 +34,32 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.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/uarts.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 - 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 -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 +libbsp_a_LIBADD = startup.rel console.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/arm920$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq$(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/@RTEMS_CPU@/shared/arm920.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -134,16 +97,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/local.am diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 9c5a8abec7..3e77fca1a6 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-05 Joel Sherrill * startup/linkcmds: Add .gnu.linkonce.b section and account for memory diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index 2ad1ae748e..b388417765 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -11,24 +11,23 @@ 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/ep7312.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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/exit.c ../../shared/bootcard.c \ ../../shared/main.c ../../shared/sbrk.c \ @@ -36,107 +35,45 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.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 += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/clockdrv.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/uart.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 += 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 - include_HEADERS += irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c irq/bsp_irq_init.c \ ../../arm/shared/irq/irq_init.c irq/bsp_irq_asm.S \ ../../arm/shared/irq/irq_asm.S irq/irq.h 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 - 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 -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ - startup$(LIB_VARIANT).rel irq$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = clock.rel console.rel startup.rel irq.rel timer.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -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 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -178,9 +115,9 @@ $(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 @@ -190,8 +127,8 @@ $(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index 698b4d133e..f24cec60e1 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-05 Joel Sherrill * startup/linkcmds: Add .gnu.linkonce.b section. diff --git a/c/src/lib/libbsp/arm/vegaplus/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/Makefile.am index 526286b433..2de91cd884 100644 --- a/c/src/lib/libbsp/arm/vegaplus/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/Makefile.am @@ -11,25 +11,24 @@ 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/registers.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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/exit.c ../../shared/bootcard.c \ ../../shared/main.c ../../shared/sbrk.c \ @@ -37,87 +36,34 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.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 - include_HEADERS += irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c ../../arm/shared/irq/irq_init.c \ irq/bsp_irq_init.c ../../arm/shared/irq/irq_asm.S irq/bsp_irq_asm.S \ irq/irq.h 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 += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/clockdrv.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 = ../../arm/shared/comm/uart.c \ ../../arm/shared/comm/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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = ../../shared/timerstub.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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ - startup$(LIB_VARIANT).rel irq$(LIB_VARIANT).rel timer$(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 = clock.rel console.rel startup.rel irq.rel timer.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -159,9 +105,9 @@ $(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 @@ -171,8 +117,8 @@ $(PROJECT_INCLUDE)/irq.h: irq/irq.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/irq.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index ed7f3c8a66..25a22e5464 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am index 13e0ad6a31..ddd1a38920 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am @@ -11,24 +11,23 @@ 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/coverhd.h noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc 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 += 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 \ ../../shared/main.c ../../shared/sbrk.c ../../i386/shared/irq/idt.c \ @@ -40,92 +39,39 @@ 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 - -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 += 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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += network.rel -CLEANFILES += network.rel +noinst_PROGRAMS += network.rel network_rel_SOURCES = network/netexterns.h network/network.c \ network/uti596.h 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_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += network$(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 clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \ - ../../../libcpu/i386/score$(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/i386/cache.rel \ + ../../../libcpu/i386/score.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -163,16 +109,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 diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 3fcf5e5d48..9346a34805 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-20 Thomas Doerfler PR 703/filesystem diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index f25452f4c8..c57cac194b 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -14,11 +14,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 @@ -26,48 +26,38 @@ include_HEADERS += include/crt.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) EXTRA_DIST += start/start16.S start16.$(OBJEXT): start/start16.S $(CPPASCOMPILE) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ -c $< -start16$(LIB_VARIANT)-elf32.$(OBJEXT): start16.$(OBJEXT) +start16-elf32.$(OBJEXT): start16.$(OBJEXT) $(LD) -N -T $(top_srcdir)/startup/linkcmds -Ttext $(START16ADDR) -e start16 -nostdlib \ --oformat=elf32-i386 \ -o $@ $< -start16$(LIB_VARIANT).bin: start16$(LIB_VARIANT)-elf32.$(OBJEXT) +start16.bin: start16-elf32.$(OBJEXT) $(OBJCOPY) -O binary $< $@ -CLEANFILES += start16.bin start16_g.bin +CLEANFILES += start16.bin -project_lib_DATA += start16$(LIB_VARIANT).bin +project_lib_DATA += start16.bin dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/ckinit.c clock/todcfg.c ../../shared/tod.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 - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = console/keyboard.h console/kd.h \ console/serial_mouse.h console/ps2_drv.h console/fb_vga.h -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console.c console/inch.c console/outch.c \ console/defkeymap.c console/fb_vga.c console/keyboard.c \ console/mouse_parser.c console/pc_keyb.c console/ps2_mouse.c \ @@ -76,60 +66,24 @@ console_rel_SOURCES = console/console.c console/inch.c console/outch.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 += gdb.rel -CLEANFILES += gdb.rel +noinst_PROGRAMS += gdb.rel gdb_rel_SOURCES = ../../i386/shared/comm/i386-stub.c \ ../../i386/shared/comm/i386-stub-glue.c \ ../../i386/shared/comm/gdb_glue.c gdb_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) gdb_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += gdb_g.rel -CLEANFILES += gdb_g.rel -gdb_g_rel_SOURCES = $(gdb_rel_SOURCES) -gdb_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -gdb_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += gdb$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += gnat.rel -CLEANFILES += gnat.rel +noinst_PROGRAMS += gnat.rel gnat_rel_SOURCES = ../../shared/gnatinstallhandler.c gnat_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) gnat_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += gnat_g.rel -CLEANFILES += gnat_g.rel -gnat_g_rel_SOURCES = $(gnat_rel_SOURCES) -gnat_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -gnat_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += gnat$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += pci.rel -CLEANFILES += pci.rel +noinst_PROGRAMS += pci.rel pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c pci_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pci_g.rel -CLEANFILES += pci_g.rel -pci_g_rel_SOURCES = $(pci_rel_SOURCES) -pci_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pci$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup/bspstart.c startup/exit.c ../../i386/shared/irq/idt.c \ ../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \ @@ -138,44 +92,18 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.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/timerisr.S 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 ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += ne2000.rel -CLEANFILES += ne2000.rel +noinst_PROGRAMS += ne2000.rel ne2000_rel_SOURCES = ne2000/ne2000.c ne2000_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ $(ne2000_CPPFLAGS) ne2000_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += ne2000_g.rel -CLEANFILES += ne2000_g.rel -ne2000_g_rel_SOURCES = $(ne2000_rel_SOURCES) -ne2000_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(ne2000_CPPFLAGS) -ne2000_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += ne2000$(LIB_VARIANT).rel endif if HAS_NETWORKING @@ -184,75 +112,37 @@ if HAS_NETWORKING include_HEADERS += include/wd80x3.h wd8003_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += wd8003.rel -CLEANFILES += wd8003.rel +noinst_PROGRAMS += wd8003.rel wd8003_rel_SOURCES = wd8003/wd8003.c include/wd80x3.h wd8003_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ $(wd8003_CPPFLAGS) wd8003_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += wd8003_g.rel -CLEANFILES += wd8003_g.rel -wd8003_g_rel_SOURCES = $(wd8003_rel_SOURCES) -wd8003_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(wd8003_CPPFLAGS) -wd8003_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += wd8003$(LIB_VARIANT).rel endif if HAS_NETWORKING 3c509_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += 3c509.rel -CLEANFILES += 3c509.rel +noinst_PROGRAMS += 3c509.rel 3c509_rel_SOURCES = 3c509/3c509.c 3c509/3c509.h 3c509/elink.c 3c509/elink.h 3c509_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(3c509_CPPFLAGS) 3c509_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += 3c509_g.rel -CLEANFILES += 3c509_g.rel -3c509_g_rel_SOURCES = $(3c509_rel_SOURCES) -3c509_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(3c509_CPPFLAGS) -3c509_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += 3c509$(LIB_VARIANT).rel endif -EXTRA_PROGRAMS += ide.rel -CLEANFILES += ide.rel +noinst_PROGRAMS += ide.rel ide_rel_SOURCES = ide/idecfg.c ide/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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel ide$(LIB_VARIANT).rel \ - gdb$(LIB_VARIANT).rel gnat$(LIB_VARIANT).rel pci$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel ide.rel \ + gdb.rel gnat.rel pci.rel # We only build the Network library if HAS_NETWORKING was defined # dec21140 is supported via libchip if HAS_NETWORKING -libbsp_a_LIBADD += ne2000$(LIB_VARIANT).rel wd8003$(LIB_VARIANT).rel \ - 3c509$(LIB_VARIANT).rel +libbsp_a_LIBADD += ne2000.rel wd8003.rel 3c509.rel endif -libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \ - ../../../libcpu/i386/page$(LIB_VARIANT).rel \ - ../../../libcpu/i386/score$(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/i386/cache.rel \ + ../../../libcpu/i386/page.rel ../../../libcpu/i386/score.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -296,13 +186,13 @@ $(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)/start16$(LIB_VARIANT).bin: start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/start16$(LIB_VARIANT).bin -TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin +$(PROJECT_LIB)/start16.bin: start16.bin $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start16.bin +TMPINSTALL_FILES += $(PROJECT_LIB)/start16.bin $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds @@ -339,8 +229,8 @@ $(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h endif -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index 2a342fdae5..f0e2fb6467 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am index f8511448df..4ee988ab0c 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/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 @@ -26,15 +26,14 @@ include_HEADERS += include/coverhd.h noinst_HEADERS = start/80386ex.h start/80386ex.inc start/macros.inc \ start/ts_1325.inc 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 += 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 \ ../../shared/main.c ../../shared/sbrk.c ../../i386/shared/irq/idt.c \ @@ -46,96 +45,44 @@ 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 - -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/ckinit.c clock/rtc.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/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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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 include_HEADERS += include/wd80x3.h # dec21140 is supported via libchip # FIXME: Do we really need these flags? network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += network.rel -CLEANFILES += network.rel +noinst_PROGRAMS += network.rel network_rel_SOURCES = network/ne2000.c network/wd80x3.h 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 -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/i386/cache$(LIB_VARIANT).rel \ - ../../../libcpu/i386/score$(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/i386/cache.rel \ + ../../../libcpu/i386/score.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -173,9 +120,9 @@ $(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 @@ -187,8 +134,8 @@ $(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h endif -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index 930609a852..9b2a71762c 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index 7641aacd68..b3fe1f6314 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -11,26 +11,25 @@ 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/coverhd.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 -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/init5272.c ../../shared/bootcard.c \ @@ -39,43 +38,18 @@ 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 - # console -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console-io.c ../../shared/console-polled.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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel console$(LIB_VARIANT).rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/mcf5272/clock$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/mcf5272/timer$(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 +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ + ../../../libcpu/@RTEMS_CPU@/mcf5272/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/mcf5272/timer.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -113,16 +87,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 diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog index 0765afa053..adbeafa3af 100644 --- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog +++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/dmv152/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/Makefile.am index f380169437..916faeef31 100644 --- a/c/src/lib/libbsp/m68k/dmv152/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/Makefile.am @@ -11,23 +11,22 @@ 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/coverhd.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -36,86 +35,31 @@ 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 += 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 += 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 += spurious.rel -CLEANFILES += spurious.rel +noinst_PROGRAMS += spurious.rel spurious_rel_SOURCES = spurious/spinit.c spurious_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) spurious_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += spurious_g.rel -CLEANFILES += spurious_g.rel -spurious_g_rel_SOURCES = $(spurious_rel_SOURCES) -spurious_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -spurious_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += spurious$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel spurious$(LIB_VARIANT).rel \ - timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel spurious.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -155,16 +99,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 diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 0a3a855632..b5d4337bde 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 8700f49586..468b446df8 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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 = include_HEADERS += include/coverhd.h include_HEADERS += include/m302_int.h @@ -23,14 +23,13 @@ include_HEADERS += include/m302_int.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 -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 \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -39,93 +38,38 @@ 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 += 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 += 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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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 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 -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -167,16 +111,16 @@ $(PROJECT_INCLUDE)/m302_int.h: include/m302_int.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m302_int.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m302_int.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 diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index b2ee3d4061..a2783a86d8 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 2646d333bf..6fad445192 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/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 = include_HEADERS += include/coverhd.h include_HEADERS += include/m340uart.h @@ -25,14 +25,13 @@ include_HEADERS += include/m68340.inc include_HEADERS += include/m68349.inc EXTRA_DIST = start/start.S start/startfor340only.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 += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c startup/init68340.c \ ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ @@ -41,72 +40,27 @@ 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 += 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 += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/Modif_cpu_asm.S console/console.c \ console/m340uart.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 += 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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -164,16 +118,16 @@ $(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68349.inc PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc -$(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 diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index b3db322c6b..efa9b16f12 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds, startup/linkcmds.bootp, startup/linkcmds.prom: Add diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index fbca9f7a78..1655e14839 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am @@ -11,24 +11,23 @@ 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/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 startup/linkcmds.prom \ startup/linkcmds.bootp -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/alloc360.c startup/bspclean.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../m68k/shared/m68kpretaskinghook.c startup/bspstart.c \ @@ -38,98 +37,42 @@ startup_rel_SOURCES = startup/alloc360.c startup/bspclean.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 += 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/console.c console/consolereserveresources.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 += 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 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 -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel if HAS_FPSP -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif -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 - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = @@ -166,9 +109,9 @@ $(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 @@ -182,8 +125,8 @@ $(PROJECT_LIB)/linkcmds.bootp: startup/linkcmds.bootp $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.bootp PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.bootp -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index a633278f35..59d8c1969c 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2005-01-02 Ralf Corsepius * console/leds.c: Fix prototype of led_putnum(). diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index a79f497c02..d8d33ede6f 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -11,24 +11,23 @@ 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/leds.h nodist_include_HEADERS += ../../shared/include/coverhd.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -37,75 +36,30 @@ 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 - -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 += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console.c console/leds.c console/mc68ec.c \ console/duart.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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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_DIST += include/README EXTRA_DIST += times -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -147,16 +101,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/local.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index c22d18f5fc..5c1e32d065 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds, startup/linkcmds.flash: Add new bss sections .bss.* 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 diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 3cb860637a..e77256d487 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds, startup/linkcmds_ROM: Add new bss sections .bss.* diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index 6f6b6e8524..bd332e096f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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 = include_HEADERS += include/mrm332.h nodist_include_HEADERS += ../../shared/include/coverhd.h @@ -23,15 +23,14 @@ nodist_include_HEADERS += ../../shared/include/coverhd.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/linkcmds_ROM -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c startup/bspclean.c \ ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ @@ -40,86 +39,31 @@ startup_rel_SOURCES = startup/start_c.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 += 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 += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console.c console/sci.c console/sci.h 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 += spurious.rel -CLEANFILES += spurious.rel +noinst_PROGRAMS += spurious.rel spurious_rel_SOURCES = spurious/spinit.c spurious_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) spurious_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += spurious_g.rel -CLEANFILES += spurious_g.rel -spurious_g_rel_SOURCES = $(spurious_rel_SOURCES) -spurious_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -spurious_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += spurious$(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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel spurious$(LIB_VARIANT).rel \ - timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel spurious.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -161,9 +105,9 @@ $(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 @@ -173,8 +117,8 @@ $(PROJECT_LIB)/linkcmds_ROM: startup/linkcmds_ROM $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds_ROM PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds_ROM -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 2f8915d7b4..2ba3b041db 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index 502a37165d..cfddc23b4d 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -11,24 +11,23 @@ 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/coverhd.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -37,91 +36,37 @@ 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 += 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 += 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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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_MP -EXTRA_PROGRAMS += shmsupp.rel -CLEANFILES += shmsupp.rel +noinst_PROGRAMS += shmsupp.rel shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/mpisr.c shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += shmsupp_g.rel -CLEANFILES += shmsupp_g.rel -shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES) -shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += shmsupp$(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 clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel if HAS_MP -libbsp_a_LIBADD += shmsupp$(LIB_VARIANT).rel +libbsp_a_LIBADD += shmsupp.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -161,16 +106,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 diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index e2a331cd3c..dccf1b6b51 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index c2feb58b2a..6969d4c4ed 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -11,24 +11,23 @@ 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/coverhd.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -37,71 +36,26 @@ 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 += 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 += 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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -141,16 +95,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 diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index 4f20945a08..6130ef4d04 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index b43e0ae220..d75a331aa6 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -11,24 +11,23 @@ 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/coverhd.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -37,91 +36,37 @@ 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 - -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = ../mvme147/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 += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = ../mvme147/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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = ../mvme147/timer/timer.c ../mvme147/timer/timerisr.S 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_MP -EXTRA_PROGRAMS += shmsupp.rel -CLEANFILES += shmsupp.rel +noinst_PROGRAMS += shmsupp.rel shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/mpisr.c shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += shmsupp_g.rel -CLEANFILES += shmsupp_g.rel -shmsupp_g_rel_SOURCES = $(shmsupp_rel_SOURCES) -shmsupp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -shmsupp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += shmsupp$(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 clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel if HAS_MP -libbsp_a_LIBADD += shmsupp$(LIB_VARIANT).rel +libbsp_a_LIBADD += shmsupp.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -161,16 +106,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 diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 1b19fdc5f4..dddc84301f 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index e0a598df0b..a18db36e13 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/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 @@ -28,15 +28,14 @@ include_HEADERS += include/tod.h nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -45,112 +44,47 @@ 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 += 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 += 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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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/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 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += network.rel -CLEANFILES += network.rel +noinst_PROGRAMS += network.rel network_rel_SOURCES = ../mvme167/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 #-- -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel tod$(LIB_VARIANT).rel +libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel tod.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel if HAS_FPSP -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel endif -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 - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += times @@ -201,16 +135,16 @@ $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.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 diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index fd42c17a7a..9b8f20dcf0 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index b8d84b92f7..5aaddd5643 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/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 = include_HEADERS += include/coverhd.h include_HEADERS += include/page_table.h @@ -24,15 +24,14 @@ include_HEADERS += include/fatal.h nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h EXTRA_DIST = ../../m68k/shared/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../m68k/shared/start.S +start.$(OBJEXT): ../../m68k/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 = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -41,109 +40,44 @@ 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 += 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 += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console.c console/console-recording.h 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 += fatal.rel -CLEANFILES += fatal.rel +noinst_PROGRAMS += fatal.rel fatal_rel_SOURCES = fatal/bspfatal.c fatal_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) fatal_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += fatal_g.rel -CLEANFILES += fatal_g.rel -fatal_g_rel_SOURCES = $(fatal_rel_SOURCES) -fatal_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -fatal_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += fatal$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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 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 -EXTRA_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = clock$(LIB_VARIANT).rel console$(LIB_VARIANT).rel \ - fatal$(LIB_VARIANT).rel startup$(LIB_VARIANT).rel \ - timer$(LIB_VARIANT).rel +libbsp_a_LIBADD = clock.rel console.rel fatal.rel startup.rel timer.rel if HAS_NETWORKING -libbsp_a_LIBADD += network$(LIB_VARIANT).rel +libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp$(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/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel \ + ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/fpsp.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -195,16 +129,16 @@ $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.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 diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 692e683cc2..1e6fc25d9e 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2005-01-01 Ralf Corsepius * configure.ac: Use AS_HELP_STRING instead of AC_HELP_STRING. diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index 671b81bb71..54b6f942a6 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -11,11 +11,12 @@ 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 + +noinst_PROGRAMS = -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = EXTRA_DIST = include_HEADERS += include/bare.h @@ -27,20 +28,19 @@ include_HEADERS += include/coverhd.h # FIXME: Better merge both files into one and use #ifdef GDB_MONITOR_ACTIVE if ODS68302_DEBUG EXTRA_DIST += start/debugreset.S -start$(LIB_VARIANT).$(OBJEXT): start/debugreset.S +start.$(OBJEXT): start/debugreset.S $(CPPASCOMPILE) -DASM -o $@ -c $< else EXTRA_DIST += start/reset.S -start$(LIB_VARIANT).$(OBJEXT): start/reset.S +start.$(OBJEXT): start/reset.S $(CPPASCOMPILE) -DASM -o $@ -c $< endif -project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/rom startup/debugger -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \ startup/gdb-hooks.c ../../shared/bootcard.c ../../shared/main.c \ startup/m68302scc.c startup/m68k-stub.c \ @@ -51,71 +51,26 @@ startup_rel_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.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 += 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 += 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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = timer/timer.c timer/timerisr.S 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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -169,9 +124,9 @@ $(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 @@ -185,8 +140,8 @@ $(PROJECT_LIB)/debugger: startup/debugger $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/debugger PREINSTALL_FILES += $(PROJECT_LIB)/debugger -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index 236007bac2..5f50311d81 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am: Remove build-variant support. + 2004-11-25 Joel Sherrill * startup/linkcmds: Add new bss sections .bss.* and .gnu.linkonce.b*. diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index f3a4fa5cff..8a4aae0a12 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -11,24 +11,23 @@ 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 = 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 += 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 \ ../../m68k/shared/m68kpretaskinghook.c ../../shared/main.c \ @@ -38,72 +37,26 @@ 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 - -EXTRA_PROGRAMS += clock.rel -CLEANFILES += clock.rel +noinst_PROGRAMS += clock.rel clock_rel_SOURCES = clock/clockdrv.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 ../../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 += timer.rel -CLEANFILES += timer.rel +noinst_PROGRAMS += timer.rel timer_rel_SOURCES = ../../shared/timerstub.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_LIBRARIES = libbsp.a -CLEANFILES += libbsp.a +noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = -libbsp_a_LIBADD = startup$(LIB_VARIANT).rel clock$(LIB_VARIANT).rel \ - console$(LIB_VARIANT).rel timer$(LIB_VARIANT).rel -libbsp_a_LIBADD += \ - ../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc$(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 clock.rel console.rel timer.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -141,16 +94,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/local.am -- cgit v1.2.3