From bc7d465dcd58eabb6a0dfbe6312b77bca938a1cb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 11 Apr 1997 18:41:38 +0000 Subject: replaced linking of source from mvme147 drivers with use of vpath to simply search into that directory and get the necessary files. --- c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in | 9 ++------- c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in | 9 ++------- c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in | 10 ++-------- c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in | 9 ++------- 4 files changed, 8 insertions(+), 29 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in index fea609c5bf..66185824b4 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.in @@ -5,7 +5,7 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH=@srcdir@:@srcdir@/../../mvme147/clock PGM=${ARCH}/clock.rel @@ -22,8 +22,6 @@ OBJS=$(C_O_FILES) include $(RTEMS_CUSTOM) include $(PROJECT_ROOT)/make/leaf.cfg -SHARED_SRCS=ckinit.c - # # (OPTIONAL) Add local stuff here using += # @@ -44,15 +42,12 @@ LDFLAGS += # CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += $(SHARED_SRCS) +CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) -$(SHARED_SRCS): - -$(LN) -s $(srcdir)/../../mvme147/clock/$@ $@ - # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all diff --git a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in index 6d5ee876d3..3d9d7f4df4 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.in @@ -5,7 +5,7 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH=@srcdir@:@srcdir@/../../mvme147/console PGM=${ARCH}/console.rel @@ -22,8 +22,6 @@ OBJS=$(C_O_FILES) include $(RTEMS_CUSTOM) include $(PROJECT_ROOT)/make/leaf.cfg -SHARED_SRCS=console.c - # # (OPTIONAL) Add local stuff here using += # @@ -44,15 +42,12 @@ LDFLAGS += # CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += $(SHARED_SRCS) +CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) -$(SHARED_SRCS): - -$(LN) -s $(srcdir)/../../mvme147/console/$@ $@ - # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in index 8482d07f4c..552ecccfdc 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.in @@ -5,7 +5,7 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH=@srcdir@:@srcdir@/../../mvme147/startup PGM=${ARCH}/startup.rel @@ -22,8 +22,6 @@ OBJS=$(C_O_FILES) include $(RTEMS_CUSTOM) include $(PROJECT_ROOT)/make/leaf.cfg -SHARED_SRCS=bspclean.c sbrk.c setvec.c - # # (OPTIONAL) Add local stuff here using += # @@ -44,7 +42,7 @@ LDFLAGS += # CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += $(SHARED_SRCS) +CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) @@ -52,8 +50,4 @@ ${PGM}: ${SRCS} ${OBJS} all: ${ARCH} $(SRCS) $(PGM) $(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib -$(SHARED_SRCS): - -$(LN) -s $(srcdir)/../../mvme147/startup/$@ $@ - # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - diff --git a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in index 53729c4ecd..88201beb4c 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in +++ b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in @@ -5,7 +5,7 @@ @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH=@srcdir@ +VPATH=@srcdir@:@srcdir@/../../mvme147/timer PGM=${ARCH}/timer.rel @@ -27,8 +27,6 @@ OBJS=$(C_O_FILES) $(S_O_FILES) include $(RTEMS_CUSTOM) include $(PROJECT_ROOT)/make/leaf.cfg -SHARED_SRCS=timer.c timerisr.s - # # (OPTIONAL) Add local stuff here using += # @@ -49,15 +47,12 @@ LDFLAGS += # CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += $(SHARED_SRCS) +CLOBBER_ADDITIONS += ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) -$(SHARED_SRCS): - -$(LN) -s $(srcdir)/../../mvme147/timer/$@ $@ - # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all -- cgit v1.2.3