summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 15:49:11 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 15:49:11 +0000
commit2d551c14244f8375dd36504c941ce6cceedbc868 (patch)
treeb01db037e8bd0b173a43ec20bae62225c93db6d8
parent2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-2d551c14244f8375dd36504c941ce6cceedbc868.tar.bz2
2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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.
-rw-r--r--c/src/lib/libbsp/sh/simsh4/ChangeLog9
-rw-r--r--c/src/lib/libbsp/sh/simsh4/Makefile.am12
-rw-r--r--c/src/lib/libbsp/sh/simsh4/clock/Makefile.am5
-rw-r--r--c/src/lib/libbsp/sh/simsh4/console/Makefile.am1
-rw-r--r--c/src/lib/libbsp/sh/simsh4/startup/Makefile.am5
-rw-r--r--c/src/lib/libbsp/sh/simsh4/timer/Makefile.am5
-rw-r--r--c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am3
7 files changed, 23 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index bcf7c26fe9..d10036ddfa 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * 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 <corsepiu@faw.uni-ulm.de>
* console/Makefile.am: Remove all-local: $(ARCH).
diff --git a/c/src/lib/libbsp/sh/simsh4/Makefile.am b/c/src/lib/libbsp/sh/simsh4/Makefile.am
index e12322462e..21c42f9537 100644
--- a/c/src/lib/libbsp/sh/simsh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/Makefile.am
@@ -20,16 +20,16 @@ include_HEADERS += include/coverhd.h
all-local: $(PREINSTALL_FILES)
-$(PROJECT_INCLUDE)/syscall.h: include/syscall.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syscall.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/syscall.h
-$(PROJECT_INCLUDE)/ramdisk.h: include/ramdisk.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/ramdisk.h: include/ramdisk.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ramdisk.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/ramdisk.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/sh/simsh4/clock/Makefile.am b/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am
index 0e49ad9e7b..b1ef900536 100644
--- a/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/clock/Makefile.am
@@ -1,7 +1,6 @@
-##
+##
## $Id$
-##
-
+##
PGM = $(ARCH)/clock.rel
diff --git a/c/src/lib/libbsp/sh/simsh4/console/Makefile.am b/c/src/lib/libbsp/sh/simsh4/console/Makefile.am
index 793b697304..09a95c1676 100644
--- a/c/src/lib/libbsp/sh/simsh4/console/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/console/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
PGM = $(ARCH)/console.rel
C_FILES = console.c
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
index 84a7503d66..2772f2f111 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-
VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
PGM = $(ARCH)/startup.rel
@@ -35,8 +34,8 @@ $(PGM): $(OBJS)
$(make-rel)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \
- $(PROJECT_RELEASE)/lib/linkcmds-le \
- $(PROJECT_RELEASE)/lib/linkcmds-le.coff
+ $(PROJECT_RELEASE)/lib/linkcmds-le \
+ $(PROJECT_RELEASE)/lib/linkcmds-le.coff
all-local: $(TMPINSTALL_FILES) $(OBJS) $(PGM)
diff --git a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am
index 4deaaf991b..35c11ffebf 100644
--- a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am
@@ -1,7 +1,6 @@
-##
+##
## $Id$
-##
-
+##
PGM = $(ARCH)/timer.rel
diff --git a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am
index 7ac1279f16..ae80b69632 100644
--- a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am
@@ -14,7 +14,8 @@ CPU_PIECES = score
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
- $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel)
+ $(foreach piece, $(CPU_PIECES), \
+ ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a