diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-22 16:10:00 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-22 16:10:00 +0000 |
| commit | 4043f4202f32b662989b32f6a1d221d6360d2a86 (patch) | |
| tree | 0e29f61bcc9ef4056d8ac0aaf8295bba619da0e1 /c | |
| parent | 2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-4043f4202f32b662989b32f6a1d221d6360d2a86.tar.bz2 | |
2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* PCI_bus/Makefile.am: Eliminate VPATH.
* clock/Makefile.am: Eliminate VPATH.
* console/Makefile.am: Eliminate VPATH.
* start/Makefile.am: Eliminate VPATH.
* startup/Makefile.am: Eliminate VPATH.
* timer/Makefile.am: Eliminate VPATH.
* tod/Makefile.am: Eliminate VPATH.
* vectors/Makefile.am: Eliminate VPATH.
Diffstat (limited to 'c')
9 files changed, 34 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index e48ff07338..0d47757612 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,14 @@ +2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * PCI_bus/Makefile.am: Eliminate VPATH. + * clock/Makefile.am: Eliminate VPATH. + * console/Makefile.am: Eliminate VPATH. + * start/Makefile.am: Eliminate VPATH. + * startup/Makefile.am: Eliminate VPATH. + * timer/Makefile.am: Eliminate VPATH. + * tod/Makefile.am: Eliminate VPATH. + * vectors/Makefile.am: Eliminate VPATH. + 2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am index 435432f33e..326e22f4b1 100644 --- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am @@ -21,7 +21,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) +all-local: $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am index 29e4a74073..bcd1265b8a 100644 --- a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am @@ -21,7 +21,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) +all-local: $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am index c0075a8c0d..a64d24a7da 100644 --- a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am @@ -21,7 +21,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) +all-local: $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am index 01a0f84051..660f0fdf07 100644 --- a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am @@ -3,18 +3,12 @@ ## S_FILES = start.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(S_O_FILES) +OBJS = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am include $(top_srcdir)/../../bspstart.am -# -# (OPTIONAL) Add local stuff here using += -# - project_lib_DATA = $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) all-local: $(TMPINSTALL_FILES) diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am index ee6ad64d80..f775d49c64 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am @@ -2,7 +2,7 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../../shared + PGM = $(ARCH)/startup.rel @@ -12,19 +12,24 @@ PGM = $(ARCH)/startup.rel # Generation 2 --> FPGA STARTUP_C_FILES = FPGA.c -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ - setvec.c Hwr_init.c spurious.c genpvec.c $(STARTUP_C_FILES) \ - gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +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 -# -# (OPTIONAL) Add local stuff here using += -# +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) @@ -33,8 +38,7 @@ project_lib_DATA = linkcmds all-local: $(PGM) $(TMPINSTALL_FILES) -EXTRA_DIST = FPGA.c Hwr_init.c bspclean.c bspstart.c genpvec.c linkcmds \ - setvec.c spurious.c vmeintr.c +EXTRA_DIST = $(C_FILES) linkcmds $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am index 89cd2f36f3..2222cfc1af 100644 --- a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am @@ -21,7 +21,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) +all-local: $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am index 4b4a82c041..e88a57e572 100644 --- a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am @@ -24,7 +24,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) +all-local: $(PGM) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am index 853773044e..d0b788b3fa 100644 --- a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am @@ -21,7 +21,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) +all-local: $(PGM) .PRECIOUS: $(PGM) |