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

to convert the psxtests directory from Makefile.in to Makefile.am.

2 files changed, 42 insertions, 71 deletions

diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.am b/c/src/tests/psxtests/psxhdrs/Makefile.am
new file mode 100644
index 0000000000..79fc781465
--- /dev/null
+++ b/c/src/tests/psxtests/psxhdrs/Makefile.am
@@ -0,0 +1,42 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+# C source names
+UNUSED_C_FILES = clock06.c
+
+C_FILES = clock01.c clock02.c clock03.c clock04.c clock05.c cond01.c \
+    cond02.c cond03.c cond04.c cond05.c cond06.c cond07.c cond08.c cond09.c \
+    cond10.c key01.c key02.c key03.c key04.c mutex01.c mutex02.c mutex03.c \
+    mutex04.c mutex05.c mutex06.c mutex07.c mutex08.c mutex09.c mutex10.c \
+    mutex11.c mutex12.c mutex13.c mutex14.c mutex15.c mutex16.c pthread01.c \
+    pthread02.c pthread03.c pthread04.c pthread05.c pthread06.c pthread07.c \
+    pthread08.c pthread09.c pthread10.c pthread11.c pthread12.c pthread13.c \
+    pthread14.c pthread15.c pthread16.c pthread17.c pthread18.c pthread19.c \
+    pthread20.c pthread21.c pthread22.c pthread23.c pthread24.c pthread25.c \
+    pthread26.c pthread27.c pthread28.c pthread29.c pthread30.c pthread31.c \
+    pthread32.c pthread33.c pthread34.c pthread35.c pthread36.c proc01.c \
+    proc02.c proc03.c proc04.c proc05.c proc06.c proc07.c proc08.c proc09.c \
+    proc10.c proc11.c proc12.c proc13.c proc14.c sched01.c sched02.c \
+    sched03.c sched04.c sched05.c sched06.c sched07.c sched08.c signal01.c \
+    signal02.c signal03.c signal04.c signal05.c signal06.c signal07.c \
+    signal08.c signal09.c signal10.c signal11.c signal12.c signal13.c \
+    signal14.c signal15.c signal16.c signal17.c signal18.c signal19.c \
+    signal20.c signal21.c signal22.c time01.c time02.c time03.c time04.c \
+    time05.c time06.c time07.c time08.c time09.c time10.c time11.c time12.c \
+    time13.c timer01.c timer02.c timer03.c timer04.c timer05.c timer06.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 $(RTEMS_ROOT)/make/leaf.cfg
+
+all-local: ${ARCH} ${OBJS}
+
+EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.in b/c/src/tests/psxtests/psxhdrs/Makefile.in
deleted file mode 100644
index 0a1bbd3bcf..0000000000
--- a/c/src/tests/psxtests/psxhdrs/Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = psxhdrs
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the
-C_PIECES = clock01 clock02 clock03 clock04 clock05 cond01 cond02 cond03 \
-    cond04 cond05 cond06 cond07 cond08 cond09 cond10 key01 key02 key03 key04 \
-    mutex01 mutex02 mutex03 mutex04 mutex05 mutex06 mutex07 mutex08 mutex09 \
-    mutex10 mutex11 mutex12 mutex13 mutex14 mutex15 mutex16 pthread01 \
-    pthread02 pthread03 pthread04 pthread05 pthread06 pthread07 pthread08 \
-    pthread09 pthread10 pthread11 pthread12 pthread13 pthread14 pthread15 \
-    pthread16 pthread17 pthread18 pthread19 pthread20 pthread21 pthread22 \
-    pthread23 pthread24 pthread25 pthread26 pthread27 pthread28 pthread29 \
-    pthread30 pthread31 pthread32 pthread33 pthread34 pthread35 pthread36 \
-    proc01 proc02 proc03 proc04 proc05 proc06 proc07 proc08 proc09 proc10 \
-    proc11 proc12 proc13 proc14 sched01 sched02 sched03 sched04 sched05 \
-    sched06 sched07 sched08 signal01 signal02 signal03 signal04 signal05 \
-    signal06 signal07 signal08 signal09 signal10 signal11 signal12 signal13 \
-    signal14 signal15 signal16 signal17 signal18 signal19 signal20 signal21 \
-    signal22 time01 time02 time03 time04 time05 time06 time07 time08 time09 \
-    time10 time11 time12 time13 timer01 timer02 timer03 timer04 timer05 \
-    timer06
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
-
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_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 +=
-CPPFLAGS +=
-CFLAGS +=
-
-#
-# 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 += $(LIB)
-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