Patch rtems-rc-19991117-11.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

to convert the libc directory to automake and "dozens of
small fixes for Makefile.ins/configure.ins below c/src/lib."

8 files changed, 148 insertions, 201 deletions

diff --git a/c/src/exec/posix/Makefile.am b/c/src/exec/posix/Makefile.am
index 6de0e0c27e..81d6737629 100644
--- a/c/src/exec/posix/Makefile.am
+++ b/c/src/exec/posix/Makefile.am
@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-SUBDIRS = include inline macros src
+SUBDIRS = include inline macros src optman
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am
index 01adb60973..4abe5df1ee 100644
--- a/c/src/exec/posix/include/Makefile.am
+++ b/c/src/exec/posix/include/Makefile.am
@@ -5,7 +5,8 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 ## RTEMS unistd.h needs to be checked against newlib's and removed
-#noinst_HEADERS= devctl.h intr.h
+UNUSED_H_FILES = devctl.h intr.h unistd.h
+
 H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
 
 noinst_HEADERS = $(H_FILES)
@@ -25,7 +26,7 @@ profile-am: $(PREINSTALL_FILES)
 
 SUBDIRS = rtems sys
 
-EXTRA_DIST = intr.h devctl.h
+EXTRA_DIST = $(UNUSED_H_FILES)
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.am b/c/src/exec/posix/include/rtems/posix/Makefile.am
index 59bf3c281d..96b9bad59b 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/include/rtems/posix/Makefile.am
@@ -4,17 +4,21 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-if HAS_MP
-## We only build multiprocessing related files if HAS_MP was defined
 MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
-endif
 
-H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
+STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
     priority.h psignal.h pthread.h ptimer.h semaphore.h seterr.h threadsup.h \
     time.h timer.h $(MP_H_FILES)
-#H_FILES= intr.h threadsup.h time.h
 
-noinst_HEADERS = $(H_FILES)
+UNUSED_H_FILES= intr.h threadsup.h
+
+if HAS_MP
+H_FILES = $(STD_H_FILES) $(MP_H_FILES)
+else
+H_FILES = $(STD_H_FILES)
+endif
+
+noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
 
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rtems/posix \
@@ -29,4 +33,6 @@ all-am: $(PREINSTALL_FILES)
 debug-am: $(PREINSTALL_FILES)
 profile-am: $(PREINSTALL_FILES)
 
+EXTRA_DIST = $(UNUSED_H_FILES)
+
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am
index be7b9cf367..89b3c87d3b 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/inline/rtems/posix/Makefile.am
@@ -3,13 +3,13 @@
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
-if INLINE
 #I_FILES= intr.inl
 I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
    semaphore.inl
 
 noinst_HEADERS = $(I_FILES)
 
+if INLINE
 PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rtems/posix \
 $(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
diff --git a/c/src/exec/posix/optman/Makefile.am b/c/src/exec/posix/optman/Makefile.am
new file mode 100644
index 0000000000..99da45f754
--- /dev/null
+++ b/c/src/exec/posix/optman/Makefile.am
@@ -0,0 +1,22 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES =
+H_FILES =
+
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/optman/Makefile.in b/c/src/exec/posix/optman/Makefile.in
deleted file mode 100644
index 99c6e49fcc..0000000000
--- a/c/src/exec/posix/optman/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = optman
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-C_FILES =
-
-H_FILES =
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) $(OBJS) $(PGMS)
-	#$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/src/Makefile.am b/c/src/exec/posix/src/Makefile.am
new file mode 100644
index 0000000000..06509bd125
--- /dev/null
+++ b/c/src/exec/posix/src/Makefile.am
@@ -0,0 +1,109 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+# following are semi-implemented and untested
+UNUSED_C_FILES = devctl.c intr.c
+
+# These are really in the stand but not really functional
+BUILD_FOR_NOW_C_FILES = aio.c
+
+ENOSYS_C_FILES = execl.c execle.c execlp.c execv.c execve.c execvp.c fork.c \
+    pthreadatfork.c wait.c waitpid.c
+
+CANCEL_C_FILES = cancel.c cancelrun.c cleanuppop.c cleanuppush.c \
+    setcancelstate.c setcanceltype.c testcancel.c
+
+CONDITION_VARIABLE_C_FILES = cond.c condattrdestroy.c condattrgetpshared.c \
+    condattrinit.c condattrsetpshared.c condbroadcast.c \
+    conddefaultattributes.c conddestroy.c condinit.c condmp.c condsignal.c \
+    condsignalsupp.c condtimedwait.c condwait.c condwaitsupp.c
+
+ID_C_FILES = getegid.c geteuid.c getgid.c getgroups.c getlogin.c getpgrp.c \
+    getpid.c getppid.c getuid.c setpgid.c setsid.c
+
+KEY_C_FILES = key.c keycreate.c keydelete.c keygetspecific.c \
+    keyrundestructors.c keysetspecific.c
+
+MESSAGE_QUEUE_C_FILES = mqueue.c mqueueclose.c mqueuecreatesupp.c \
+    mqueuedeletesupp.c mqueuegetattr.c mqueuenametoid.c mqueuenotify.c \
+    mqueueopen.c mqueuereceive.c mqueuerecvsupp.c mqueuesend.c \
+    mqueuesendsupp.c mqueuesetattr.c mqueuetimedreceive.c mqueuetimedsend.c \
+    mqueueunlink.c
+MUTEX_C_FILES = mutex.c mutexattrdestroy.c mutexattrgetprioceiling.c \
+    mutexattrgetprotocol.c mutexattrgetpshared.c mutexattrinit.c \
+    mutexattrsetprioceiling.c mutexattrsetprotocol.c mutexattrsetpshared.c \
+    mutexdefaultattributes.c mutexdestroy.c mutexfromcorestatus.c \
+    mutexgetprioceiling.c mutexinit.c mutexlock.c mutexlocksupp.c mutexmp.c \
+    mutexsetprioceiling.c mutextimedlock.c mutextrylock.c mutexunlock.c
+
+PTHREAD_C_FILES = pthread.c pthreadsetcputime.c pthreadgetcputime.c \
+    pthreadgetcpuclockid.c pthreadonce.c pthreadequal.c pthreadself.c \
+    pthreadexit.c pthreaddetach.c pthreadjoin.c pthreadcreate.c \
+    pthreadattrsetdetachstate.c pthreadattrgetdetachstate.c \
+    pthreadattrgetstackaddr.c pthreadattrsetstackaddr.c \
+    pthreadattrgetstacksize.c pthreadattrsetstacksize.c pthreadattrinit.c \
+    pthreadattrdestroy.c pthreadsetschedparam.c pthreadgetschedparam.c \
+    pthreadattrsetschedparam.c pthreadattrgetschedparam.c \
+    pthreadattrgetschedpolicy.c pthreadattrsetschedpolicy.c \
+    pthreadattrgetinheritsched.c pthreadattrsetinheritsched.c \
+    pthreadattrgetscope.c pthreadattrsetscope.c
+
+PSIGNAL_C_FILES = psignal.c alarm.c kill.c killinfo.c pause.c \
+    psignalclearprocesssignals.c psignalsetprocesssignals.c \
+    psignalchecksignal.c psignalclearsignals.c psignalunblockthread.c \
+    pthreadkill.c pthreadsigmask.c sigaction.c sigaddset.c sigdelset.c \
+    sigemptyset.c sigfillset.c sigismember.c sigpending.c sigprocmask.c \
+    sigqueue.c sigsuspend.c sigtimedwait.c sigwait.c sigwaitinfo.c \
+    signal_2.c
+
+SEMAPHORE_C_FILES = semaphore.c semaphorecreatesupp.c semaphoredeletesupp.c \
+    semaphoremp.c semaphorenametoid.c semaphorewaitsupp.c semclose.c \
+    semdestroy.c semgetvalue.c seminit.c semopen.c sempost.c semtimedwait.c \
+    semtrywait.c semunlink.c semwait.c
+
+TIME_C_FILES = time.c posixtimespecsubtract.c posixtimespectointerval.c \
+    posixintervaltotimespec.c clockgetcpuclockid.c clockgetenableattr.c \
+    clockgetres.c clockgettime.c clocksetenableattr.c clocksettime.c \
+    nanosleep.c sleep.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 = ptimer.c ptimer1.c
+
+C_FILES = adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \
+    $(ID_C_FILES) $(KEY_C_FILES) $(MESSAGE_QUEUE_C_FILES) $(MUTEX_C_FILES) \
+    $(PTHREAD_C_FILES) $(PSIGNAL_C_FILES) sched.c $(SEMAPHORE_C_FILES) \
+    sysconf.c $(TIME_C_FILES) $(TIMER_C_FILES) types.c $(ENOSYS_C_FILES) \
+    $(BUILD_FOR_NOW_C_FILES) utsname.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} $(SRCS) ${OBJS}
+
+# temporary so we can see how many things are left to implement
+not: 
+	grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL
+	@echo
+	@echo
+	@echo
+	@echo `grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented
+	@echo `wc -l $(C_FILES) | grep total` lines of C code to test
+
+EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/src/Makefile.in b/c/src/exec/posix/src/Makefile.in
deleted file mode 100644
index f6898b8be2..0000000000
--- a/c/src/exec/posix/src/Makefile.in
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# following are semi-implemented and untested
-# C_PIECES=aio cancel devctl intr utsname
-
-# These are really in the stand but not really functional
-BUILD_FOR_NOW_C_PIECES = aio
-
-ENOSYS_C_PIECES = execl execle execlp execv execve execvp fork pthreadatfork \
-    wait waitpid
-
-CANCEL_C_PIECES= cancel cancelrun cleanuppop cleanuppush setcancelstate \
-    setcanceltype testcancel
-
-CONDITION_VARIABLE_C_PIECES= cond condattrdestroy condattrgetpshared \
-    condattrinit condattrsetpshared condbroadcast conddefaultattributes \
-    conddestroy condinit condmp condsignal condsignalsupp condtimedwait \
-    condwait condwaitsupp
-
-ID_C_PIECES= getegid geteuid getgid getgroups getlogin getpgrp getpid getppid \
-    getuid setpgid setsid
-
-KEY_C_PIECES= key keycreate keydelete keygetspecific keyrundestructors \
-    keysetspecific
-
-MESSAGE_QUEUE_C_PIECES= mqueue mqueueclose mqueuecreatesupp mqueuedeletesupp \
-    mqueuegetattr mqueuenametoid mqueuenotify mqueueopen mqueuereceive \
-    mqueuerecvsupp mqueuesend mqueuesendsupp mqueuesetattr \
-    mqueuetimedreceive mqueuetimedsend mqueueunlink \
-
-MUTEX_C_PIECES= mutex mutexattrdestroy mutexattrgetprioceiling \
-    mutexattrgetprotocol mutexattrgetpshared mutexattrinit \
-    mutexattrsetprioceiling mutexattrsetprotocol mutexattrsetpshared \
-    mutexdefaultattributes mutexdestroy mutexfromcorestatus \
-    mutexgetprioceiling mutexinit mutexlock mutexlocksupp mutexmp \
-    mutexsetprioceiling mutextimedlock mutextrylock mutexunlock
-
-PTHREAD_C_PIECES = pthread pthreadsetcputime pthreadgetcputime \
-    pthreadgetcpuclockid pthreadonce pthreadequal pthreadself pthreadexit \
-    pthreaddetach pthreadjoin pthreadcreate pthreadattrsetdetachstate \
-    pthreadattrgetdetachstate pthreadattrgetstackaddr \
-    pthreadattrsetstackaddr pthreadattrgetstacksize pthreadattrsetstacksize \
-    pthreadattrinit pthreadattrdestroy pthreadsetschedparam \
-    pthreadgetschedparam pthreadattrsetschedparam pthreadattrgetschedparam \
-    pthreadattrgetschedpolicy pthreadattrsetschedpolicy \
-    pthreadattrgetinheritsched pthreadattrsetinheritsched \
-    pthreadattrgetscope pthreadattrsetscope
-
-PSIGNAL_C_PIECES = psignal alarm kill killinfo pause \
-    psignalclearprocesssignals psignalsetprocesssignals \
-    psignalchecksignal psignalclearsignals \
-    psignalunblockthread pthreadkill \
-    pthreadsigmask sigaction sigaddset sigdelset sigemptyset sigfillset \
-    sigismember sigpending sigprocmask sigqueue sigsuspend sigtimedwait \
-    sigwait sigwaitinfo signal_2
-
-SEMAPHORE_C_PIECES= semaphore semaphorecreatesupp semaphoredeletesupp \
-    semaphoremp semaphorenametoid semaphorewaitsupp semclose semdestroy \
-    semgetvalue seminit semopen sempost semtimedwait semtrywait \
-    semunlink semwait
-
-TIME_C_PIECES= time posixtimespecsubtract posixtimespectointerval \
-    posixintervaltotimespec clockgetcpuclockid clockgetenableattr \
-    clockgetres clockgettime clocksetenableattr clocksettime nanosleep \
-    sleep
-
-# the timer manager needs to be split further but only after its
-# dependence on the Classic API Timer Manager is removed.
-TIMER_C_PIECES=ptimer ptimer1
-
-C_PIECES = adasupp $(CANCEL_C_PIECES) $(CONDITION_VARIABLE_C_PIECES) \
-    $(ID_C_PIECES) $(KEY_C_PIECES) $(MESSAGE_QUEUE_C_PIECES) \
-    $(MUTEX_C_PIECES) $(PTHREAD_C_PIECES) \
-    $(PSIGNAL_C_PIECES) sched $(SEMAPHORE_C_PIECES) sysconf \
-    $(TIME_C_PIECES) $(TIMER_C_PIECES) types $(ENOSYS_C_PIECES) \
-    $(BUILD_FOR_NOW_C_PIECES) utsname
-
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__RTEMS_INSIDE__
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) ${OBJS}
-
-# temporary so we can see how many things are left to implement
-not: 
-	grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL
-	@echo
-	@echo
-	@echo
-	@echo `grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented
-	@echo `wc -l $(C_FILES) | grep total` lines of C code to test
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status