2006-01-18 Ralf Corsépius <ralf.corsepius@rtems.org>

	* posix/include/intr.h, posix/include/rtems/posix/intr.h
	posix/include/rtems/posix/threadsup.h,
	posix/inline/rtems/posix/intr.inl.
	posix/macros/rtems/posix/intr.inl, posix/src/intr.c:
	Remove (Unused, dead).
	* posix/Makefile.am: Reflect changes above. Rework.

2 files changed, 38 insertions, 40 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index b9b4d0a1fb..44eac5ea79 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,14 @@
 2006-01-18	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* posix/include/intr.h, posix/include/rtems/posix/intr.h
+	posix/include/rtems/posix/threadsup.h,
+	posix/inline/rtems/posix/intr.inl.
+	posix/macros/rtems/posix/intr.inl, posix/src/intr.c:
+	Remove (Unused, dead).
+	* posix/Makefile.am: Reflect changes above. Rework.
+
+2006-01-18	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* posix/Makefile.am: Build devctl.
 
 2006-01-16	Ralf Corsépius <ralf.corsepius@rtems.org>
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 2a5ed62cc2..aee56f641e 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -11,8 +11,6 @@ if HAS_POSIX
 
 # include
 
-noinst_HEADERS = include/intr.h
-
 include_HEADERS = include/sched.h include/aio.h include/mqueue.h \
     include/semaphore.h include/devctl.h
 
@@ -35,53 +33,53 @@ include_rtems_posix_HEADERS += include/rtems/posix/condmp.h \
     include/rtems/posix/pthreadmp.h include/rtems/posix/semaphoremp.h
 endif
 
-noinst_HEADERS += include/rtems/posix/intr.h \
-    include/rtems/posix/threadsup.h
-
 if INLINE
 include_rtems_posix_HEADERS += inline/rtems/posix/cond.inl \
     inline/rtems/posix/key.inl inline/rtems/posix/mqueue.inl \
     inline/rtems/posix/mutex.inl inline/rtems/posix/pthread.inl \
     inline/rtems/posix/priority.inl inline/rtems/posix/semaphore.inl \
     inline/rtems/posix/timer.inl
-noinst_HEADERS += inline/rtems/posix/intr.inl
 else
 include_rtems_posix_HEADERS += macros/rtems/posix/cond.inl \
     macros/rtems/posix/key.inl macros/rtems/posix/mqueue.inl \
     macros/rtems/posix/mutex.inl macros/rtems/posix/pthread.inl \
     macros/rtems/posix/priority.inl macros/rtems/posix/semaphore.inl \
     macros/rtems/posix/timer.inl
-noinst_HEADERS += macros/rtems/posix/intr.inl
 endif
 
 ## src
 
-# following are semi-implemented and untested
-UNUSED_C_FILES = src/intr.c
-
 # These are really in the stand but not really functional
-BUILD_FOR_NOW_C_FILES = src/aio.c src/devctl.c
+## BUILD_FOR_NOW_C_FILES
+libposix_a_SOURCES = src/aio.c src/devctl.c
 
-ENOSYS_C_FILES = src/execl.c src/execle.c src/execlp.c src/execv.c \
+## ENOSYS_C_FILES
+libposix_a_SOURCES += src/execl.c src/execle.c src/execlp.c src/execv.c \
     src/execve.c src/execvp.c src/fork.c src/pthreadatfork.c src/wait.c \
     src/waitpid.c
 
-CANCEL_C_FILES = src/cancel.c src/cancelrun.c src/cleanuppop.c \
+## CANCEL_C_FILES
+libposix_a_SOURCES += src/cancel.c src/cancelrun.c src/cleanuppop.c \
     src/cleanuppush.c src/setcancelstate.c src/setcanceltype.c \
     src/testcancel.c
 
-CONDITION_VARIABLE_C_FILES = src/cond.c src/condattrdestroy.c \
+## CONDITION_VARIABLE_C_FILES
+libposix_a_SOURCES += src/cond.c src/condattrdestroy.c \
     src/condattrgetpshared.c src/condattrinit.c src/condattrsetpshared.c \
     src/condbroadcast.c src/conddefaultattributes.c src/conddestroy.c \
     src/condinit.c src/condmp.c src/condsignal.c src/condsignalsupp.c \
     src/condtimedwait.c src/condwait.c src/condwaitsupp.c
 
-KEY_C_FILES = src/key.c src/keycreate.c src/keydelete.c src/keygetspecific.c \
+## KEY_C_FILES
+libposix_a_SOURCES += src/key.c src/keycreate.c src/keydelete.c \
+    src/keygetspecific.c \
     src/keyrundestructors.c src/keysetspecific.c
 
-MEMORY_C_FILES = src/getpagesize.c src/mprotect.c
+## MEMORY_C_FILES
+libposix_a_SOURCES += src/getpagesize.c src/mprotect.c
 
-MESSAGE_QUEUE_C_FILES = src/mqueue.c src/mqueueclose.c \
+## MESSAGE_QUEUE_C_FILES
+libposix_a_SOURCES += src/mqueue.c src/mqueueclose.c \
     src/mqueuecreatesupp.c src/mqueuedeletesupp.c src/mqueuegetattr.c \
     src/mqueuenametoid.c src/mqueuenotify.c src/mqueueopen.c \
     src/mqueuereceive.c src/mqueuerecvsupp.c src/mqueuesend.c \
@@ -89,7 +87,8 @@ MESSAGE_QUEUE_C_FILES = src/mqueue.c src/mqueueclose.c \
     src/mqueuetimedsend.c src/mqueuetranslatereturncode.c \
     src/mqueueunlink.c
 
-MUTEX_C_FILES = src/mutex.c src/mutexattrdestroy.c \
+## MUTEX_C_FILES
+libposix_a_SOURCES += src/mutex.c src/mutexattrdestroy.c \
     src/mutexattrgetprioceiling.c src/mutexattrgetprotocol.c \
     src/mutexattrgetpshared.c src/mutexattrinit.c \
     src/mutexattrsetprioceiling.c src/mutexattrsetprotocol.c \
@@ -99,7 +98,8 @@ MUTEX_C_FILES = src/mutex.c src/mutexattrdestroy.c \
     src/mutexsetprioceiling.c src/mutextimedlock.c src/mutextrylock.c \
     src/mutexunlock.c
 
-PTHREAD_C_FILES = src/pthread.c src/pthreadsetcputime.c \
+## PTHREAD_C_FILES
+libposix_a_SOURCES += src/pthread.c src/pthreadsetcputime.c \
     src/pthreadgetcputime.c src/pthreadgetcpuclockid.c src/pthreadonce.c \
     src/pthreadequal.c src/pthreadself.c src/pthreadexit.c \
     src/pthreaddetach.c src/pthreadjoin.c src/pthreadcreate.c \
@@ -113,7 +113,8 @@ PTHREAD_C_FILES = src/pthread.c src/pthreadsetcputime.c \
     src/pthreadattrgetinheritsched.c src/pthreadattrsetinheritsched.c \
     src/pthreadattrgetscope.c src/pthreadattrsetscope.c
 
-PSIGNAL_C_FILES = src/psignal.c src/alarm.c src/kill.c src/killinfo.c \
+## PSIGNAL_C_FILES
+libposix_a_SOURCES += src/psignal.c src/alarm.c src/kill.c src/killinfo.c \
     src/pause.c src/psignalclearprocesssignals.c \
     src/psignalsetprocesssignals.c src/psignalchecksignal.c \
     src/psignalclearsignals.c src/psignalunblockthread.c src/pthreadkill.c \
@@ -122,13 +123,15 @@ PSIGNAL_C_FILES = src/psignal.c src/alarm.c src/kill.c src/killinfo.c \
     src/sigprocmask.c src/sigqueue.c src/sigsuspend.c src/sigtimedwait.c \
     src/sigwait.c src/sigwaitinfo.c src/signal_2.c src/ualarm.c
 
-SEMAPHORE_C_FILES = src/semaphore.c src/semaphorecreatesupp.c \
+## SEMAPHORE_C_FILES
+libposix_a_SOURCES += src/semaphore.c src/semaphorecreatesupp.c \
     src/semaphoredeletesupp.c src/semaphoremp.c src/semaphorenametoid.c \
     src/semaphorewaitsupp.c src/semclose.c src/semdestroy.c \
     src/semgetvalue.c src/seminit.c src/semopen.c src/sempost.c \
     src/semtimedwait.c src/semtrywait.c src/semunlink.c src/semwait.c
 
-TIME_C_FILES = src/adjtime.c src/time.c src/posixtimespecsubtract.c \
+## TIME_C_FILES
+libposix_a_SOURCES += src/adjtime.c src/time.c src/posixtimespecsubtract.c \
     src/posixtimespectointerval.c src/posixintervaltotimespec.c \
     src/clockgetcpuclockid.c src/clockgetenableattr.c src/clockgetres.c \
     src/clockgettime.c src/clocksetenableattr.c src/clocksettime.c \
@@ -136,33 +139,19 @@ TIME_C_FILES = src/adjtime.c src/time.c src/posixtimespecsubtract.c \
 
 # the timer manager needs to be split further but only after its
 # dependence on the Classic API Timer Manager is removed.
-TIMER_C_FILES = src/ptimer.c src/ptimer1.c
+## TIMER_C_FILES
+libposix_a_SOURCES += src/ptimer.c src/ptimer1.c
 
 EXTRA_DIST += src/README.mqueue
 
-C_FILES = src/adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \
-    $(KEY_C_FILES) $(MEMORY_C_FILES) $(MESSAGE_QUEUE_C_FILES) \
-    $(MUTEX_C_FILES) $(PTHREAD_C_FILES) $(PSIGNAL_C_FILES) src/sched.c \
-    $(SEMAPHORE_C_FILES) src/sysconf.c $(TIME_C_FILES) $(TIMER_C_FILES) \
-    src/types.c $(ENOSYS_C_FILES) $(BUILD_FOR_NOW_C_FILES)
+libposix_a_SOURCES += src/adasupp.c src/sched.c \
+    src/sysconf.c src/types.c
 
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
 noinst_LIBRARIES = libposix.a
-libposix_a_SOURCES = $(C_FILES)
 libposix_a_CPPFLAGS = $(AM_CPPFLAGS)
 endif
 
-# temporary so we can see how many things are left to implement
-not:
-	grep -i NOT_IMPL $(C_FILES:%=$(srcdir)/%) | grep -v MP_NOT_IMPL
-	@echo
-	@echo
-	@echo
-	@echo `grep -i NOT_IMPL $(C_FILES:%=$(srcdir)/%) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented
-	@echo `wc -l $(C_FILES:%=$(srcdir)/%) | grep total` lines of C code to test
-
-EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES)
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/automake/local.am