summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 06:34:49 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-03 06:34:49 +0000
commita4b2d9cde711a10ee23682e0d25e4281aaf34bd0 (patch)
tree73781e4d9c5326a79a8db58fe124333092cf8ee7 /c/src
parent621e4f3fb6f747e01a43c066ad7fa3c5fa358602 (diff)
downloadrtems-a4b2d9cde711a10ee23682e0d25e4281aaf34bd0.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.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/ChangeLog9
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/Makefile.am8
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/clock/Makefile.am1
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/console/Makefile.am1
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/startup/Makefile.am1
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/timer/Makefile.am1
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/wrapup/Makefile.am5
7 files changed, 16 insertions, 10 deletions
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 <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>
* 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