From 71cbb666a432fccaaf351493465edca9fad3f719 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 3 Jan 2005 04:16:13 +0000 Subject: 2005-01-02 Ralf Corsepius * Makefile.am, wrapup/Makefile.am: Remove build-variant support. --- c/src/lib/libbsp/powerpc/dmv177/ChangeLog | 4 + c/src/lib/libbsp/powerpc/dmv177/Makefile.am | 97 +++---------- c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am | 20 +-- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 4 + c/src/lib/libbsp/powerpc/gen405/Makefile.am | 32 +---- c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 26 ++-- c/src/lib/libbsp/powerpc/helas403/ChangeLog | 4 + c/src/lib/libbsp/powerpc/helas403/Makefile.am | 43 ++---- .../lib/libbsp/powerpc/helas403/wrapup/Makefile.am | 24 ++-- c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am | 88 ++---------- c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am | 35 ++--- .../lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 4 + .../libbsp/powerpc/motorola_powerpc/Makefile.am | 152 ++++----------------- .../powerpc/motorola_powerpc/wrapup/Makefile.am | 33 ++--- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 88 +++--------- .../libbsp/powerpc/mpc8260ads/wrapup/Makefile.am | 35 ++--- c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 4 + c/src/lib/libbsp/powerpc/mvme5500/Makefile.am | 148 ++++---------------- .../lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am | 37 ++--- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 4 + c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 131 +++--------------- .../lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 20 +-- c/src/lib/libbsp/powerpc/psim/ChangeLog | 4 + c/src/lib/libbsp/powerpc/psim/Makefile.am | 96 +++---------- c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am | 33 ++--- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 4 + c/src/lib/libbsp/powerpc/score603e/Makefile.am | 97 +++---------- .../libbsp/powerpc/score603e/wrapup/Makefile.am | 17 +-- c/src/lib/libbsp/powerpc/ss555/ChangeLog | 4 + c/src/lib/libbsp/powerpc/ss555/Makefile.am | 56 ++------ c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am | 31 ++--- 33 files changed, 327 insertions(+), 1056 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index e953bd9efa..bac17ba677 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am index e088442232..4535a684b6 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am @@ -15,68 +15,40 @@ 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/dmv170.h nodist_include_HEADERS += ../../shared/tod.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 += 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/conscfg.c console/debugio.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 += scv64.rel -CLEANFILES += scv64.rel +noinst_PROGRAMS += scv64.rel scv64_rel_SOURCES = scv64/scv64.c scv64_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) scv64_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += scv64_g.rel -CLEANFILES += scv64_g.rel -scv64_g_rel_SOURCES = $(scv64_rel_SOURCES) -scv64_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -scv64_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += scv64$(LIB_VARIANT).rel - -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 \ @@ -84,57 +56,22 @@ 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 += 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_PROGRAMS += tod.rel -CLEANFILES += tod.rel +noinst_PROGRAMS += tod.rel tod_rel_SOURCES = 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 - if HAS_NETWORKING sonic_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -EXTRA_PROGRAMS += sonic.rel -CLEANFILES += sonic.rel +noinst_PROGRAMS += sonic.rel sonic_rel_SOURCES = sonic/dmvsonic.c sonic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(sonic_CPPFLAGS) sonic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -EXTRA_PROGRAMS += sonic_g.rel -CLEANFILES += sonic_g.rel -sonic_g_rel_SOURCES = $(sonic_rel_SOURCES) -sonic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(sonic_CPPFLAGS) -sonic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += sonic$(LIB_VARIANT).rel endif all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -183,16 +120,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/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am index ef41c6d0f6..d4f31edf38 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am @@ -4,24 +4,16 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel ../clock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../scv64$(LIB_VARIANT).rel \ - ../timer$(LIB_VARIANT).rel ../tod$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../scv64.rel \ + ../timer.rel ../tod.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../sonic$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../sonic.rel endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/cache$(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 += ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/cache.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index d08974f69d..a711dd1cb2 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-10-15 Gene Smith PR 691/bsps diff --git a/c/src/lib/libbsp/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 63ef93b43c..8a74ae0405 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/Makefile.am @@ -15,18 +15,17 @@ 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 dist_project_lib_DATA += startup/linkcmds startup/linkcmds.dl -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 \ @@ -34,28 +33,11 @@ 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 += dlentry.rel -CLEANFILES += dlentry.rel +noinst_PROGRAMS += dlentry.rel dlentry_rel_SOURCES = dlentry/dlentry.S dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += dlentry_g.rel -CLEANFILES += dlentry_g.rel -dlentry_g_rel_SOURCES = $(dlentry_rel_SOURCES) -dlentry_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -dlentry_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += dlentry$(LIB_VARIANT).rel - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times @@ -101,8 +83,8 @@ $(PROJECT_LIB)/linkcmds.dl: startup/linkcmds.dl $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.dl PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.dl -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index 62ed35bbf9..664c5a28ad 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -4,26 +4,18 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ - ../dlentry$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../dlentry.rel -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl$(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 += ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/tty_drv.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index 3e3ac22a42..a925a7cccf 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-10-02 Ralf Corsepius PR 697/bsps diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am index 73757752ad..0ea91ff647 100644 --- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/Makefile.am @@ -15,48 +15,29 @@ 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 = dist_project_lib_DATA += bsp_specs.dl include_HEADERS += include/coverhd.h -EXTRA_PROGRAMS += dlentry.rel -CLEANFILES += dlentry.rel +noinst_PROGRAMS += dlentry.rel dlentry_rel_SOURCES = dlentry/dlentry.S dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += dlentry_g.rel -CLEANFILES += dlentry_g.rel -dlentry_g_rel_SOURCES = $(dlentry_rel_SOURCES) -dlentry_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -dlentry_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += dlentry$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += flashentry.rel -CLEANFILES += flashentry.rel +noinst_PROGRAMS += flashentry.rel flashentry_rel_SOURCES = flashentry/flashentry.S flashentry_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) flashentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += flashentry_g.rel -CLEANFILES += flashentry_g.rel -flashentry_g_rel_SOURCES = $(flashentry_rel_SOURCES) -flashentry_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -flashentry_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += flashentry$(LIB_VARIANT).rel - dist_project_lib_DATA += startup/linkcmds startup/linkcmds.dl -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 \ @@ -64,14 +45,6 @@ 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 - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST = times @@ -121,8 +94,8 @@ $(PROJECT_LIB)/linkcmds.dl: startup/linkcmds.dl $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.dl PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.dl -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am index 30e21cf126..47291b9199 100644 --- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am @@ -4,25 +4,17 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ - ../dlentry$(LIB_VARIANT).rel ../flashentry$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../dlentry.rel ../flashentry.rel -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/console$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl$(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 += ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/console.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/vectors.rel \ + ../../../../libcpu/@RTEMS_CPU@/ppc403/ictrl.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog index 57281fdaa9..c8eea7c4de 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-11-20 Thomas Doerfler PR 703/filesystem diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am index c222b64480..6c81216ab4 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am @@ -15,11 +15,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_bspdir = $(includedir)/bsp @@ -31,79 +31,33 @@ EXTRA_DIST = times-mbx821 times-mbx860 dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = clock/p_clock.c pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pclock_g.rel -CLEANFILES += pclock_g.rel -pclock_g_rel_SOURCES = $(pclock_rel_SOURCES) -pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pclock$(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 += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c irq/irq_asm.S irq/irq_init.c 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 += ide.rel -CLEANFILES += ide.rel +noinst_PROGRAMS += ide.rel ide_rel_SOURCES = ide/idecfg.c ide/pcmcia_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_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = vectors/vectors.h vectors/vectors_init.c \ vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(LIB_VARIANT).rel - -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 \ startup/imbx8xx.c ../../shared/main.c startup/mmutlbtab.c \ @@ -111,31 +65,13 @@ 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 - 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 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -202,8 +138,8 @@ $(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) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am index 16d68e5cac..39738ec8a4 100644 --- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am @@ -4,33 +4,24 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ - ../ide$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../pclock.rel ../irq.rel ../ide.rel ../startup.rel \ + ../console.rel ../vectors.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += \ - ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/console-generic$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/cpm$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8xx/exceptions$(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/powerpc/shared/cpuIdent.rel \ + ../../../../libcpu/powerpc/shared/cache.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/powerpc/mpc8xx/clock.rel \ + ../../../../libcpu/powerpc/mpc8xx/console-generic.rel \ + ../../../../libcpu/powerpc/mpc8xx/cpm.rel \ + ../../../../libcpu/powerpc/mpc8xx/mmu.rel \ + ../../../../libcpu/powerpc/mpc8xx/timer.rel \ + ../../../../libcpu/powerpc/mpc8xx/exceptions.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 6e3968ee4c..cae8b2b607 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-11-17 Joel Sherrill * startup/linkcmds: Add sections required by gcc 3.3.x so it will link. diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index d322e589db..d056a5ee7e 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -15,11 +15,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_bspdir = $(includedir)/bsp @@ -28,19 +28,18 @@ include_HEADERS += ../../shared/include/coverhd.h include_HEADERS += ../../shared/tod.h EXTRA_DIST = ../../powerpc/shared/start/start.S -start$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/start.S +start.$(OBJEXT): ../../powerpc/shared/start/start.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA = start.$(OBJEXT) EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S +rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA += rtems_crti$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_setup.c \ ../../powerpc/shared/startup/pgtbl_activate.c \ @@ -50,48 +49,21 @@ startup_rel_SOURCES = ../../powerpc/shared/startup/bspstart.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 += tod.rel -CLEANFILES += tod.rel +noinst_PROGRAMS += tod.rel tod_rel_SOURCES = ../../shared/tod.c ../../powerpc/shared/tod/todcfg.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 += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pclock_g.rel -CLEANFILES += pclock_g.rel -pclock_g_rel_SOURCES = $(pclock_rel_SOURCES) -pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pclock$(LIB_VARIANT).rel - include_bsp_HEADERS = ../../powerpc/shared/console/consoleIo.h include_bsp_HEADERS += ../../powerpc/shared/console/uart.h console_CPPFLAGS = -DSTATIC_LOG_ALLOC -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = ../../powerpc/shared/console/polled_io.c \ ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ @@ -104,54 +76,26 @@ console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ $(console_CPPFLAGS) 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_CPPFLAGS) -console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += console$(LIB_VARIANT).rel - include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = ../../powerpc/shared/irq/irq_init.c \ ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.c \ ../../powerpc/shared/irq/irq_asm.S ../../powerpc/shared/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 - include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h -EXTRA_PROGRAMS += motorola.rel -CLEANFILES += motorola.rel +noinst_PROGRAMS += motorola.rel motorola_rel_SOURCES = ../../powerpc/shared/motorola/motorola.h \ ../../powerpc/shared/motorola/motorola.c motorola_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) motorola_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += motorola_g.rel -CLEANFILES += motorola_g.rel -motorola_g_rel_SOURCES = $(motorola_rel_SOURCES) -motorola_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -motorola_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += motorola$(LIB_VARIANT).rel - include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h -EXTRA_PROGRAMS += openpic.rel -CLEANFILES += openpic.rel +noinst_PROGRAMS += openpic.rel openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ ../../powerpc/shared/openpic/openpic.c \ ../../powerpc/shared/openpic/openpic.h @@ -159,74 +103,38 @@ openpic_rel_SOURCES = ../../powerpc/shared/openpic/openpic.h \ openpic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) openpic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += openpic_g.rel -CLEANFILES += openpic_g.rel -openpic_g_rel_SOURCES = $(openpic_rel_SOURCES) -openpic_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -openpic_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += openpic$(LIB_VARIANT).rel - include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h -EXTRA_PROGRAMS += pci.rel -CLEANFILES += pci.rel +noinst_PROGRAMS += pci.rel pci_rel_SOURCES = ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/detect_raven_bridge.c \ ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h 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 - include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/pnp.h -EXTRA_PROGRAMS += residual.rel -CLEANFILES += residual.rel +noinst_PROGRAMS += residual.rel residual_rel_SOURCES = ../../powerpc/shared/residual/pnp.h \ ../../powerpc/shared/residual/residual.h \ ../../powerpc/shared/residual/residual.c residual_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) residual_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += residual_g.rel -CLEANFILES += residual_g.rel -residual_g_rel_SOURCES = $(residual_rel_SOURCES) -residual_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -residual_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += residual$(LIB_VARIANT).rel - include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \ ../../powerpc/shared/vectors/vectors_init.c \ ../../powerpc/shared/vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(LIB_VARIANT).rel - include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ ../../powerpc/shared/vme/VMEConfig.h ../../powerpc/shared/vme/VME.h -EXTRA_PROGRAMS += vme.rel -CLEANFILES += vme.rel +noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ ../../shared/vmeUniverse/vmeUniverse.h \ ../../powerpc/shared/vme/vmeconfig.c \ @@ -234,14 +142,6 @@ vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c \ vme_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vme_g.rel -CLEANFILES += vme_g.rel -vme_g_rel_SOURCES = $(vme_rel_SOURCES) -vme_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vme_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vme$(LIB_VARIANT).rel - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) EXTRA_DIST += BOOTING README.mtx603e README.MVME2100 README.MVME2300 \ @@ -295,13 +195,13 @@ $(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)/rtems_crti$(LIB_VARIANT).$(OBJEXT): rtems_crti$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds @@ -355,8 +255,8 @@ $(PROJECT_INCLUDE)/bsp/VME.h: ../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am index c076ce56a1..b4590add92 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am @@ -4,29 +4,18 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ - ../pclock$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \ - ../irq$(LIB_VARIANT).rel ../openpic$(LIB_VARIANT).rel \ - ../pci$(LIB_VARIANT).rel ../residual$(LIB_VARIANT).rel \ - ../vectors$(LIB_VARIANT).rel ../motorola$(LIB_VARIANT).rel \ - ../tod$(LIB_VARIANT).rel ../vme$(LIB_VARIANT).rel -___libbsp_a_LIBADD += \ - ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/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 ../pclock.rel ../console.rel ../irq.rel \ + ../openpic.rel ../pci.rel ../residual.rel ../vectors.rel ../motorola.rel \ + ../tod.rel ../vme.rel +___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index 87155e0854..1c23bd7b96 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-09-27 Joel Sherrill PR 680/bsps diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 2b7e20c3bb..ecf6903fe1 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -15,71 +15,43 @@ 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_bspdir = $(includedir)/bsp 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 += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = clock/p_clock.c pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pclock_g.rel -CLEANFILES += pclock_g.rel -pclock_g_rel_SOURCES = $(pclock_rel_SOURCES) -pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pclock$(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 - include_bsp_HEADERS = irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S 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 - include_bsp_HEADERS += vectors/vectors.h -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 \ @@ -87,47 +59,19 @@ 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 += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.h \ vectors/vectors.S - vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(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/if_hdlcsubr.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 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -173,9 +117,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 @@ -189,8 +133,8 @@ $(PROJECT_INCLUDE)/bsp/vectors.h: vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dir $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am index 7cab8f42a8..3036e28e4a 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am @@ -4,31 +4,22 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ - ../startup$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \ - ../vectors$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../pclock.rel ../irq.rel ../startup.rel ../console.rel \ + ../vectors.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += \ - ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/shared/cache$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8260/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8260/console-generic$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8260/cpm$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8260/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8260/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc8260/exceptions$(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/powerpc/shared/cpuIdent.rel \ + ../../../../libcpu/powerpc/shared/cache.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/powerpc/mpc8260/clock.rel \ + ../../../../libcpu/powerpc/mpc8260/console-generic.rel \ + ../../../../libcpu/powerpc/mpc8260/cpm.rel \ + ../../../../libcpu/powerpc/mpc8260/mmu.rel \ + ../../../../libcpu/powerpc/mpc8260/timer.rel \ + ../../../../libcpu/powerpc/mpc8260/exceptions.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index b0c85a6679..14cd3dbb43 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-10-26 Ralf Corsepius * Makefile.am: Fix network_CPPFLAGS. Reformat. diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am index 191731e7b8..f448bc1ca9 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am @@ -15,12 +15,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 nodist_include_HEADERS += ../../shared/include/coverhd.h -EXTRA_PROGRAMS = -CLEANFILES = -noinst_DATA = +noinst_PROGRAMS = include_bspdir = $(includedir)/bsp @@ -30,8 +30,7 @@ dist_project_lib_DATA += startup/linkcmds # UNUSED EXTRA_DIST = startup/bootpstuff.c -EXTRA_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/bspstart.c \ ../../powerpc/shared/startup/pgtbl_setup.c startup/pgtbl_activate.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ @@ -40,195 +39,98 @@ startup_rel_SOURCES = startup/bspstart.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 += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = ../../powerpc/shared/clock/p_clock.c pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pclock_g.rel -CLEANFILES += pclock_g.rel -pclock_g_rel_SOURCES = $(pclock_rel_SOURCES) -pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pclock$(LIB_VARIANT).rel - ### include_bsp_HEADERS = ../../powerpc/shared/console/uart.h -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/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 - ### include_bsp_HEADERS += pci/gtpcireg.h pci/pci.h -EXTRA_PROGRAMS += pci.rel -CLEANFILES += pci.rel +noinst_PROGRAMS += pci.rel pci_rel_SOURCES = pci/pci.c pci/pci_interface.c pci/detect_host_bridge.c \ pci/pcifinddevice.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 - ### include_bsp_HEADERS += irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq_init.c irq/GT64260Int.c irq/irq.c \ ../../powerpc/shared/irq/irq_asm.S 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 - ### nodist_include_HEADERS += ../../shared/tod.h -EXTRA_PROGRAMS += tod.rel -CLEANFILES += tod.rel +noinst_PROGRAMS += tod.rel tod_rel_SOURCES = ../../shared/tod.c tod/todcfg.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 - ## include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h \ vectors/bspException.h -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors_init.c \ vectors/exceptionhandler.c ../../powerpc/shared/vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(LIB_VARIANT).rel - ## include_bsp_HEADERS += GT64260/bspMvme5500.h GT64260/gtreg.h \ GT64260/GT64260TWSI.h GT64260/VPD.h -EXTRA_PROGRAMS += GT64260.rel -CLEANFILES += GT64260.rel +noinst_PROGRAMS += GT64260.rel GT64260_rel_SOURCES = GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c GT64260_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) GT64260_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += GT64260_g.rel -CLEANFILES += GT64260_g.rel -GT64260_g_rel_SOURCES = $(GT64260_rel_SOURCES) -GT64260_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -GT64260_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += GT64260$(LIB_VARIANT).rel - ## if HAS_NETWORKING include_bsp_HEADERS += network/GT64260eth.h network/GT64260ethreg.h network_CPPFLAGS = -D_KERNEL -EXTRA_PROGRAMS += network.rel -CLEANFILES += network.rel +noinst_PROGRAMS += network.rel network_rel_SOURCES = network/GT64260eth.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 ## include_bsp_HEADERS += vme/VME.h vme/VMEConfig.h include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h -EXTRA_PROGRAMS += vme.rel -CLEANFILES += vme.rel +noinst_PROGRAMS += vme.rel vme_rel_SOURCES = ../../shared/vmeUniverse/vmeUniverse.c vme/vmeconfig.c vme_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vme_g.rel -CLEANFILES += vme_g.rel -vme_g_rel_SOURCES = $(vme_rel_SOURCES) -vme_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vme_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vme$(LIB_VARIANT).rel - ## EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S +rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA = rtems_crti$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA = rtems_crti.$(OBJEXT) -EXTRA_PROGRAMS += mvme5500start.$(OBJEXT) -CLEANFILES += mvme5500start.$(OBJEXT) +noinst_PROGRAMS += mvme5500start.$(OBJEXT) mvme5500start___OBJEXT__SOURCES = start/preload.S start/start.S mvme5500start___OBJEXT__CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += mvme5500start_g.$(OBJEXT) -CLEANFILES += mvme5500start_g.$(OBJEXT) -mvme5500start_g___OBJEXT__SOURCES = $(mvme5500start___OBJEXT__SOURCES) -mvme5500start_g___OBJEXT__CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -mvme5500start_g___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS) - -project_lib_DATA += mvme5500start$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += mvme5500start.$(OBJEXT) all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -343,16 +245,16 @@ $(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(P $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h -$(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT): rtems_crti$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) -$(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT): mvme5500start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/mvme5500start.$(OBJEXT): mvme5500start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/mvme5500start.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/mvme5500start.$(OBJEXT) -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am index f833dcbeca..0008a7fe6c 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mvme5500/wrapup/Makefile.am @@ -4,33 +4,22 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ - ../pci$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ - ../tod$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel \ - ../GT64260$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../pclock.rel ../console.rel ../irq.rel ../pci.rel \ + ../startup.rel ../tod.rel ../vectors.rel ../GT64260.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += ../vme$(LIB_VARIANT).rel -___libbsp_a_LIBADD += \ - ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/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 += ../vme.rel +___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 7f54044021..e82138c9bf 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index ff12041d26..c381c436a5 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -15,39 +15,29 @@ 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 += $(top_srcdir)/../../shared/include/coverhd.h include_HEADERS += include/tod.h include_HEADERS += include/nvram.h include/pci.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 += 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/i8042vga.c \ console/i8042vga.h console/i8042.c console/i8042_p.h \ console/ns16550cfg.c console/ns16550cfg.h console/z85c30cfg.c \ @@ -55,45 +45,18 @@ console_rel_SOURCES = console/console.c console/i8042vga.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 += pci.rel -CLEANFILES += pci.rel +noinst_PROGRAMS += pci.rel pci_rel_SOURCES = pci/pci.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 += nvram.rel -CLEANFILES += nvram.rel +noinst_PROGRAMS += nvram.rel nvram_rel_SOURCES = nvram/nvram.c nvram/ds1385.h nvram/mk48t18.h \ nvram/prepnvr.h nvram/stk11c68.h 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_PROGRAMS += startup.rel -CLEANFILES += startup.rel +noinst_PROGRAMS += startup.rel startup_rel_SOURCES = startup/bspstart.c startup/bspclean.c \ ../../shared/sbrk.c startup/setvec.c startup/spurious.c \ startup/genpvec.c startup/swap.c ../../shared/main.c \ @@ -102,89 +65,35 @@ startup_rel_SOURCES = startup/bspstart.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 += 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_PROGRAMS += tod.rel -CLEANFILES += tod.rel +noinst_PROGRAMS += tod.rel tod_rel_SOURCES = tod/tod.c tod/cmos.h 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 += universe.rel -CLEANFILES += universe.rel +noinst_PROGRAMS += universe.rel universe_rel_SOURCES = universe/universe.c universe_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) universe_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += universe_g.rel -CLEANFILES += universe_g.rel -universe_g_rel_SOURCES = $(universe_rel_SOURCES) -universe_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -universe_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += universe$(LIB_VARIANT).rel - EXTRA_DIST += vectors/README vectors/align_h.S -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(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/amd79c970.c network/amd79c970.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 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -237,16 +146,16 @@ $(PROJECT_INCLUDE)/pci.h: include/pci.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/pci.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/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index f2483b4327..c513644a7f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -4,24 +4,14 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../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 ../nvram$(LIB_VARIANT).rel \ - ../universe$(LIB_VARIANT).rel ../pci$(LIB_VARIANT).rel \ - ../vectors$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../clock.rel ../console.rel ../timer.rel \ + ../tod.rel ../nvram.rel ../universe.rel ../pci.rel ../vectors.rel if HAS_NETWORKING -___libbsp_a_LIBADD += ../network$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../network.rel endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(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 += ../@exceptions@/rtems-cpu.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 24a7f6245b..ba258cb6e0 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-11-22 Jennifer Averett PR 617/bsps diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 8b21aba9a4..8b7e116a93 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -15,30 +15,29 @@ 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_bspdir = $(includedir)/bsp 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) EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S -rtems_crti$(LIB_VARIANT).$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S +rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S $(CPPASCOMPILE) -DASM -o $@ -c $< -project_lib_DATA += rtems_crti$(LIB_VARIANT).$(OBJEXT) +project_lib_DATA += rtems_crti.$(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 \ @@ -46,95 +45,42 @@ 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 += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = ../shared/clock/p_clock.c pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pclock_g.rel -CLEANFILES += pclock_g.rel -pclock_g_rel_SOURCES = $(pclock_rel_SOURCES) -pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pclock$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += console.rel -CLEANFILES += console.rel +noinst_PROGRAMS += console.rel console_rel_SOURCES = console/console-io.c console/consupp.S \ ../../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 - include_bsp_HEADERS = irq/irq.h -EXTRA_PROGRAMS += irq.rel -CLEANFILES += irq.rel +noinst_PROGRAMS += irq.rel irq_rel_SOURCES = irq/irq.c irq/irq_init.c irq/irq_asm.S 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_DIST += vectors/README -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = vectors/align_h.S vectors/vectors.S \ ../../powerpc/shared/vectors/vectors_init.c vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(LIB_VARIANT).rel - include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h if HAS_MP EXTRA_DIST += shmsupp/README -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 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) @@ -178,13 +124,13 @@ $(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)/rtems_crti$(LIB_VARIANT).$(OBJEXT): rtems_crti$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds @@ -198,8 +144,8 @@ $(PROJECT_INCLUDE)/bsp/vectors.h: ../../powerpc/shared/vectors/vectors.h $(PROJE $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am index 65bcce40e9..b3180e94a2 100644 --- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am @@ -4,31 +4,22 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../startup$(LIB_VARIANT).rel \ - ../pclock$(LIB_VARIANT).rel ../console$(LIB_VARIANT).rel \ - ../irq$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel -___libbsp_a_LIBADD += \ - ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ - ../../../../libcpu/@RTEMS_CPU@/shared/stack$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu$(LIB_VARIANT).rel \ - ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../startup.rel ../pclock.rel ../console.rel ../irq.rel \ + ../vectors.rel +___libbsp_a_LIBADD += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/clock.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/exceptions.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/mmu.rel \ + ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/timer.rel if HAS_MP -___libbsp_a_LIBADD += ../shmsupp$(LIB_VARIANT).rel +___libbsp_a_LIBADD += ../shmsupp.rel endif -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(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 += ../@exceptions@/rtems-cpu.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index f2b2e4096e..650f473434 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-09-24 Ralf Corsepius * configure.ac: Require automake > 1.9. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index ae5de4ec0b..5260d1b769 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -15,57 +15,38 @@ 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/gen2.h include_HEADERS += include/tod.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 += 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/85c30.c console/85c30.h console/console.c \ console/consolereserveresources.c console/tbl85c30.c \ console/consolebsp.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 - # First and second generation used different Bridge chips :( # Generation 1 --> 82378zb (now in the CVS Attic) # Generation 2 --> FPGA -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 \ @@ -74,71 +55,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 += 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_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 - -EXTRA_PROGRAMS += PCI_bus.rel -CLEANFILES += PCI_bus.rel +noinst_PROGRAMS += PCI_bus.rel PCI_bus_rel_SOURCES = PCI_bus/PCI.c PCI_bus/PCI.h PCI_bus/flash.c \ PCI_bus/universe.c PCI_bus_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) PCI_bus_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += PCI_bus_g.rel -CLEANFILES += PCI_bus_g.rel -PCI_bus_g_rel_SOURCES = $(PCI_bus_rel_SOURCES) -PCI_bus_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -PCI_bus_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += PCI_bus$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += vectors.rel -CLEANFILES += vectors.rel +noinst_PROGRAMS += vectors.rel vectors_rel_SOURCES = vectors/vectors.S vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += vectors_g.rel -CLEANFILES += vectors_g.rel -vectors_g_rel_SOURCES = $(vectors_rel_SOURCES) -vectors_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -vectors_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += vectors$(LIB_VARIANT).rel - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = @@ -183,16 +120,16 @@ $(PROJECT_INCLUDE)/tod.h: include/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 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -CLEANFILES += $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) +CLEANFILES = $(PREINSTALL_FILES) +DISTCLEANFILES += $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am index 31780f909e..c3c3f0ea36 100644 --- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am @@ -4,20 +4,11 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../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 ../vectors$(LIB_VARIANT).rel \ - ../PCI_bus$(LIB_VARIANT).rel -___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu$(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 \ + ../tod.rel ../vectors.rel ../PCI_bus.rel +___libbsp_a_LIBADD += ../@exceptions@/rtems-cpu.rel include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ss555/ChangeLog b/c/src/lib/libbsp/powerpc/ss555/ChangeLog index 515a08ba96..ef7124eaa0 100644 --- a/c/src/lib/libbsp/powerpc/ss555/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ss555/ChangeLog @@ -1,3 +1,7 @@ +2005-01-02 Ralf Corsepius + + * Makefile.am, wrapup/Makefile.am: Remove build-variant support. + 2004-10-20 Ralf Corsepius * console/console.c, include/bsp.h, startup/bspstart.c, diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am index 217d77df72..bd31ff4d65 100644 --- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am @@ -15,11 +15,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_bspdir = $(includedir)/bsp @@ -30,36 +30,17 @@ EXTRA_DIST = times dist_project_lib_DATA += startup/linkcmds -EXTRA_PROGRAMS += pclock.rel -CLEANFILES += pclock.rel +noinst_PROGRAMS += pclock.rel pclock_rel_SOURCES = clock/p_clock.c pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_PROGRAMS += pclock_g.rel -CLEANFILES += pclock_g.rel -pclock_g_rel_SOURCES = $(pclock_rel_SOURCES) -pclock_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -pclock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += pclock$(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 += 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 \ startup/iss555.c ../../shared/main.c ../../shared/sbrk.c \ @@ -67,30 +48,11 @@ 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 += tm27supp.rel -CLEANFILES += tm27supp.rel +noinst_PROGRAMS += tm27supp.rel tm27supp_rel_SOURCES = startup/tm27supp.c tm27supp_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) tm27supp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_DATA += tm27supp$(LIB_VARIANT).rel - -EXTRA_PROGRAMS += tm27supp_g.rel -CLEANFILES += tm27supp_g.rel -tm27supp_g_rel_SOURCES = $(tm27supp_rel_SOURCES) -tm27supp_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -tm27supp_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_DATA += tm27supp$(LIB_VARIANT).rel - all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) PREINSTALL_DIRS = @@ -139,8 +101,8 @@ $(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) include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am index 845d14cf54..73059f55b2 100644 --- a/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ss555/wrapup/Makefile.am @@ -4,29 +4,20 @@ include $(top_srcdir)/../../../../automake/compile.am -EXTRA_LIBRARIES = ../libbsp.a +noinst_LIBRARIES = ../libbsp.a CLEANFILES = ../libbsp.a ___libbsp_a_SOURCES = -___libbsp_a_LIBADD = ../pclock$(LIB_VARIANT).rel \ - ../console$(LIB_VARIANT).rel ../startup$(LIB_VARIANT).rel \ - ../tm27supp$(LIB_VARIANT).rel +___libbsp_a_LIBADD = ../pclock.rel ../console.rel ../startup.rel \ + ../tm27supp.rel -___libbsp_a_LIBADD += \ - ../../../../libcpu/powerpc/shared/cpuIdent$(LIB_VARIANT).rel \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc5xx/clock$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc5xx/console-generic$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc5xx/exceptions$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc5xx/irq$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc5xx/timer$(LIB_VARIANT).rel \ - ../../../../libcpu/powerpc/mpc5xx/vectors$(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/powerpc/shared/cpuIdent.rel \ + ../@exceptions@/rtems-cpu.rel \ + ../../../../libcpu/powerpc/mpc5xx/clock.rel \ + ../../../../libcpu/powerpc/mpc5xx/console-generic.rel \ + ../../../../libcpu/powerpc/mpc5xx/exceptions.rel \ + ../../../../libcpu/powerpc/mpc5xx/irq.rel \ + ../../../../libcpu/powerpc/mpc5xx/timer.rel \ + ../../../../libcpu/powerpc/mpc5xx/vectors.rel include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3