From c6592940cc0f4b478cb8b2673e57103b061734d4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Dec 2003 16:09:39 +0000 Subject: 2003-12-22 Ralf Corsepius * bootloader/Makefile.am: Eliminate VPATH. * clock/Makefile.am: Eliminate VPATH. * console/Makefile.am: Eliminate VPATH. * irq/Makefile.am: Eliminate VPATH. * motorola/Makefile.am: Eliminate VPATH. * openpic/Makefile.am: Eliminate VPATH. * pci/Makefile.am: Eliminate VPATH. * residual/Makefile.am: Eliminate VPATH. * start/Makefile.am: Eliminate VPATH. * startup/Makefile.am: Eliminate VPATH. * vectors/Makefile.am: Eliminate VPATH. * vme/Makefile.am: Eliminate VPATH. --- .../lib/libbsp/powerpc/motorola_powerpc/ChangeLog | 15 +++++++ .../motorola_powerpc/bootloader/Makefile.am | 19 ++++++--- .../powerpc/motorola_powerpc/clock/Makefile.am | 19 ++++----- .../powerpc/motorola_powerpc/console/Makefile.am | 29 +++++++------ .../powerpc/motorola_powerpc/irq/Makefile.am | 36 +++++++++------- .../powerpc/motorola_powerpc/motorola/Makefile.am | 29 ++++++------- .../powerpc/motorola_powerpc/openpic/Makefile.am | 23 +++++++---- .../powerpc/motorola_powerpc/pci/Makefile.am | 26 ++++++------ .../powerpc/motorola_powerpc/residual/Makefile.am | 25 +++++------ .../powerpc/motorola_powerpc/start/Makefile.am | 20 ++++----- .../powerpc/motorola_powerpc/startup/Makefile.am | 33 ++++++++++----- .../powerpc/motorola_powerpc/vectors/Makefile.am | 38 +++++++++-------- .../powerpc/motorola_powerpc/vme/Makefile.am | 48 ++++++++++++---------- 13 files changed, 202 insertions(+), 158 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 2394c7ba76..eed8edbaaa 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,18 @@ +2003-12-22 Ralf Corsepius + + * bootloader/Makefile.am: Eliminate VPATH. + * clock/Makefile.am: Eliminate VPATH. + * console/Makefile.am: Eliminate VPATH. + * irq/Makefile.am: Eliminate VPATH. + * motorola/Makefile.am: Eliminate VPATH. + * openpic/Makefile.am: Eliminate VPATH. + * pci/Makefile.am: Eliminate VPATH. + * residual/Makefile.am: Eliminate VPATH. + * start/Makefile.am: Eliminate VPATH. + * startup/Makefile.am: Eliminate VPATH. + * vectors/Makefile.am: Eliminate VPATH. + * vme/Makefile.am: Eliminate VPATH. + 2003-12-13 Ralf Corsepius * bootloader/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am index ecdec90aa6..798abc1b70 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am @@ -7,14 +7,23 @@ AUTOMAKE_OPTIONS = no-exeext -VPATH = @srcdir@:@srcdir@/../../shared/bootloader:@srcdir@/../../shared/console - noinst_PROGRAMS = bootloader ## IMPORTANT: head.S must be first, T. Straumann 12/17/2001 -bootloader_SOURCES = head.S exception.S em86real.S -bootloader_SOURCES += misc.c pci.c zlib.c mm.c em86.c polled_io.c lib.c -bootloader_SOURCES += bootldr.h zlib.h pci.h keyboard.h +bootloader_SOURCES = $(top_srcdir)/../../powerpc/shared/bootloader/head.S \ + $(top_srcdir)/../../powerpc/shared/bootloader/exception.S \ + $(top_srcdir)/../../powerpc/shared/bootloader/em86real.S \ + $(top_srcdir)/../../powerpc/shared/bootloader/misc.c \ + $(top_srcdir)/../../powerpc/shared/bootloader/pci.c \ + $(top_srcdir)/../../powerpc/shared/bootloader/zlib.c \ + $(top_srcdir)/../../powerpc/shared/bootloader/mm.c \ + $(top_srcdir)/../../powerpc/shared/bootloader/em86.c \ + $(top_srcdir)/../../powerpc/shared/console/polled_io.c \ + $(top_srcdir)/../../powerpc/shared/bootloader/lib.c \ + $(top_srcdir)/../../powerpc/shared/bootloader/bootldr.h \ + $(top_srcdir)/../../powerpc/shared/bootloader/zlib.h \ + $(top_srcdir)/../../powerpc/shared/bootloader/pci.h \ + $(top_srcdir)/../../powerpc/shared/console/keyboard.h NM = @NM@ LD = @LD@ diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am index f20d3ae2c4..ed4ffefdcb 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am @@ -2,22 +2,17 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/clock - -C_FILES = p_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 += -# +powerpc_shared_clock_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/clock/p_clock.c +OBJS = \ + $(powerpc_shared_clock_C_FILES:$(top_srcdir)/../../powerpc/shared/clock/%.c=$(ARCH)/%.$(OBJEXT)) -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/clock/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -all-local: $(OBJS) +noinst_DATA = $(OBJS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am index d2c5e2f14d..9a819d8600 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am @@ -2,22 +2,27 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/console:@srcdir@/../../../shared - -C_FILES = polled_io.c uart.c console.c inch.c reboot.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am -H_FILES = ../../shared/console/consoleIo.h ../../shared/console/keyboard.h \ - ../../shared/console/uart.h +powerpc_shared_console_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/console/polled_io.c \ + $(top_srcdir)/../../powerpc/shared/console/uart.c \ + $(top_srcdir)/../../powerpc/shared/console/console.c \ + $(top_srcdir)/../../powerpc/shared/console/inch.c \ + $(top_srcdir)/../../powerpc/shared/console/reboot.c +OBJS = \ + $(powerpc_shared_console_C_FILES:$(top_srcdir)/../../powerpc/shared/console/%.c=$(ARCH)/%.$(OBJEXT)) -OBJS = $(C_O_FILES) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/console/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +# FIXME: This is nonsense. +noinst_HEADERS = $(top_srcdir)/../../powerpc/shared/console/consoleIo.h \ + $(top_srcdir)/../../powerpc/shared/console/keyboard.h \ + $(top_srcdir)/../../powerpc/shared/console/uart.h -# -# (OPTIONAL) Add local stuff here using += -# +noinst_DATA = $(OBJS) AM_CPPFLAGS += -DSTATIC_LOG_ALLOC diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am index a7c50f6c9f..fc434abd23 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am @@ -2,27 +2,33 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/irq - -C_FILES = irq_init.c i8259.c irq.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am include_bspdir = $(includedir)/bsp -nodist_include_bsp_HEADERS = $(top_srcdir)/../shared/irq/irq.h +nodist_include_bsp_HEADERS = $(top_srcdir)/../../powerpc/shared/irq/irq.h -S_FILES = irq_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +powerpc_shared_irq_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/irq/irq_init.c \ + $(top_srcdir)/../../powerpc/shared/irq/i8259.c \ + $(top_srcdir)/../../powerpc/shared/irq/irq.c +OBJS = \ + $(powerpc_shared_irq_C_FILES:$(top_srcdir)/../../powerpc/shared/irq/%.c=$(ARCH)/%.$(OBJEXT)) -OBJS = $(S_O_FILES) $(C_O_FILES) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/irq/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +powerpc_shared_irq_S_FILES = \ + $(top_srcdir)/../../powerpc/shared/irq/irq_asm.S +OBJS += \ + $(powerpc_shared_irq_S_FILES:$(top_srcdir)/../../powerpc/shared/irq/%.S=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/irq/%.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -o $@ -c $< -# -# (OPTIONAL) Add local stuff here using += -# +noinst_DATA = $(OBJS) -all-local: $(PREINSTALL_FILES) $(OBJS) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -30,7 +36,7 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/bsp/irq.h: $(top_srcdir)/../shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/irq.h: $(top_srcdir)/../../powerpc/shared/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am index d3ba05d5e3..018529bdbf 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am @@ -2,27 +2,24 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/motorola - -C_FILES = motorola.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am -# FIXME: This doesn't give any sense here include_bspdir = $(includedir)/bsp -nodist_include_bsp_HEADERS = $(top_srcdir)/../shared/motorola/motorola.h +nodist_include_bsp_HEADERS = \ + $(top_srcdir)/../../powerpc/shared/motorola/motorola.h -OBJS = $(C_O_FILES) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +powerpc_shared_motorola_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/motorola/motorola.c +OBJS = \ + $(powerpc_shared_motorola_C_FILES:$(top_srcdir)/../../powerpc/shared/motorola/%.c=$(ARCH)/%.$(OBJEXT)) -# -# (OPTIONAL) Add local stuff here using += -# +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/motorola/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +noinst_DATA = $(OBJS) -all-local: $(OBJS) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -30,7 +27,7 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/bsp/motorola.h: $(top_srcdir)/../shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/motorola.h: $(top_srcdir)/../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am index 8f89c74e62..be264bfea2 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am @@ -2,19 +2,24 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/openpic - -C_FILES = openpic.c +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am include_bspdir = $(includedir)/bsp -nodist_include_bsp_HEADERS = $(top_srcdir)/../shared/openpic/openpic.h +nodist_include_bsp_HEADERS = \ + $(top_srcdir)/../../powerpc/shared/openpic/openpic.h -OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +powerpc_shared_openpic_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/openpic/openpic.c +OBJS = \ + $(powerpc_shared_openpic_C_FILES:$(top_srcdir)/../../powerpc/shared/openpic/%.c=$(ARCH)/%.$(OBJEXT)) -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/openpic/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +noinst_DATA = $(OBJS) -all-local: $(PREINSTALL_FILES) $(OBJS) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -22,7 +27,7 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/bsp/openpic.h: $(top_srcdir)/../shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/openpic.h: $(top_srcdir)/../../powerpc/shared/openpic/openpic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/openpic.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/openpic.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am index a23c73f0bb..511b993004 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am @@ -2,24 +2,22 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/pci - -C_FILES = pci.c detect_raven_bridge.c pcifinddevice.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -include_bspdir = $(includedir)/bsp -nodist_include_bsp_HEADERS = $(top_srcdir)/../shared/pci/pci.h - -OBJS = $(C_O_FILES) - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -AM_CFLAGS += -O2 +include_bspdir = $(includedir)/bsp +nodist_include_bsp_HEADERS = $(top_srcdir)/../../powerpc/shared/pci/pci.h + +power_shared_pci_C_FILES = $(top_srcdir)/../../powerpc/shared/pci/pci.c \ + $(top_srcdir)/../../powerpc/shared/pci/detect_raven_bridge.c \ + $(top_srcdir)/../../powerpc/shared/pci/pcifinddevice.c +OBJS = \ + $(power_shared_pci_C_FILES:$(top_srcdir)/../../powerpc/shared/pci/%.c=$(ARCH)/%.$(OBJEXT)) -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/pci/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -all-local: $(PREINSTALL_FILES) $(OBJS) +noinst_DATA = $(OBJS) PREINSTALL_FILES = @@ -27,7 +25,7 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/bsp/pci.h: $(top_srcdir)/../shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/pci.h: $(top_srcdir)/../../powerpc/shared/pci/pci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pci.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am index 167169848c..1f9b54e384 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am @@ -2,24 +2,21 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/residual - -C_FILES = residual.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -H_FILES = ../../shared/residual/pnp.h ../../shared/residual/residual.h - -OBJS = $(C_O_FILES) - include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -# -# (OPTIONAL) Add local stuff here using += -# +# FIXME: This does not make much sense +noinst_HEADERS = $(top_srcdir)/../../powerpc/shared/residual/pnp.h \ + $(top_srcdir)/../../powerpc/shared/residual/residual.h + +powerpc_shared_residual_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/residual/residual.c +OBJS = \ + $(powerpc_shared_residual_C_FILES:$(top_srcdir)/../../powerpc/shared/residual/%.c=$(ARCH)/%.$(OBJEXT)) -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/residual/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -all-local: $(PREINSTALL_FILES) $(OBJS) +noinst_DATA = $(OBJS) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am index 1e7fb6c47a..782fbf1387 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am @@ -2,20 +2,20 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/start - -S_FILES = start.S rtems_crti.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 include $(top_srcdir)/../../bspstart.am -# -# (OPTIONAL) Add local stuff here using += -# +powerpc_shared_start_S_FILES = \ + $(top_srcdir)/../../powerpc/shared/start/start.S \ + $(top_srcdir)/../../powerpc/shared/start/rtems_crti.S + +OBJS = \ + $(powerpc_shared_start_S_FILES:$(top_srcdir)/../../powerpc/shared/start/%.S=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/start/%.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -o $@ -c $< + project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) project_lib_DATA += $(ARCH)/rtems_crti$(LIB_VARIANT).$(OBJEXT) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am index 5c8ed0fc9b..7f9bbea09d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am @@ -2,22 +2,33 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/startup:@srcdir@/../../../shared - PGM = $(ARCH)/startup.rel -C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.c \ - gnatinstallhandler.c pgtbl_setup.c pgtbl_activate.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 += -# +powerpc_shared_startup_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/startup/bspstart.c \ + $(top_srcdir)/../../powerpc/shared/startup/pgtbl_setup.c \ + $(top_srcdir)/../../powerpc/shared/startup/pgtbl_activate.c \ + $(top_srcdir)/../../powerpc/shared/startup/sbrk.c +OBJS = \ + $(powerpc_shared_startup_C_FILES:$(top_srcdir)/../../powerpc/shared/startup/%.c=$(ARCH)/%.$(OBJEXT)) + +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/startup/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< + +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/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) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am index 0890bf03c5..deccc2001c 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am @@ -2,30 +2,32 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/vectors +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am -C_FILES = vectors_init.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +# FIXME: this does not make much sense +include_bspdir = $(includedir)/bsp +include_bsp_HEADERS = $(top_srcdir)/../../powerpc/shared/vectors/vectors.h -S_FILES = vectors.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +powerpc_shared_vectors_C_FILES = \ + $(top_srcdir)/../..//powerpc/shared/vectors/vectors_init.c +OBJS = \ + $(powerpc_shared_vectors_C_FILES:$(top_srcdir)/../../powerpc/shared/vectors/%.c=$(ARCH)/%.$(OBJEXT)) -OBJS = $(S_O_FILES) $(C_O_FILES) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/vectors/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# +powerpc_shared_vectors_S_FILES = \ + $(top_srcdir)/../../powerpc/shared/vectors/vectors.S +OBJS += \ + $(powerpc_shared_vectors_S_FILES:$(top_srcdir)/../../powerpc/shared/vectors/%.S=$(ARCH)/%.$(OBJEXT)) -$(PGM): $(OBJS) - $(make-rel) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/vectors/%.S $(ARCH)/$(dirstamp) + ${CCASCOMPILE} -o $@ -c $< -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = $(top_srcdir)/../shared/vectors/vectors.h +noinst_DATA = $(OBJS) -all-local: $(PREINSTALL_FILES) $(OBJS) +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -33,7 +35,7 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/bsp/vectors.h: $(top_srcdir)/../shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/vectors.h: $(top_srcdir)/../../powerpc/shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am index 12c89d7604..b8ef452eb7 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vme/Makefile.am @@ -2,29 +2,33 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../shared/vme:@srcdir@/../../../shared/vmeUniverse: +include $(top_srcdir)/../../../../automake/compile.am +include $(top_srcdir)/../../../../automake/lib.am -H_FILES = ../pci/pci.h ../irq/irq.h ../vme/VME.h ../vme/VMEConfig.h +include_bspdir = $(includedir)/bsp -C_FILES = vmeUniverse.c vmeconfig.c +include_bsp_HEADERS = $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.h +shared_vmeUniverse_C_FILES = \ + $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.c +OBJS = \ + $(shared_vmeUniverse_C_FILES:$(top_srcdir)/../../shared/vmeUniverse/%.c=$(ARCH)/%.$(OBJEXT)) -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/vmeUniverse/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -OBJS = $(C_O_FILES) +include_bsp_HEADERS += $(top_srcdir)/../../powerpc/shared/vme/VMEConfig.h +include_bsp_HEADERS += $(top_srcdir)/../../powerpc/shared/vme/VME.h +powerpc_shared_vme_C_FILES = \ + $(top_srcdir)/../../powerpc/shared/vme/vmeconfig.c +OBJS += \ + $(powerpc_sharec_vme_C_FILES:$(top_srcdir)/../../powerpc/shared/vme/%.c=$(ARCH)/%.$(OBJEXT)) -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = ../../shared/vme/VMEConfig.h -include_bsp_HEADERS += ../../shared/vme/VME.h -include_bsp_HEADERS += ../../../shared/vmeUniverse/vmeUniverse.h +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../powerpc/shared/vme/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -all-local: $(PREINSTALL_FILES) $(OBJS) - -include $(top_srcdir)/../../../../automake/compile.am -include $(top_srcdir)/../../../../automake/lib.am +noinst_DATA = $(OBJS) -# -# (OPTIONAL) Add local stuff here using += -# +all-local: $(PREINSTALL_FILES) PREINSTALL_FILES = @@ -32,16 +36,16 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -$(PROJECT_INCLUDE)/bsp/VMEConfig.h: ../../shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: $(top_srcdir)/../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h + +$(PROJECT_INCLUDE)/bsp/VMEConfig.h: $(top_srcdir)/../../powerpc/shared/vme/VMEConfig.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VMEConfig.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VMEConfig.h -$(PROJECT_INCLUDE)/bsp/VME.h: ../../shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) +$(PROJECT_INCLUDE)/bsp/VME.h: $(top_srcdir)/../../powerpc/shared/vme/VME.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/VME.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/VME.h -$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h - include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3