From ccb1a6ecbb814dbce0417f344a5506d2803cc301 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 17 Apr 2003 10:55:40 +0000
Subject: Merger from rtems-4-6-branch.

---
 cpukit/libcsupport/ChangeLog      | 4 ++++
 cpukit/libcsupport/src/no_posix.c | 4 ++--
 cpukit/libmisc/ChangeLog          | 4 ++++
 cpukit/libmisc/dummy/Makefile.am  | 2 --
 cpukit/score/cpu/arm/ChangeLog    | 4 ++++
 cpukit/score/cpu/arm/Makefile.am  | 2 +-
 cpukit/score/cpu/unix/ChangeLog   | 5 +++++
 cpukit/score/cpu/unix/Makefile.am | 3 ++-
 8 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog
index ef41c427ff..5613c18700 100644
--- a/cpukit/libcsupport/ChangeLog
+++ b/cpukit/libcsupport/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* src/no_posix.c: include <reent.h> instead of <sys/reent.h>
+
 2003-04-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	PR 389/rtems
diff --git a/cpukit/libcsupport/src/no_posix.c b/cpukit/libcsupport/src/no_posix.c
index ec601b8fcf..fee2e96de0 100644
--- a/cpukit/libcsupport/src/no_posix.c
+++ b/cpukit/libcsupport/src/no_posix.c
@@ -35,7 +35,7 @@ pid_t getpid(void)
 }
 
 #if defined(RTEMS_NEWLIB)
-#include <sys/reent.h>
+#include <reent.h>
 
 pid_t _getpid_r(
   struct _reent *ptr
@@ -54,7 +54,7 @@ int kill( pid_t pid, int sig )
 }
 
 #if defined(RTEMS_NEWLIB)
-#include <sys/reent.h>
+#include <reent.h>
 
 int _kill_r( struct _reent *ptr, pid_t pid, int sig )
 {
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 09fd81794a..ed515b654b 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* dummy/Makefile.am: Remove stray dummy.rel.
+
 2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove AC_CONFIG_AUX_DIR.
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
index 4384478889..d267f5b095 100644
--- a/cpukit/libmisc/dummy/Makefile.am
+++ b/cpukit/libmisc/dummy/Makefile.am
@@ -19,8 +19,6 @@ include $(top_srcdir)/../automake/lib.am
 $(LIB): $(OBJS)
 	$(make-library)
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
-
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
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
 
-- 
cgit v1.2.3