From 59d464015289ae4618dbd636f6eb180d90fdfde8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 31 Jan 2004 02:09:37 +0000 Subject: 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, network/Makefile.am, nvram/Makefile.am, pci/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, universe/Makefile.am, vectors/Makefile.am. Use automake compilation rules. * clock/Makefile.am, console/Makefile.am, network/Makefile.am, nvram/Makefile.am, pci/Makefile.am, startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, universe/Makefile.am, vectors/Makefile.am: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile.am: Reflect changes above. --- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 14 ++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 175 ++++++++++++++++++++- c/src/lib/libbsp/powerpc/ppcn_60x/clock/.cvsignore | 2 - .../lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am | 30 ---- c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 10 -- .../lib/libbsp/powerpc/ppcn_60x/console/.cvsignore | 2 - .../libbsp/powerpc/ppcn_60x/console/Makefile.am | 32 ---- .../lib/libbsp/powerpc/ppcn_60x/network/.cvsignore | 2 - .../libbsp/powerpc/ppcn_60x/network/Makefile.am | 32 ---- c/src/lib/libbsp/powerpc/ppcn_60x/nvram/.cvsignore | 2 - .../lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am | 30 ---- c/src/lib/libbsp/powerpc/ppcn_60x/pci/.cvsignore | 2 - c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am | 30 ---- .../lib/libbsp/powerpc/ppcn_60x/startup/.cvsignore | 2 - .../libbsp/powerpc/ppcn_60x/startup/Makefile.am | 50 ------ c/src/lib/libbsp/powerpc/ppcn_60x/timer/.cvsignore | 2 - .../lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am | 30 ---- c/src/lib/libbsp/powerpc/ppcn_60x/tod/.cvsignore | 2 - c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am | 30 ---- .../libbsp/powerpc/ppcn_60x/universe/.cvsignore | 2 - .../libbsp/powerpc/ppcn_60x/universe/Makefile.am | 30 ---- .../lib/libbsp/powerpc/ppcn_60x/vectors/.cvsignore | 2 - .../libbsp/powerpc/ppcn_60x/vectors/Makefile.am | 30 ---- .../lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 15 +- 24 files changed, 191 insertions(+), 367 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/console/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/network/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/nvram/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/pci/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/timer/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/tod/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/universe/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/vectors/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 295deb0d06..98a4bafdf8 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,17 @@ +2004-01-31 Ralf Corsepius + + * Makefile.am: Merge-in clock/Makefile.am, console/Makefile.am, + network/Makefile.am, nvram/Makefile.am, pci/Makefile.am, + startup/Makefile.am, timer/Makefile.am, tod/Makefile.am, + universe/Makefile.am, vectors/Makefile.am. Use automake compilation + rules. + * clock/Makefile.am, console/Makefile.am, network/Makefile.am, + nvram/Makefile.am, pci/Makefile.am, startup/Makefile.am, + timer/Makefile.am, tod/Makefile.am, universe/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/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index 9997b5a791..0568fb3509 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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 network universe pci nvram \ - vectors @exceptions@ wrapup +SUBDIRS = . @exceptions@ wrapup +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h include_HEADERS += include/tod.h include_HEADERS += include/nvram.h include/pci.h @@ -20,9 +24,166 @@ 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/console.c console/i8042vga.c \ + console/i8042vga.h console/i8042.c console/i8042_p.h \ + console/ns16550cfg.c console/ns16550cfg.h console/z85c30cfg.c \ + console/z85c30cfg.h console/vga.c console/vga_p.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 + +EXTRA_PROGRAMS += pci.rel +CLEANFILES += 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 +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 +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 \ + ../../shared/bootcard.c ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/gnatinstallhandler.c startup/bsptrap.S +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_DIST = STATUS +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/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 +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 +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 +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) + +EXTRA_DIST += STATUS PREINSTALL_DIRS = TMPINSTALL_FILES = @@ -47,7 +208,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/ppcn_60x/clock/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am deleted file mode 100644 index bcd1265b8a..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/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/ppcn_60x/configure.ac b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac index 77cd72e1aa..995fffe7a7 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -62,16 +62,6 @@ RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -network/Makefile -nvram/Makefile -pci/Makefile -startup/Makefile -timer/Makefile -tod/Makefile -universe/Makefile -vectors/Makefile wrapup/Makefile]) RTEMS_PPC_EXCEPTIONS([old]) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am deleted file mode 100644 index 1057568062..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/console.rel - -C_FILES = console.c i8042vga.c i8042.c ns16550cfg.c z85c30cfg.c vga.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 = config.c console.c console.h debugio.c i8042.c i8042_p.h \ - i8042vga.c i8042vga.h ns16550cfg.c ns16550cfg.h vga.c vga_p.h \ - z85c30cfg.c z85c30cfg.h - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/network/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am deleted file mode 100644 index d5da6dfe72..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/network.rel - -C_FILES = amd79c970.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 - -if HAS_NETWORKING -all-local: $(PGM) -endif - -.PRECIOUS: $(PGM) - -EXTRA_DIST = amd79c970.c amd79c970.h - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am deleted file mode 100644 index 608cb17e98..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/nvram.rel - -C_FILES = nvram.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 = ds1385.h mk48t18.h nvram.c prepnvr.h stk11c68.h - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am deleted file mode 100644 index 7e34743cb4..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/pci.rel - -C_FILES = pci.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 - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am deleted file mode 100644 index bbeae68f11..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/startup.rel - -C_FILES = bspstart.c bspclean.c setvec.c spurious.c genpvec.c swap.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -S_FILES = bsptrap.S -OBJS += $(S_FILES:%.S=$(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 = linkcmds $(C_FILES) $(S_FILES) - -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/ppcn_60x/timer/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am deleted file mode 100644 index 2222cfc1af..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/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/ppcn_60x/tod/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am deleted file mode 100644 index c27ef6ab1c..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/tod.rel - -C_FILES = tod.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 = cmos.h tod.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am deleted file mode 100644 index ce28290fdd..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/universe.rel - -C_FILES = universe.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 = universe.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am deleted file mode 100644 index bef3927b91..0000000000 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/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 = README align_h.S vectors.S - -include $(top_srcdir)/../../../../automake/local.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 9516f200a2..f78a03efaa 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -2,17 +2,16 @@ ## $Id$ ## -# We only build the network device driver if HAS_NETWORK was defined +OBJS = ../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 if HAS_NETWORKING -NETWORK = network +OBJS += ../network$(LIB_VARIANT).rel endif -BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \ - vectors - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel +OBJS += ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -- cgit v1.2.3