summaryrefslogtreecommitdiffstats
path: root/cpukit/score
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-04-17 10:55:40 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-04-17 10:55:40 +0000
commitccb1a6ecbb814dbce0417f344a5506d2803cc301 (patch)
treebf8e473cc559874e57f8fea1da73b5289c026bfe /cpukit/score
parent2003-04-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-ccb1a6ecbb814dbce0417f344a5506d2803cc301.tar.bz2
Merger from rtems-4-6-branch.
Diffstat (limited to 'cpukit/score')
-rw-r--r--cpukit/score/cpu/arm/ChangeLog4
-rw-r--r--cpukit/score/cpu/arm/Makefile.am2
-rw-r--r--cpukit/score/cpu/unix/ChangeLog5
-rw-r--r--cpukit/score/cpu/unix/Makefile.am3
4 files changed, 12 insertions, 2 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 0773ffc585..0f71052392 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Use "all-local:" instead of "all:".
+
2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove AC_CONFIG_AUX_DIR.
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index 47a609d13e..92e9dc3924 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -43,7 +43,7 @@ LIB = $(ARCH)/libscorecpu.a
$(LIB): $(OBJS)
$(make-library)
-all: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
$(TMPINSTALL_FILES)
EXTRA_DIST = cpu.c cpu_asm.S
diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog
index 580ae2e08b..d2962151f2 100644
--- a/cpukit/score/cpu/unix/ChangeLog
+++ b/cpukit/score/cpu/unix/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add PREINSTALL_FILES and TMPINSTALL_FILES to
+ all-local (Sync with other Makefile.ams).
+
2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove AC_CONFIG_AUX_DIR.
diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index a6bf7da4d9..7d358443c2 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -39,7 +39,8 @@ LIB = $(ARCH)/libscorecpu.a
$(LIB): $(OBJS)
$(make-library)
-all-local: $(ARCH) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
+ $(TMPINSTALL_FILES)
EXTRA_DIST = cpu.c