From 5466140831377302760358353a2fc7e84ceb234d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 15:59:23 +0000 Subject: 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in canbus/Makefile.am, clock/Makefile.am, console/Makefile.am, irq/Makefile.am, network/Makefile.am, startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules. * canbus/Makefile.am, clock/Makefile.am, console/Makefile.am, irq/Makefile.am, network/Makefile.am, startup/Makefile.am, vectors/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 10 ++ c/src/lib/libbsp/powerpc/eth_comm/Makefile.am | 128 ++++++++++++++++++++- .../lib/libbsp/powerpc/eth_comm/canbus/.cvsignore | 2 - .../lib/libbsp/powerpc/eth_comm/canbus/Makefile.am | 30 ----- c/src/lib/libbsp/powerpc/eth_comm/clock/.cvsignore | 2 - .../lib/libbsp/powerpc/eth_comm/clock/Makefile.am | 15 --- c/src/lib/libbsp/powerpc/eth_comm/configure.ac | 7 -- .../lib/libbsp/powerpc/eth_comm/console/.cvsignore | 2 - .../libbsp/powerpc/eth_comm/console/Makefile.am | 30 ----- c/src/lib/libbsp/powerpc/eth_comm/irq/.cvsignore | 2 - c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am | 41 ------- .../lib/libbsp/powerpc/eth_comm/network/.cvsignore | 2 - .../libbsp/powerpc/eth_comm/network/Makefile.am | 34 ------ .../lib/libbsp/powerpc/eth_comm/startup/.cvsignore | 2 - .../libbsp/powerpc/eth_comm/startup/Makefile.am | 50 -------- .../lib/libbsp/powerpc/eth_comm/vectors/.cvsignore | 2 - .../libbsp/powerpc/eth_comm/vectors/Makefile.am | 43 ------- .../lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am | 16 +-- 18 files changed, 141 insertions(+), 277 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/canbus/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/console/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/irq/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/network/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/vectors/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index c4222be223..362df92c7a 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,13 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in canbus/Makefile.am, clock/Makefile.am, + console/Makefile.am, irq/Makefile.am, network/Makefile.am, + startup/Makefile.am, vectors/Makefile.am. Use automake compilation rules. + * canbus/Makefile.am, clock/Makefile.am, console/Makefile.am, + irq/Makefile.am, network/Makefile.am, startup/Makefile.am, + vectors/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in start/Makefile.am. diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am index d8980f6b87..434996b687 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am @@ -6,8 +6,7 @@ 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 startup canbus console irq network vectors @exceptions@ \ - wrapup +SUBDIRS = . @exceptions@ wrapup include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am @@ -26,6 +25,119 @@ start$(LIB_VARIANT).$(OBJEXT): start/start.S ${CCASCOMPILE} -DASM -o $@ -c $< project_lib_DATA = start$(LIB_VARIANT).$(OBJEXT) +dist_project_lib_DATA += startup/linkcmds + +EXTRA_PROGRAMS += startup.rel +CLEANFILES += startup.rel +startup_rel_SOURCES = startup/bspstart.c startup/cpuinit.c \ + startup/mmutlbtab.c ../../shared/bootcard.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c ../../shared/main.c ../../shared/sbrk.c \ + ../../shared/bspclean.c ../../shared/gnatinstallhandler.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 += canbus.rel +CLEANFILES += canbus.rel +canbus_rel_SOURCES = canbus/canbus.c +canbus_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +canbus_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +EXTRA_PROGRAMS += canbus_g.rel +CLEANFILES += canbus_g.rel +canbus_g_rel_SOURCES = $(canbus_rel_SOURCES) +canbus_g_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +canbus_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + +noinst_DATA += canbus$(LIB_VARIANT).rel + +EXTRA_PROGRAMS += console.rel +CLEANFILES += 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 += pclock.rel +CLEANFILES += 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 + +include_bsp_HEADERS += irq/irq.h + +EXTRA_PROGRAMS += irq.rel +CLEANFILES += 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 + +include_bsp_HEADERS += vectors/vectors.h + +EXTRA_PROGRAMS += vectors.rel +CLEANFILES += vectors.rel +vectors_rel_SOURCES = vectors/vectors_init.c vectors/vectors.S \ + vectors/vectors.h +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/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) EXTRA_DIST += times @@ -62,6 +174,18 @@ $(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) +$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds + +$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h + +$(PROJECT_INCLUDE)/bsp/vectors.h: vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h + CLEANFILES += $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) CLEANFILES += $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/canbus/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am deleted file mode 100644 index 800b170cf0..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/canbus.rel - -C_FILES = canbus.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 = canbus.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/clock/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am deleted file mode 100644 index 4c206b4872..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/clock/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## -## $Id$ -## - -C_FILES = p_clock.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# the .o files built here will be put into libbsp.a by ../wrapup/Makefile - -noinst_DATA = $(OBJS) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac index bbe5c582ab..03a94a4462 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac @@ -39,13 +39,6 @@ RTEMS_BSPOPTS_HELP([DISPATCH_HANDLER_STAT], # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile -clock/Makefile -canbus/Makefile -console/Makefile -irq/Makefile -network/Makefile -startup/Makefile -vectors/Makefile wrapup/Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am deleted file mode 100644 index c03b8ffd2f..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/console.rel - -C_FILES = console.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 = console.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/irq/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am deleted file mode 100644 index 1ee123056b..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -## -## $Id$ -## - -include_bspdir = $(includedir)/bsp - -C_FILES = irq.c irq_init.c -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_bsp_HEADERS = irq.h - -S_FILES = irq_asm.S -OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -noinst_DATA = $(OBJS) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = irq.c irq_asm.S irq_init.c - -PREINSTALL_DIRS = -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/irq.h: irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h - -CLEANFILES = $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/network/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am deleted file mode 100644 index ae7576a8ab..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/network.rel - -C_FILES = network.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 += -# - -AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ - -$(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 = README network.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am deleted file mode 100644 index 59c417bed6..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/startup.rel - -C_FILES = bspstart.c cpuinit.c mmutlbtab.c -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/bspclean.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 - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = bspstart.c 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/eth_comm/vectors/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/vectors/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am deleted file mode 100644 index 553880679e..0000000000 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## -## $Id$ -## - -C_FILES = vectors_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = vectors.h - -S_FILES = vectors.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) $(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) - -all-local: $(PREINSTALL_FILES) $(OBJS) - -PREINSTALL_DIRS = -PREINSTALL_FILES = - -$(PROJECT_INCLUDE)/bsp/$(dirstamp): - @$(mkdir_p) $(PROJECT_INCLUDE)/bsp - @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) - -$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h - -CLEANFILES = $(PREINSTALL_FILES) -DISTCLEANFILES = $(PREINSTALL_DIRS) - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am index 38bd27a564..4260f145d3 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am @@ -2,19 +2,13 @@ ## $Id$ ## -# We only build the networking device driver if HAS_NETWORKING was defined +OBJS = ../startup$(LIB_VARIANT).rel ../canbus$(LIB_VARIANT).rel \ + ../console$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ + ../pclock$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel if HAS_NETWORKING -NETWORKING = network +OBJS += ../network$(LIB_VARIANT).rel endif - -BSP_PIECES = clock irq startup start canbus vectors console $(NETWORKING) -# pieces to pick up out of libcpu/ppc -# CPU_PIECES = mpc860/clock mpc860/timer mpc860/console-generic \ -# mpc860/vectors - -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ +OBJS += ../../../../libcpu/@RTEMS_CPU@/shared/cpuIdent$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/shared/cache$(LIB_VARIANT).rel \ ../@exceptions@/rtems-cpu$(LIB_VARIANT).rel \ ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock$(LIB_VARIANT).rel \ -- cgit v1.2.3