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."

2 files changed, 79 insertions, 95 deletions

diff --git a/c/src/exec/rtems/src/Makefile.am b/c/src/exec/rtems/src/Makefile.am
new file mode 100644
index 0000000000..1752e16e4c
--- /dev/null
+++ b/c/src/exec/rtems/src/Makefile.am
@@ -0,0 +1,79 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+# We only build multiprocessing related files if HAS_MP was defined
+MP_C_FILES = eventmp.c mp.c msgmp.c partmp.c regionmp.c semmp.c signalmp.c \
+    taskmp.c
+
+TASK_C_FILES = tasks.c taskcreate.c taskdelete.c taskgetnote.c taskident.c \
+    taskinitusers.c taskissuspended.c taskmode.c taskrestart.c taskresume.c \
+    tasksetnote.c tasksetpriority.c taskstart.c tasksuspend.c \
+    taskwakeafter.c taskwakewhen.c taskvariableadd.c taskvariabledelete.c
+
+RATEMON_C_FILES = ratemon.c ratemoncancel.c ratemoncreate.c ratemondelete.c \
+    ratemongetstatus.c ratemonident.c ratemonperiod.c ratemontimeout.c
+
+INTR_C_FILES = intr.c intrbody.c intrcatch.c
+
+CLOCK_C_FILES = rtclock.c clockget.c clockset.c clocktick.c
+
+TIMER_C_FILES = rtemstimer.c timercancel.c timercreate.c timerdelete.c \
+    timerfireafter.c timerfirewhen.c timerident.c timerreset.c
+
+MESSAGE_QUEUE_C_FILES = msg.c msgqallocate.c msgqbroadcast.c msgqcreate.c \
+    msgqdelete.c msgqflush.c msgqgetnumberpending.c msgqident.c \
+    msgqreceive.c msgqsend.c msgqsubmit.c msgqtranslatereturncode.c \
+    msgqurgent.c
+
+SEMAPHORE_C_FILES = sem.c semcreate.c semdelete.c semident.c semobtain.c \
+    semrelease.c semflush.c semtranslatereturncode.c
+
+EVENT_C_FILES = event.c eventreceive.c eventseize.c eventsend.c \
+    eventsurrender.c eventtimeout.c
+
+SIGNAL_C_FILES = signal.c signalcatch.c signalsend.c
+
+REGION_C_FILES = region.c regioncreate.c regiondelete.c regionextend.c \
+    regiongetsegment.c regiongetsegmentsize.c regionident.c \
+    regionreturnsegment.c regionreturnsegment.c
+
+PARTITION_C_FILES = part.c partcreate.c partdelete.c partgetbuffer.c \
+    partident.c partreturnbuffer.c
+
+DPMEM_C_FILES = dpmem.c dpmemcreate.c dpmemdelete.c dpmemexternal2internal.c \
+    dpmemident.c dpmeminternal2external.c
+
+STD_C_FILES = attr.c $(TASK_C_FILES) $(RATEMON_C_FILES) $(INTR_C_FILES) \
+    $(CLOCK_C_FILES) $(TIMER_C_FILES) $(SEMAPHORE_C_FILES) \
+    $(MESSAGE_QUEUE_C_FILES) $(EVENT_C_FILES) $(SIGNAL_C_FILES) \
+    $(PARTITION_C_FILES) $(REGION_C_FILES) $(DPMEM_C_FILES)
+
+if HAS_MP
+C_FILES = $(STD_C_FILES) $(MP_C_FILES)
+else
+C_FILES = $(STD_C_FILES)
+endif
+
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} $(SRCS) ${OBJS}
+
+EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
deleted file mode 100644
index a8ff531bcf..0000000000
--- a/c/src/exec/rtems/src/Makefile.in
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = rtems/src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# We only build multiprocessing related files if HAS_MP was defined
-MP_C_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
-MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
-
-TASK_C_PIECES = tasks taskcreate taskdelete taskgetnote taskident \
-    taskinitusers taskissuspended taskmode taskrestart taskresume tasksetnote \
-    tasksetpriority taskstart tasksuspend taskwakeafter taskwakewhen \
-    taskvariableadd taskvariabledelete
-
-RATEMON_C_PIECES = ratemon ratemoncancel ratemoncreate ratemondelete \
-    ratemongetstatus ratemonident ratemonperiod ratemontimeout
-
-INTR_C_PIECES = intr intrbody intrcatch
-
-CLOCK_C_PIECES = rtclock clockget clockset clocktick
-
-TIMER_C_PIECES = rtemstimer timercancel timercreate timerdelete \
-    timerfireafter timerfirewhen timerident timerreset
-
-MESSAGE_QUEUE_C_PIECES = msg msgqallocate msgqbroadcast msgqcreate \
-    msgqdelete msgqflush msgqgetnumberpending msgqident msgqreceive msgqsend \
-    msgqsubmit msgqtranslatereturncode msgqurgent
-
-SEMAPHORE_C_PIECES = sem semcreate semdelete semident semobtain semrelease \
-    semflush semtranslatereturncode
-
-EVENT_C_PIECES = event eventreceive eventseize eventsend eventsurrender \
-    eventtimeout
-
-SIGNAL_C_PIECES = signal signalcatch signalsend
-
-REGION_C_PIECES = region regioncreate regiondelete regionextend \
-    regiongetsegment regiongetsegmentsize regionident regionreturnsegment \
-    regionreturnsegment
-
-PARTITION_C_PIECES = part partcreate partdelete partgetbuffer partident \
-    partreturnbuffer
-
-DPMEM_C_PIECES = dpmem dpmemcreate dpmemdelete dpmemexternal2internal \
-    dpmemident dpmeminternal2external
-
-C_PIECES = attr $(TASK_C_PIECES) $(RATEMON_C_PIECES) $(INTR_C_PIECES) \
-    $(CLOCK_C_PIECES) $(TIMER_C_PIECES) $(SEMAPHORE_C_PIECES) \
-    $(MESSAGE_QUEUE_C_PIECES) $(EVENT_C_PIECES) $(SIGNAL_C_PIECES) \
-    $(PARTITION_C_PIECES) $(REGION_C_PIECES) $(DPMEM_C_PIECES) \
-    $(MP_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES)
-OBJS = $(C_O_FILES)
-
-#
-# 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}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status