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, 70 insertions, 86 deletions

diff --git a/c/src/exec/itron/src/Makefile.am b/c/src/exec/itron/src/Makefile.am
new file mode 100644
index 0000000000..7e5d47eee2
--- /dev/null
+++ b/c/src/exec/itron/src/Makefile.am
@@ -0,0 +1,70 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+TASK_C_FILES = task.c cre_tsk.c del_tsk.c sta_tsk.c ext_tsk.c exd_tsk.c \
+    ter_tsk.c dis_dsp.c ena_dsp.c chg_pri.c rot_rdq.c rel_wai.c get_tid.c \
+    ref_tsk.c
+
+TASKSYNC_C_FILES = sus_tsk.c rsm_tsk.c frsm_tsk.c slp_tsk.c tslp_tsk.c \
+    wup_tsk.c can_wup.c
+
+SEMAPHORE_C_FILES = itronsem.c cre_sem.c del_sem.c preq_sem.c ref_sem.c \
+    sig_sem.c twai_sem.c wai_sem.c
+
+EVENTFLAGS_C_FILES = eventflags.c
+
+MAILBOX_C_FILES = mbox.c
+
+MSGBUFFER_C_FILES = msgbuffer.c msgbuffertranslatereturncode.c \
+    cre_mbf.c del_mbf.c prcv_mbf.c psnd_mbf.c rcv_mbf.c ref_mbf.c snd_mbf.c \
+    trcv_mbf.c tsnd_mbf.c
+
+RENDEZVOUS_C_FILES = port.c
+
+INTERRUPT_C_FILES = itronintr.c
+
+VARIABLE_MEMORY_POOL_C_FILES = vmempool.c
+
+FIXED_MEMORY_POOL_C_FILES = fmempool.c
+
+TIME_C_FILES = itrontime.c
+
+CONFIGURATION_C_FILES = sysmgmt.c
+
+NETWORK_C_FILES = network.c
+
+C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \
+    $(EVENTFLAGS_C_FILES) $(MAILBOX_C_FILES) $(MSGBUFFER_C_FILES) \
+    $(RENDEZVOUS_C_FILES) $(INTERRUPT_C_FILES) \
+    $(VARIABLE_MEMORY_POOL_C_FILES) $(FIXED_MEMORY_POOL_C_FILES) \
+    $(TIME_C_FILES)
+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
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} ${OBJS}
+
+UNUSED_C_FILES = \
+cre_mbx.c del_mbx.c \
+mboxtranslatereturncode.c \
+network.c \
+prcv_mbx.c \
+rcv_mbx.c \
+ref_mbx.c \
+snd_mbx.c \
+sysmgmt.c \
+trcv_mbx.c
+
+EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/src/Makefile.in b/c/src/exec/itron/src/Makefile.in
deleted file mode 100644
index f83337774b..0000000000
--- a/c/src/exec/itron/src/Makefile.in
+++ /dev/null
@@ -1,86 +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@
-
-TASK_C_PIECES = task cre_tsk del_tsk sta_tsk ext_tsk exd_tsk ter_tsk \
-    dis_dsp ena_dsp chg_pri rot_rdq rel_wai get_tid ref_tsk
-
-TASKSYNC_C_PIECES = sus_tsk rsm_tsk frsm_tsk slp_tsk tslp_tsk wup_tsk \
-    can_wup
-
-SEMAPHORE_C_PIECES = itronsem cre_sem del_sem preq_sem ref_sem sig_sem \
-    twai_sem wai_sem
-
-EVENTFLAGS_C_PIECES = eventflags
-
-MAILBOX_C_PIECES = mbox
-
-MSGBUFFER_C_PIECES = msgbuffer msgbuffertranslatereturncode \
-    cre_mbf del_mbf prcv_mbf psnd_mbf rcv_mbf ref_mbf snd_mbf trcv_mbf \
-    tsnd_mbf
-
-RENDEZVOUS_C_PIECES = port
-
-INTERRUPT_C_PIECES = itronintr
-
-VARIABLE_MEMORY_POOL_C_PIECES = vmempool
-
-FIXED_MEMORY_POOL_C_PIECES = fmempool
-
-TIME_C_PIECES = itrontime
-
-CONFIGURATION_C_PIECES = sysmgmt
-
-NETWORK_C_PIECES = network
-
-C_PIECES = $(TASK_C_PIECES) $(TASKSYNC_C_PIECES) $(SEMAPHORE_C_PIECES) \
-    $(EVENTFLAGS_C_PIECES) $(MAILBOX_C_PIECES) $(MSGBUFFER_C_PIECES) \
-    $(RENDEZVOUS_C_PIECES) $(INTERRUPT_C_PIECES) \
-    $(VARIABLE_MEMORY_POOL_C_PIECES) $(FIXED_MEMORY_POOL_C_PIECES) \
-    $(TIME_C_PIECES)
-
-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}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status