From db3fa142bb1d4dad52d5b8157c8d238b28d344ee Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 3 Jan 2005 04:33:07 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am: Remove build-variant support. --- c/src/lib/libbsp/unix/posix/ChangeLog | 4 ++ c/src/lib/libbsp/unix/posix/Makefile.am | 100 ++++++++------------------------ 2 files changed, 28 insertions(+), 76 deletions(-) (limited to 'c/src/lib/libbsp/unix/posix') diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index b68bd0ee4f..6b07408b77 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/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/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am index 5fead4f384..c24ae7a1de 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/Makefile.am @@ -17,11 +17,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 +DISTCLEANFILES = include/bspopts.h -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = nodist_include_HEADERS += ../../shared/include/coverhd.h @@ -32,18 +33,17 @@ if HAS_CXX # We install the RTEMS constructor as a separate .$(OBJEXT) # so it can be easily place correctly by the compiler config file. -rtems-ctor$(LIB_VARIANT).$(OBJEXT): startup/rtems-ctor.cc +rtems-ctor.$(OBJEXT): startup/rtems-ctor.cc ${CXXCOMPILE} -o $@ -c $< -project_lib_DATA += rtems-ctor$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += rtems-ctor.$(OBJEXT) -no-ctor$(LIB_VARIANT).$(OBJEXT): startup/no-ctor.cc +no-ctor.$(OBJEXT): startup/no-ctor.cc ${CXXCOMPILE} -o $@ -c $< -project_lib_DATA += no-ctor$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += no-ctor.$(OBJEXT) endif -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ startup/bspstart.c startup/setvec.c if !HAS_CXX @@ -53,87 +53,35 @@ endif 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_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_MP -EXTRA_PROGRAMS += shmsupp.rel -CLEANFILES += shmsupp.rel +noinst_PROGRAMS += shmsupp.rel shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c \ shmsupp/cause_intr.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 -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) @@ -174,17 +122,17 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/ PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h if HAS_CXX -$(PROJECT_LIB)/rtems-ctor$(LIB_VARIANT).$(OBJEXT): rtems-ctor$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT) -$(PROJECT_LIB)/no-ctor$(LIB_VARIANT).$(OBJEXT): no-ctor$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT) endif -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