From d58c0ffc66ab95ed381f9b1f58ce405fbffe91d9 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 31 Jan 2004 09:45:36 +0000 Subject: 2004-01-31 Ralf Corsepius * Makefile.am: Merge-in clock/.cvsignore, console/.cvsignore, irq/.cvsignore, network/.cvsignore, startup/.cvsignore, vectors/.cvsignore. Use automake compilation rules. * clock/.cvsignore, console/.cvsignore, irq/.cvsignore, network/.cvsignore, startup/.cvsignore, vectors/.cvsignore: Remove. * configure.ac: Reflect changes above. * wrapup/Makefile: Reflect changes above. --- c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 10 ++ c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 132 ++++++++++++++++++++- .../lib/libbsp/powerpc/mpc8260ads/clock/.cvsignore | 2 - .../libbsp/powerpc/mpc8260ads/clock/Makefile.am | 15 --- c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac | 6 - .../libbsp/powerpc/mpc8260ads/console/.cvsignore | 2 - .../libbsp/powerpc/mpc8260ads/console/Makefile.am | 30 ----- c/src/lib/libbsp/powerpc/mpc8260ads/irq/.cvsignore | 2 - .../lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am | 41 ------- .../libbsp/powerpc/mpc8260ads/network/.cvsignore | 2 - .../libbsp/powerpc/mpc8260ads/network/Makefile.am | 34 ------ .../libbsp/powerpc/mpc8260ads/startup/.cvsignore | 2 - .../libbsp/powerpc/mpc8260ads/startup/Makefile.am | 50 -------- .../libbsp/powerpc/mpc8260ads/vectors/.cvsignore | 2 - .../libbsp/powerpc/mpc8260ads/vectors/Makefile.am | 43 ------- .../libbsp/powerpc/mpc8260ads/wrapup/Makefile.am | 13 +- 16 files changed, 145 insertions(+), 241 deletions(-) delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/clock/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/console/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/irq/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/network/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/startup/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/vectors/.cvsignore delete mode 100644 c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index b234fe5151..15d65afde1 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,13 @@ +2004-01-31 Ralf Corsepius + + * Makefile.am: Merge-in clock/.cvsignore, console/.cvsignore, + irq/.cvsignore, network/.cvsignore, startup/.cvsignore, + vectors/.cvsignore. Use automake compilation rules. + * clock/.cvsignore, console/.cvsignore, irq/.cvsignore, + network/.cvsignore, startup/.cvsignore, vectors/.cvsignore: Remove. + * configure.ac: Reflect changes above. + * wrapup/Makefile: Reflect changes above. + 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in start/Makefile.am. diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index f7d3f333dd..979bbce8e8 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -6,10 +6,17 @@ 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 vectors irq network startup @exceptions@ wrapup +SUBDIRS = . @exceptions@ wrapup +include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am +EXTRA_PROGRAMS = +CLEANFILES = +noinst_DATA = + +include_bspdir = $(includedir)/bsp + include_HEADERS += include/coverhd.h EXTRA_DIST = start/start.S @@ -17,13 +24,118 @@ 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 += 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 + +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 + +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.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 +startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ + ../../shared/main.c ../../shared/sbrk.c \ + ../../shared/gnatinstallhandler.c startup/cpuinit.c +startup_rel_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -EXTRA_DIST = times +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 +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 +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) + +EXTRA_DIST += times PREINSTALL_DIRS = TMPINSTALL_FILES = +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h @@ -32,7 +144,19 @@ $(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 + +$(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/mpc8260ads/clock/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/clock/Makefile.am deleted file mode 100644 index 4c206b4872..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/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/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac index 9ab87155e1..8b7e2e235b 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -70,12 +70,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") # Explicitly list a Makefile here AC_CONFIG_FILES([Makefile -clock/Makefile -console/Makefile -network/Makefile -irq/Makefile -vectors/Makefile -startup/Makefile wrapup/Makefile]) RTEMS_PPC_EXCEPTIONS([new]) diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/console/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/console/Makefile.am deleted file mode 100644 index c03b8ffd2f..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/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/mpc8260ads/irq/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am deleted file mode 100644 index 92dfc0e283..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/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 .o files built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = irq.c irq.h 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/mpc8260ads/network/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/network/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am deleted file mode 100644 index 98ab26d0da..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/network.rel - -C_FILES = network.c if_hdlcsubr.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 = network.c - -include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am deleted file mode 100644 index 4f8e6e8691..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## -## $Id$ -## - -PGM = $(ARCH)/startup.rel - -C_FILES = bspstart.c cpuinit.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/bspclean.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 - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(PGM) $(TMPINSTALL_FILES) - -EXTRA_DIST = linkcmds $(C_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/mpc8260ads/vectors/.cvsignore b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am deleted file mode 100644 index 553880679e..0000000000 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/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/mpc8260ads/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am index 5f58713886..807ad6119b 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am @@ -2,16 +2,17 @@ ## $Id$ ## -# We only build the networking device driver if HAS_NETWORKING was defined +OBJS = ../pclock$(LIB_VARIANT).rel ../irq$(LIB_VARIANT).rel \ + ../startup$(LIB_VARIANT).rel \ + ../console$(LIB_VARIANT).rel ../vectors$(LIB_VARIANT).rel + if HAS_NETWORKING -NETWORKING = network +OBJS += ../network$(LIB_VARIANT).rel endif -BSP_PIECES = clock irq start startup console vectors $(NETWORKING) - # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/powerpc/shared/*/$(ARCH)/*.$(OBJEXT)) \ +OBJS += ../../../../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 \ -- cgit v1.2.3