diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-22 16:09:55 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-22 16:09:55 +0000 |
commit | daa9eb96cb42b35aa149820146ec7516de6a0965 (patch) | |
tree | dd8381f86cd25d5927650b8146c3e817a38b8f6f /c/src | |
parent | 2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-daa9eb96cb42b35aa149820146ec7516de6a0965.tar.bz2 |
2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* clock/Makefile.am: Eliminate VPATH.
* console/Makefile.am: Eliminate VPATH.
* shmsupp/Makefile.am: Eliminate VPATH.
* startup/Makefile.am: Eliminate VPATH.
* timer/Makefile.am: Eliminate VPATH.
* vectors/Makefile.am: Eliminate VPATH.
Diffstat (limited to 'c/src')
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/clock/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/console/Makefile.am | 24 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/startup/Makefile.am | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/timer/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am | 2 |
7 files changed, 37 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 84f5126521..2a7b1d8244 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,12 @@ +2003-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * clock/Makefile.am: Eliminate VPATH. + * console/Makefile.am: Eliminate VPATH. + * shmsupp/Makefile.am: Eliminate VPATH. + * startup/Makefile.am: Eliminate VPATH. + * timer/Makefile.am: Eliminate VPATH. + * vectors/Makefile.am: Eliminate VPATH. + 2003-12-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * wrapup/Makefile.am: Remove GENERIC_FILES. diff --git a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am index 29e4a74073..bcd1265b8a 100644 --- a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/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/psim/console/Makefile.am b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am index fd2b8ac540..42ae9ce220 100644 --- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am @@ -2,34 +2,30 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../../shared - PGM = $(ARCH)/console.rel -C_FILES = console-io.c console-polled.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +C_FILES = console-io.c +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -S_FILES = consupp.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +shared_C_FILES = ../../../shared/console-polled.c +OBJS += $(shared_C_FILES:../../../shared/%.c=$(ARCH)/%.$(OBJEXT)) -OBJS = $(C_O_FILES) $(S_O_FILES) +S_FILES = consupp.S +OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -# -# (OPTIONAL) Add local stuff here using += -# +$(ARCH)/%$(LIB_VARIANT).$(OBJEXT): ../../../shared/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< $(PGM): $(OBJS) $(make-rel) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) +all-local: $(PGM) -EXTRA_DIST = console-io.c consupp.S +EXTRA_DIST = $(C_FILES) $(S_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am index 61df97aac7..d24053bc84 100644 --- a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am @@ -22,7 +22,7 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile if HAS_MP -all-local: $(OBJS) $(PGM) +all-local: $(PGM) endif .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am index f49551ad5f..70d187fa69 100644 --- a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am @@ -2,22 +2,27 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../../shared -PGM = $(ARCH)/startup.rel -C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ - setvec.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +PGM = $(ARCH)/startup.rel -OBJS = $(C_O_FILES) +C_FILES = bspclean.c bspstart.c setvec.c +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) diff --git a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am index 89cd2f36f3..2222cfc1af 100644 --- a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/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/psim/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am index feb5cacde6..6b3dfe4318 100644 --- a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/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) |