From 7c6c630fb859ba0ebe096dc430099ffc78121add Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 3 Jan 2005 04:11:58 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am: Remove build-variant support. --- c/src/lib/libbsp/mips/p4000/ChangeLog | 4 ++ c/src/lib/libbsp/mips/p4000/Makefile.am | 76 +++++++++------------------------ 2 files changed, 24 insertions(+), 56 deletions(-) (limited to 'c/src/lib/libbsp/mips/p4000') diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog index a727ba84bc..da4068e67a 100644 --- a/c/src/lib/libbsp/mips/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips/p4000/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/mips/p4000/Makefile.am b/c/src/lib/libbsp/mips/p4000/Makefile.am index 56131222a2..fdc8c2ec08 100644 --- a/c/src/lib/libbsp/mips/p4000/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/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 = 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 \ ../../shared/main.c ../../shared/sbrk.c startup/setvec.c \ @@ -36,59 +35,24 @@ 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/led.S 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 += liblnk.rel -CLEANFILES += liblnk.rel +noinst_PROGRAMS += liblnk.rel liblnk_rel_SOURCES = liblnk/lnklib.S liblnk_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += liblnk_g.rel -CLEANFILES += liblnk_g.rel -liblnk_g_rel_SOURCES = $(liblnk_rel_SOURCES) -liblnk_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -liblnk_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += liblnk$(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 \ - liblnk$(LIB_VARIANT).rel -libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache$(LIB_VARIANT).rel \ - ../../../libcpu/mips/shared/interrupts$(LIB_VARIANT).rel \ - ../../../libcpu/mips/r46xx/clock$(LIB_VARIANT).rel \ - ../../../libcpu/mips/r46xx/timer$(LIB_VARIANT).rel \ - ../../../libcpu/mips/r46xx/vectorisrs$(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 liblnk.rel +libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \ + ../../../libcpu/mips/shared/interrupts.rel \ + ../../../libcpu/mips/r46xx/clock.rel \ + ../../../libcpu/mips/r46xx/timer.rel \ + ../../../libcpu/mips/r46xx/vectorisrs.rel all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -128,16 +92,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 -- cgit v1.2.3