From de2b815ffbf8e30b0de4e7188c4966070cdc3115 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Dec 2003 16:09:15 +0000 Subject: 2003-12-22 Ralf Corsepius * clock/Makefile.am: Eliminate VPATH. * console/Makefile.am: Eliminate VPATH. * scv64/Makefile.am: Eliminate VPATH. * sonic/Makefile.am: Eliminate VPATH. * start/Makefile.am: Eliminate VPATH. * startup/Makefile.am: Eliminate VPATH. * timer/Makefile.am: Eliminate VPATH. * tod/Makefile.am: Eliminate VPATH. --- c/src/lib/libbsp/powerpc/dmv177/ChangeLog | 11 ++++++++ c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am | 21 ++------------ .../lib/libbsp/powerpc/dmv177/console/Makefile.am | 27 ++++++------------ c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am | 21 ++------------ c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am | 21 ++------------ c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am | 4 +-- .../lib/libbsp/powerpc/dmv177/startup/Makefile.am | 32 +++++++++++----------- c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am | 21 ++------------ c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am | 26 ++++++------------ 9 files changed, 56 insertions(+), 128 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/dmv177') diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog index 04ea5787b3..c8a656e241 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog +++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog @@ -1,3 +1,14 @@ +2003-12-22 Ralf Corsepius + + * clock/Makefile.am: Eliminate VPATH. + * console/Makefile.am: Eliminate VPATH. + * scv64/Makefile.am: Eliminate VPATH. + * sonic/Makefile.am: Eliminate VPATH. + * start/Makefile.am: Eliminate VPATH. + * startup/Makefile.am: Eliminate VPATH. + * timer/Makefile.am: Eliminate VPATH. + * tod/Makefile.am: Eliminate VPATH. + 2003-12-13 Ralf Corsepius * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. diff --git a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am index 29e4a74073..ed18a38f58 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am @@ -2,29 +2,14 @@ ## $Id$ ## -PGM = $(ARCH)/clock.rel - C_FILES = clock.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_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 += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) +noinst_DATA = $(OBJS) -EXTRA_DIST = clock.c +EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am index 3074b7e017..d1fa1a27fd 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am @@ -2,31 +2,20 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../../shared - -PGM = $(ARCH)/console.rel - -C_FILES = conscfg.c console.c debugio.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +C_FILES = conscfg.c debugio.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 += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +shared_C_FILES = $(top_srcdir)/../../shared/console.c +OBJS += $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) -all-local: $(OBJS) $(PGM) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -.PRECIOUS: $(PGM) +noinst_DATA = $(OBJS) -EXTRA_DIST = conscfg.c debugio.c +EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am index 61b84e3915..25ec5e6629 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am @@ -2,29 +2,14 @@ ## $Id$ ## -PGM = $(ARCH)/scv64.rel - C_FILES = scv64.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_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 += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) +noinst_DATA = $(OBJS) -EXTRA_DIST = scv64.c +EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am index 226093e77f..8d19b1be0e 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am @@ -2,33 +2,18 @@ ## $Id$ ## -PGM = $(ARCH)/sonic.rel - C_FILES = dmvsonic.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_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 += -# - 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: $(OBJS) $(PGM) +noinst_DATA = $(OBJS) endif -.PRECIOUS: $(PGM) - -EXTRA_DIST = dmvsonic.c +EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am index 01a0f84051..85583b72d5 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am @@ -3,9 +3,7 @@ ## 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 diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am index e77e0c7870..d680de9a26 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am @@ -2,31 +2,31 @@ ## $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 genpvec.c vmeintr.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +C_FILES = bspclean.c bspstart.c setvec.c genpvec.c vmeintr.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) +noinst_DATA = $(OBJS) project_lib_DATA = linkcmds -all-local: $(PGM) $(TMPINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bspclean.c bspstart.c genpvec.c linkcmds setvec.c vmeintr.c +EXTRA_DIST = $(C_FILES) $(PROJECT_LIB)/$(dirstamp): @$(mkdir_p) $(PROJECT_LIB) diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am index 89cd2f36f3..f952e2954b 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am @@ -2,29 +2,14 @@ ## $Id$ ## -PGM = $(ARCH)/timer.rel - C_FILES = timer.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_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 += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile - -all-local: $(OBJS) $(PGM) - -.PRECIOUS: $(PGM) +noinst_DATA = $(OBJS) -EXTRA_DIST = timer.c +EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am index 3961d5d45c..d012059887 100644 --- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am +++ b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am @@ -2,31 +2,21 @@ ## $Id$ ## -VPATH = @srcdir@:@srcdir@/../../../shared -PGM = $(ARCH)/tod.rel - -C_FILES = todcfg.c tod.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) - -OBJS = $(C_O_FILES) +C_FILES = todcfg.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 += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +shared_C_FILES = $(top_srcdir)/../../shared/tod.c +OBJS += $(shared_C_FILES:$(top_srcdir)/../../shared/%.c=$(ARCH)/%.$(OBJEXT)) -all-local: $(OBJS) $(PGM) +$(ARCH)/%.$(OBJEXT): $(top_srcdir)/../../shared/%.c $(ARCH)/$(dirstamp) + ${COMPILE} -o $@ -c $< -.PRECIOUS: $(PGM) +noinst_DATA = $(OBJS) -EXTRA_DIST = todcfg.c +EXTRA_DIST = $(C_FILES) include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3