From 66ae7d0b9fd9cce1b7121d84f677c1ef23fc0e6f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 31 Jan 2004 00:37:44 +0000 Subject: 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, PCI_bus/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, vectors/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, PCI_bus/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, vectors/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile.am: Reflect changes above. --- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 11 ++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 126 ++++++++++++++++++++- .../libbsp/powerpc/score603e/PCI_bus/.cvsignore | 2 - .../libbsp/powerpc/score603e/PCI_bus/Makefile.am | 30 ----- .../lib/libbsp/powerpc/score603e/clock/.cvsignore | 2 - .../lib/libbsp/powerpc/score603e/clock/Makefile.am | 30 ----- c/src/lib/libbsp/powerpc/score603e/configure.ac | 9 -- .../libbsp/powerpc/score603e/console/.cvsignore | 2 - .../libbsp/powerpc/score603e/console/Makefile.am | 31 ----- .../libbsp/powerpc/score603e/startup/.cvsignore | 2 - .../libbsp/powerpc/score603e/startup/Makefile.am | 54 --------- .../lib/libbsp/powerpc/score603e/timer/.cvsignore | 2 - .../lib/libbsp/powerpc/score603e/timer/Makefile.am | 30 ----- c/src/lib/libbsp/powerpc/score603e/tod/.cvsignore | 2 - c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am | 33 ------ .../libbsp/powerpc/score603e/vectors/.cvsignore | 2 - .../libbsp/powerpc/score603e/vectors/Makefile.am | 30 ----- .../libbsp/powerpc/score603e/wrapup/Makefile.am | 9 +- 18 files changed, 138 insertions(+), 269 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/score603e/PCI_bus/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/console/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/console/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/timer/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/tod/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/score603e/vectors/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index f1e2b57177..37dc89816b 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,14 @@ +2004-01-31 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + PCI_bus/Makefile.am, startup/Makefile.am, timer/Makefile.am, + tod/Makefile.am, vectors/Makefile.am. Use automake compilation rules. + * clock/Makefile.am, console/Makefile.am, PCI_bus/Makefile.am, + startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, + vectors/Makefile.am: Remove. + * configure.ac: Reflect changes above. + * wrapup/Makefile.am: Reflect changes above. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in start/Makefile.am. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index 0fe9b21907..5c330f231a 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -6,11 +6,15 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . clock console startup timer tod PCI_bus vectors @exceptions@ \ - wrapup +SUBDIRS = . @exceptions@ wrapup +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + include_HEADERS += include/coverhd.h include/gen2.h include_HEADERS += include/tod.h @@ -19,7 +23,117 @@ start$(LIB_VARIANT).$(OBJEXT): start/start.S ${CCASCOMPILE} -DASM -o $@ -c $< project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) -all-local: $(PREINSTALL_FILES) +dist_project_lib_DATA += startup/linkcmds + +EXTRA_PROGRAMS += clock.rel +CLEANFILES += 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 +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 +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 \ + startup/Hwr_init.c startup/spurious.c startup/genpvec.c \ + ../../shared/gnatinstallhandler.c startup/FPGA.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 +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 +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 +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 +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 = TMPINSTALL_FILES = @@ -40,7 +154,11 @@ $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): start$(LIB_VARIANT).$(OBJEXT) $(PR $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -CLEANFILES = $(PREINSTALL_FILES) +$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds + +CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am deleted file mode 100644 index 326e22f4b1..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/PCI_bus.rel - -C_FILES = universe.c PCI.c flash.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = PCI.c PCI.h flash.c universe.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am deleted file mode 100644 index bcd1265b8a..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/clock.rel - -C_FILES = clock.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = clock.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.ac b/c/src/lib/libbsp/powerpc/score603e/configure.ac index f0ab5bda7f..493013fe96 100644 --- a/c/src/lib/libbsp/powerpc/score603e/configure.ac +++ b/c/src/lib/libbsp/powerpc/score603e/configure.ac @@ -67,17 +67,8 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], [This defines the base address of the exception table. NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.]) - - # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -PCI_bus/Makefile -clock/Makefile -console/Makefile -startup/Makefile -timer/Makefile -tod/Makefile -vectors/Makefile wrapup/Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/score603e/console/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am deleted file mode 100644 index a64d24a7da..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/console.rel - -C_FILES = 85c30.c console.c consolereserveresources.c tbl85c30.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = 85c30.c 85c30.h console.c consolebsp.h \ - consolereserveresources.c tbl85c30.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am deleted file mode 100644 index 71e6d857f2..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/startup.rel - -# -# First and second generation used different Bridge chips :( -# Generation 1 --> 82378zb (now in the CVS Attic) -# Generation 2 --> FPGA -STARTUP_C_FILES = FPGA.c - -C_FILES = bspclean.c bspstart.c setvec.c Hwr_init.c spurious.c genpvec.c \ - $(STARTUP_C_FILES) -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -shared_C_FILES = $(top_srcdir)/../../shared/bootcard.c -shared_C_FILES += $(top_srcdir)/../../shared/bsplibc.c -shared_C_FILES += $(top_srcdir)/../../shared/bsppost.c -shared_C_FILES += $(top_srcdir)/../../shared/main.c -shared_C_FILES += $(top_srcdir)/../../shared/sbrk.c -shared_C_FILES += $(top_srcdir)/../../shared/gnatinstallhandler.c -OBJS += \ - $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - -$(PGM): $(OBJS) - $(make-rel) - -project_lib_DATA = linkcmds - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = $(C_FILES) linkcmds - -TMPINSTALL_FILES = - -$(PROJECT_LIB)/$(dirstamp): - @$(mkdir_p) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds - -CLEANFILES = $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/timer/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/timer/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am deleted file mode 100644 index 2222cfc1af..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/timer.rel - -C_FILES = timer.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = timer.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/tod/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/tod/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am deleted file mode 100644 index e88a57e572..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/tod.rel - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# TOD for Generation 2 or later -TOD_C_FILES = tod.c - -C_FILES = $(TOD_C_FILES) -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = tod.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/vectors/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/vectors/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am deleted file mode 100644 index d0b788b3fa..0000000000 --- a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/vectors.rel - -S_FILES = vectors.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) - -.PRECIOUS: $(PGM) - -EXTRA_DIST = vectors.S - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am index de32de186c..2fae0dbd9c 100644 --- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am @@ -2,11 +2,12 @@ ## $Id$ ## -BSP_PIECES = startup clock console timer tod vectors PCI_bus +OBJS = ../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 -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/$(ARCH)/*.rel +OBJS += ../@exceptions@/$(ARCH)/*.rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -- cgit v1.2.3