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 +++++---------------------- 2 files changed, 21 insertions(+), 72 deletions(-) (limited to 'c/src/lib/libbsp/arm/arm_bare_bsp') 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 -- cgit v1.2.3