2008-11-20 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libcsupport/Makefile.am, posix/Makefile.am: Comment out including
	files which contain routines which are now provided by the newlib
	posix subdirectory.  Document a few which come from the unix directory.

3 files changed, 22 insertions, 6 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index b5deb15134..72b961bddc 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
 2008-11-20	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* libcsupport/Makefile.am, posix/Makefile.am: Comment out including
+	files which contain routines which are now provided by the newlib
+	posix subdirectory.  Document a few which come from the unix directory.
+
+2008-11-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	PR 1340/cpukit
 	* sapi/inline/rtems/chain.inl: Add rtems_chain_initialize to public
 	chain API.
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index d2d4621e10..32a1b48f9b 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -71,9 +71,14 @@ if LIBNETWORKING
 SYSTEM_CALL_C_FILES += src/readv.c src/writev.c
 endif
 
-DIRECTORY_SCAN_C_FILES = src/opendir.c src/closedir.c src/readdir.c \
-    src/readdir_r.c src/rewinddir.c src/scandir.c src/seekdir.c \
-    src/telldir.c src/getcwd.c
+DIRECTORY_SCAN_C_FILES = 
+## 20 Nov 2008: Now using these from newlib's posix directory
+## DIRECTORY_SCAN_C_FILES = src/opendir.c src/closedir.c src/readdir.c \
+##     src/rewinddir.c src/scandir.c src/seekdir.c src/telldir.c
+## Newlib SHOULD have provided this one
+DIRECTORY_SCAN_C_FILES += src/readdir_r.c
+## Comment out when using these from newlib's unix directory
+DIRECTORY_SCAN_C_FILES += src/getcwd.c
 
 ID_C_FILES = src/getegid.c src/geteuid.c src/getgid.c src/getgroups.c \
     src/getlogin.c src/getpgrp.c src/getpid.c src/getppid.c src/getuid.c \
@@ -90,7 +95,11 @@ MALLOC_C_FILES = src/malloc_initialize.c src/calloc.c src/malloc.c \
 
 PASSWORD_GROUP_C_FILES = src/getpwent.c
 
-TERMINAL_IDENTIFICATION_C_FILES = src/ctermid.c src/isatty.c src/ttyname.c
+TERMINAL_IDENTIFICATION_C_FILES = src/ctermid.c src/isatty.c
+## 20 Nov 2008: Now using these from newlib's posix directory
+TERMINAL_IDENTIFICATION_C_FILES += src/isatty.c
+## Comment out when using these from newlib's unix directory
+TERMINAL_IDENTIFICATION_C_FILES += src/ttyname.c
 
 LIBC_GLUE_C_FILES = src/__getpid.c src/__gettod.c src/__times.c \
     src/truncate.c src/access.c src/stat.c src/lstat.c src/pathconf.c \
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index c60a6a4448..71c604a4b3 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -17,8 +17,9 @@ libposix_a_CPPFLAGS = $(AM_CPPFLAGS)
 libposix_a_SOURCES =
 
 # Some POSIX functions that are nice to always have
-libposix_a_SOURCES += src/sleep.c src/usleep.c src/nanosleep.c \
-    src/clockgettime.c src/clocksettime.c
+## 20 Nov 2008: Now using these from newlib's posix directory
+## libposix_a_SOURCES += src/sleep.c src/usleep.c 
+libposix_a_SOURCES += src/nanosleep.c src/clockgettime.c src/clocksettime.c
 
 if HAS_PTHREADS
 # include