From cceaa6eb12bf7b05c4cfb341eaa9ac6f7247dbe5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 2 Dec 2003 15:03:05 +0000 Subject: 2003-12-02 Ralf Corsepius * Makefile.am: Add dirstamp support to preinstallation. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * erc32sonic/Makefile.am: Cosmetics. * gnatsupp/Makefile.am: Cosmetics. * start/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/sparc/erc32/ChangeLog | 12 ++++++++++++ c/src/lib/libbsp/sparc/erc32/Makefile.am | 8 ++++---- c/src/lib/libbsp/sparc/erc32/clock/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/console/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/start/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/startup/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/timer/Makefile.am | 1 - c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am | 5 +++-- 10 files changed, 19 insertions(+), 13 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index acaec164d9..b9647936a0 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,15 @@ +2003-12-02 Ralf Corsepius + + * Makefile.am: Add dirstamp support to preinstallation. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * erc32sonic/Makefile.am: Cosmetics. + * gnatsupp/Makefile.am: Cosmetics. + * start/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/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am index 2fc44281c2..53e353bc39 100644 --- a/c/src/lib/libbsp/sparc/erc32/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am @@ -18,12 +18,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/erc32.h: include/erc32.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/erc32.h: include/erc32.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/erc32.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/erc32.h -$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: 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/sparc/erc32/clock/Makefile.am b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am index b47f4e7492..ac8e2a0cee 100644 --- a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c consolereserveresources.c debugputs.c diff --git a/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am b/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am index 7c93f1af38..e19983c342 100644 --- a/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/erc32sonic/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/erc32sonic.rel C_FILES = erc32sonic.c diff --git a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am index 8c97d535ce..2a00a3eea0 100644 --- a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/gnatsupp.rel diff --git a/c/src/lib/libbsp/sparc/erc32/start/Makefile.am b/c/src/lib/libbsp/sparc/erc32/start/Makefile.am index cdd1ac9abe..34e7a3e364 100644 --- a/c/src/lib/libbsp/sparc/erc32/start/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/start/Makefile.am @@ -25,7 +25,6 @@ $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).$(OBJEXT) - all-local: $(OBJS) $(ARCH)/start.$(OBJEXT) $(TMPINSTALL_FILES) .PRECIOUS: $(ARCH)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am index c4d790c81e..a051eb6330 100644 --- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/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/sparc/erc32/timer/Makefile.am b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am index 2d4f5972dd..271e821edf 100644 --- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am @@ -12,8 +12,9 @@ BSP_PIECES = startup console clock timer gnatsupp $(NETWORKING_DRIVER) CPU_PIECES = cache reg_win syscall # 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)/*.$(OBJEXT)) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am -- cgit v1.2.3