From a4b2d9cde711a10ee23682e0d25e4281aaf34bd0 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 06:34:49 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 9 +++++++++ c/src/lib/libbsp/c4x/c4xsim/Makefile.am | 8 ++++---- c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am | 1 - c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am | 1 - c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am | 1 - c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am | 1 - c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am | 5 +++-- 7 files changed, 16 insertions(+), 10 deletions(-) (limited to 'c/src/lib/libbsp/c4x') diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 3622a7704a..86c021d47d 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,12 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * timer/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am index 3484731e2c..3c138df99d 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/Makefile.am @@ -17,12 +17,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/simio.h: include/simio.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/simio.h: include/simio.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/simio.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/simio.h -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am index 31a73a7200..0fd03441ea 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clock.c diff --git a/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am index d8637a139a..978f4b722c 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am index 3e4b21ebc8..02798879eb 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am index cacb45f454..90b9fe36ae 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am @@ -7,8 +7,9 @@ BSP_PIECES = startup console clock timer CPU_PIECES = # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am -- cgit v1.2.3