2003-07-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* ada.am: Add .adp to SUFFIXES.
	Remove c-compilation rule.
	* samples/base_sp/Makefile.am: Add init.$(OBJEXT).
	* samples/hello/Makefile.am: Add init.$(OBJEXT).
	* samples/ticker/Makefile.am: Add init.$(OBJEXT).
	* samples/ticker/Makefile.am: Remove VPATH.
	* sptests/sp01/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp01/Makefile.am: Don't include */lib.am.
	* sptests/sp01/Makefile.am: Remove VPATH.
	* sptests/sp02/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp02/Makefile.am: Don't include */lib.am.
	* sptests/sp03/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp03/Makefile.am: Don't include */lib.am.
	* sptests/sp04/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp04/Makefile.am: Don't include */lib.am.
	* sptests/sp04/Makefile.am: Remove EXPADA.
	* sptests/sp04/Makefile.am: Remove VPATH.
	* sptests/sp05/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp05/Makefile.am: Don't include */lib.am.
	* sptests/sp06/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp06/Makefile.am: Don't include */lib.am.
	* sptests/sp07/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp07/Makefile.am: Don't include */lib.am.
	* sptests/sp07/Makefile.am: Remove EXPADA.
	* sptests/sp08/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp08/Makefile.am: Don't include */lib.am.
	* sptests/sp09/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp09/Makefile.am: Don't include */lib.am.
	* sptests/sp11/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp11/Makefile.am: Don't include */lib.am.
	* sptests/sp12/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp12/Makefile.am: Don't include */lib.am.
	* sptests/sp13/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp13/Makefile.am: Don't include */lib.am.
	* sptests/sp14/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp14/Makefile.am: Don't include */lib.am.
	* sptests/sp15/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp15/Makefile.am: Don't include */lib.am.
	* sptests/sp16/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp16/Makefile.am: Don't include */lib.am.
	* sptests/sp17/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp17/Makefile.am: Don't include */lib.am.
	* sptests/sp19/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp19/Makefile.am: Don't include */lib.am.
	* sptests/sp20/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp20/Makefile.am: Don't include */lib.am.
	* sptests/sp21/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp21/Makefile.am: Don't include */lib.am.
	* sptests/sp22/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp22/Makefile.am: Don't include */lib.am.
	* sptests/sp23/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp23/Makefile.am: Don't include */lib.am.
	* sptests/sp24/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp24/Makefile.am: Don't include */lib.am.
	* sptests/sp25/Makefile.am: Add init.$(OBJEXT).
	* sptests/sp25/Makefile.am: Don't include */lib.am.
	* sptests/spsize/Makefile.am: Add init.$(OBJEXT).
	* sptests/spsize/Makefile.am: Don't include */lib.am.
	* tmtests/tm01/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm01/Makefile.am: Don't include */lib.am.
	* tmtests/tm02/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm02/Makefile.am: Don't include */lib.am.
	* tmtests/tm03/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm03/Makefile.am: Don't include */lib.am.
	* tmtests/tm04/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm04/Makefile.am: Don't include */lib.am.
	* tmtests/tm05/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm05/Makefile.am: Don't include */lib.am.
	* tmtests/tm06/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm06/Makefile.am: Don't include */lib.am.
	* tmtests/tm07/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm07/Makefile.am: Don't include */lib.am.
	* tmtests/tm08/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm08/Makefile.am: Don't include */lib.am.
	* tmtests/tm09/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm09/Makefile.am: Don't include */lib.am.
	* tmtests/tm10/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm10/Makefile.am: Don't include */lib.am.
	* tmtests/tm11/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm11/Makefile.am: Don't include */lib.am.
	* tmtests/tm12/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm12/Makefile.am: Don't include */lib.am.
	* tmtests/tm13/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm13/Makefile.am: Don't include */lib.am.
	* tmtests/tm14/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm14/Makefile.am: Don't include */lib.am.
	* tmtests/tm15/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm15/Makefile.am: Don't include */lib.am.
	* tmtests/tm16/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm16/Makefile.am: Don't include */lib.am.
	* tmtests/tm17/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm17/Makefile.am: Don't include */lib.am.
	* tmtests/tm18/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm18/Makefile.am: Don't include */lib.am.
	* tmtests/tm19/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm19/Makefile.am: Don't include */lib.am.
	* tmtests/tm20/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm20/Makefile.am: Don't include */lib.am.
	* tmtests/tm21/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm21/Makefile.am: Don't include */lib.am.
	* tmtests/tm22/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm22/Makefile.am: Don't include */lib.am.
	* tmtests/tm23/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm23/Makefile.am: Don't include */lib.am.
	* tmtests/tm24/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm24/Makefile.am: Don't include */lib.am.
	* tmtests/tm25/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm25/Makefile.am: Don't include */lib.am.
	* tmtests/tm28/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm28/Makefile.am: Don't include */lib.am.
	* tmtests/tm29/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tm29/Makefile.am: Don't include */lib.am.
	* tmtests/tmck/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tmck/Makefile.am: Don't include */lib.am.
	* tmtests/tmoverhd/Makefile.am: Add init.$(OBJEXT).
	* tmtests/tmoverhd/Makefile.am: Don't include */lib.am.

18 files changed, 161 insertions, 44 deletions

diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index a9b689e1db..b108933289 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,3 +1,122 @@
+2003-07-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* ada.am: Add .adp to SUFFIXES.
+	Remove c-compilation rule. 
+	* samples/base_sp/Makefile.am: Add init.$(OBJEXT).
+	* samples/hello/Makefile.am: Add init.$(OBJEXT).
+	* samples/ticker/Makefile.am: Add init.$(OBJEXT).
+	* samples/ticker/Makefile.am: Remove VPATH.
+	* sptests/sp01/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp01/Makefile.am: Don't include */lib.am.
+	* sptests/sp01/Makefile.am: Remove VPATH.
+	* sptests/sp02/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp02/Makefile.am: Don't include */lib.am.
+	* sptests/sp03/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp03/Makefile.am: Don't include */lib.am.
+	* sptests/sp04/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp04/Makefile.am: Don't include */lib.am.
+	* sptests/sp04/Makefile.am: Remove EXPADA.
+	* sptests/sp04/Makefile.am: Remove VPATH.
+	* sptests/sp05/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp05/Makefile.am: Don't include */lib.am.
+	* sptests/sp06/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp06/Makefile.am: Don't include */lib.am.
+	* sptests/sp07/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp07/Makefile.am: Don't include */lib.am.
+	* sptests/sp07/Makefile.am: Remove EXPADA.
+	* sptests/sp08/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp08/Makefile.am: Don't include */lib.am.
+	* sptests/sp09/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp09/Makefile.am: Don't include */lib.am.
+	* sptests/sp11/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp11/Makefile.am: Don't include */lib.am.
+	* sptests/sp12/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp12/Makefile.am: Don't include */lib.am.
+	* sptests/sp13/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp13/Makefile.am: Don't include */lib.am.
+	* sptests/sp14/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp14/Makefile.am: Don't include */lib.am.
+	* sptests/sp15/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp15/Makefile.am: Don't include */lib.am.
+	* sptests/sp16/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp16/Makefile.am: Don't include */lib.am.
+	* sptests/sp17/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp17/Makefile.am: Don't include */lib.am.
+	* sptests/sp19/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp19/Makefile.am: Don't include */lib.am.
+	* sptests/sp20/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp20/Makefile.am: Don't include */lib.am.
+	* sptests/sp21/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp21/Makefile.am: Don't include */lib.am.
+	* sptests/sp22/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp22/Makefile.am: Don't include */lib.am.
+	* sptests/sp23/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp23/Makefile.am: Don't include */lib.am.
+	* sptests/sp24/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp24/Makefile.am: Don't include */lib.am.
+	* sptests/sp25/Makefile.am: Add init.$(OBJEXT).
+	* sptests/sp25/Makefile.am: Don't include */lib.am.
+	* sptests/spsize/Makefile.am: Add init.$(OBJEXT).
+	* sptests/spsize/Makefile.am: Don't include */lib.am.
+	* tmtests/tm01/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm01/Makefile.am: Don't include */lib.am.
+	* tmtests/tm02/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm02/Makefile.am: Don't include */lib.am.
+	* tmtests/tm03/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm03/Makefile.am: Don't include */lib.am.
+	* tmtests/tm04/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm04/Makefile.am: Don't include */lib.am.
+	* tmtests/tm05/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm05/Makefile.am: Don't include */lib.am.
+	* tmtests/tm06/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm06/Makefile.am: Don't include */lib.am.
+	* tmtests/tm07/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm07/Makefile.am: Don't include */lib.am.
+	* tmtests/tm08/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm08/Makefile.am: Don't include */lib.am.
+	* tmtests/tm09/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm09/Makefile.am: Don't include */lib.am.
+	* tmtests/tm10/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm10/Makefile.am: Don't include */lib.am.
+	* tmtests/tm11/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm11/Makefile.am: Don't include */lib.am.
+	* tmtests/tm12/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm12/Makefile.am: Don't include */lib.am.
+	* tmtests/tm13/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm13/Makefile.am: Don't include */lib.am.
+	* tmtests/tm14/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm14/Makefile.am: Don't include */lib.am.
+	* tmtests/tm15/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm15/Makefile.am: Don't include */lib.am.
+	* tmtests/tm16/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm16/Makefile.am: Don't include */lib.am.
+	* tmtests/tm17/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm17/Makefile.am: Don't include */lib.am.
+	* tmtests/tm18/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm18/Makefile.am: Don't include */lib.am.
+	* tmtests/tm19/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm19/Makefile.am: Don't include */lib.am.
+	* tmtests/tm20/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm20/Makefile.am: Don't include */lib.am.
+	* tmtests/tm21/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm21/Makefile.am: Don't include */lib.am.
+	* tmtests/tm22/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm22/Makefile.am: Don't include */lib.am.
+	* tmtests/tm23/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm23/Makefile.am: Don't include */lib.am.
+	* tmtests/tm24/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm24/Makefile.am: Don't include */lib.am.
+	* tmtests/tm25/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm25/Makefile.am: Don't include */lib.am.
+	* tmtests/tm28/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm28/Makefile.am: Don't include */lib.am.
+	* tmtests/tm29/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tm29/Makefile.am: Don't include */lib.am.
+	* tmtests/tmck/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tmck/Makefile.am: Don't include */lib.am.
+	* tmtests/tmoverhd/Makefile.am: Add init.$(OBJEXT).
+	* tmtests/tmoverhd/Makefile.am: Don't include */lib.am.
+
 2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove AC_CONFIG_AUX_DIR.
diff --git a/c/src/ada-tests/ada.am b/c/src/ada-tests/ada.am
index dad226c953..072599a13e 100644
--- a/c/src/ada-tests/ada.am
+++ b/c/src/ada-tests/ada.am
@@ -1,4 +1,4 @@
-SUFFIXES = .adb .ali .ads
+SUFFIXES = .adb .ali .ads .adp
 
 GNATMAKE = @GNATMAKE@ -cargs $(GCCSPECS) -largs $(GCCSPECS)
 
@@ -15,5 +15,8 @@ $(AM_LDFLAGS) $(LDFLAGS) init.o
 
 CLEANFILES = *.ali *.o b~*.adb b~*.ads
 
-%.o: %.c
-	$(CC) $(CFLAGS) -I@srcdir@ -c $< -o $@
+#%.o: %.c
+#	$(CC) $(CFLAGS) -I@srcdir@ -c $< -o $@
+
+.adp.adb:
+	pwd=`pwd` && cd $(srcdir) && $(M4) < $*.adp > $${pwd}/$*.adb
diff --git a/c/src/ada-tests/samples/base_sp/Makefile.am b/c/src/ada-tests/samples/base_sp/Makefile.am
index 94421da9e5..a549034d3b 100644
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/c/src/ada-tests/samples/base_sp/Makefile.am
@@ -5,9 +5,12 @@ include $(top_srcdir)/../../../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-base_sp$(EXEEXT): base_sp.adb
+base_sp$(EXEEXT): base_sp.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+init.$(OBJEXT): ../../support/init.c
+	$(COMPILE.c) -I$(srcdir) -c $<
+
 noinst_PROGRAMS = base_sp
 
 base_sp_SOURCES = base_sp.adb \
diff --git a/c/src/ada-tests/samples/hello/Makefile.am b/c/src/ada-tests/samples/hello/Makefile.am
index c5ff73ead4..466c003289 100644
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/c/src/ada-tests/samples/hello/Makefile.am
@@ -5,10 +5,10 @@ include $(top_srcdir)/../../../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-hello$(EXEEXT): hello.adb init.o
+hello$(EXEEXT): hello.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.o: ../../support/init.c
+init.$(OBJEXT): ../../support/init.c
 	$(COMPILE.c) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = hello
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am
index 28617fc9c8..abd5ed4953 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -1,15 +1,16 @@
 ## $Id$
 
-VPATH = @srcdir@:@srcdir@/../../support
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
 
 include $(top_srcdir)/ada.am
 
-ticker$(EXEEXT): ticker.adb init.o
+ticker$(EXEEXT): ticker.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
+init.$(OBJEXT): ../../support/init.c
+	$(COMPILE.c) -I$(srcdir) -c $<
+
 noinst_PROGRAMS = ticker
 
 ticker_SOURCES = ticker.adb \
diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am
index a69f6a5782..19bccf6d3f 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/c/src/ada-tests/sptests/sp01/Makefile.am
@@ -1,17 +1,15 @@
 ## $Id$
 
-VPATH = @srcdir@:@srcdir@/../../support
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = sp01
 sp01_SOURCES = sp01.adb config.h sptest.adb sptest.ads
+sp01_SOURCES += ../../support/init.c
 
-sp01$(EXEEXT): sp01.adb init.o
+sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp01.scn
diff --git a/c/src/ada-tests/sptests/sp02/Makefile.am b/c/src/ada-tests/sptests/sp02/Makefile.am
index 08ed667c72..13921eede9 100644
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/c/src/ada-tests/sptests/sp02/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = sp02
 sp02_SOURCES = sp02.adb config.h sptest.adb sptest.ads
+sp02_SOURCES += ../../support/init.c
 
-sp02$(EXEEXT): sp02.adb
+sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp02.scn
diff --git a/c/src/ada-tests/sptests/sp03/Makefile.am b/c/src/ada-tests/sptests/sp03/Makefile.am
index 158e95f125..92a8a6f7fd 100644
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/c/src/ada-tests/sptests/sp03/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = sp03
 sp03_SOURCES = sp03.adb config.h sptest.adb sptest.ads
+sp03_SOURCES += ../../support/init.c
 
-sp03$(EXEEXT): sp03.adb
+sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp03.scn
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/c/src/ada-tests/sptests/sp04/Makefile.am
index 5eef5f6aa0..ac978ec851 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/c/src/ada-tests/sptests/sp04/Makefile.am
@@ -1,20 +1,15 @@
 ## $Id$
 
-VPATH = @srcdir@:@srcdir@/../../support
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
-if EXPADA
 noinst_PROGRAMS = sp04
-endif
-
 sp04_SOURCES = sp04.adb config.h sptest.adb sptest.ads
+sp04_SOURCES += ../../support/init.c
 
-sp04$(EXEEXT): sp04.adb init.o
+sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp04.scn
diff --git a/c/src/ada-tests/sptests/sp05/Makefile.am b/c/src/ada-tests/sptests/sp05/Makefile.am
index 1b08936a5a..4c46530fc0 100644
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/c/src/ada-tests/sptests/sp05/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = sp05
 sp05_SOURCES = sp05.adb config.h sptest.adb sptest.ads
+sp05_SOURCES += ../../support/init.c
 
-sp05$(EXEEXT): sp05.adb
+sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp05.scn
diff --git a/c/src/ada-tests/sptests/sp06/Makefile.am b/c/src/ada-tests/sptests/sp06/Makefile.am
index 965d3c89a2..844431e4fc 100644
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/c/src/ada-tests/sptests/sp06/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = sp06
 sp06_SOURCES = sp06.adb config.h sptest.adb sptest.ads
+sp06_SOURCES += ../../support/init.c
 
-sp06$(EXEEXT): sp06.adb
+sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp06.scn
diff --git a/c/src/ada-tests/sptests/sp07/Makefile.am b/c/src/ada-tests/sptests/sp07/Makefile.am
index 86fb541d1b..dfe303b3d6 100644
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/c/src/ada-tests/sptests/sp07/Makefile.am
@@ -2,17 +2,15 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
-if EXPADA
 noinst_PROGRAMS = sp07
-endif
 
 sp07_SOURCES = sp07.adb config.h sptest.adb sptest.ads
+sp07_SOURCES += ../../support/init.c
 
-sp07$(EXEEXT): sp07.adb
+sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp07.scn
diff --git a/c/src/ada-tests/sptests/sp08/Makefile.am b/c/src/ada-tests/sptests/sp08/Makefile.am
index ba19779343..400120de0e 100644
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/c/src/ada-tests/sptests/sp08/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = sp08
 sp08_SOURCES = sp08.adb config.h sptest.adb sptest.ads
+sp08_SOURCES += ../../support/init.c
 
-sp08$(EXEEXT): sp08.adb
+sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 EXTRA_DIST = sp08.scn
diff --git a/c/src/ada-tests/tmtests/tm01/Makefile.am b/c/src/ada-tests/tmtests/tm01/Makefile.am
index a593cf04e2..b495252810 100644
--- a/c/src/ada-tests/tmtests/tm01/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm01/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = tm01
 tm01_SOURCES = tm01.adb config.h tmtest.adb tmtest.ads
+tm01_SOURCES += ../../support/init.c
 
-tm01$(EXEEXT): tm01.adb
+tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm02/Makefile.am b/c/src/ada-tests/tmtests/tm02/Makefile.am
index bf3859db27..4b7b47d621 100644
--- a/c/src/ada-tests/tmtests/tm02/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm02/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = tm02
 tm02_SOURCES = tm02.adb config.h tmtest.adb tmtest.ads
+tm02_SOURCES += ../../support/init.c
 
-tm02$(EXEEXT): tm02.adb
+tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm03/Makefile.am b/c/src/ada-tests/tmtests/tm03/Makefile.am
index 67a5af27c0..7f5a9ed6a2 100644
--- a/c/src/ada-tests/tmtests/tm03/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm03/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = tm03
 tm03_SOURCES = tm03.adb config.h tmtest.adb tmtest.ads
+tm03_SOURCES += ../../support/init.c
 
-tm03$(EXEEXT): tm03.adb
+tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm04/Makefile.am b/c/src/ada-tests/tmtests/tm04/Makefile.am
index 25dd4ff025..9fc61175aa 100644
--- a/c/src/ada-tests/tmtests/tm04/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm04/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = tm04
 tm04_SOURCES = tm04.adb config.h tmtest.adb tmtest.ads
+tm04_SOURCES += ../../support/init.c
 
-tm04$(EXEEXT): tm04.adb
+tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/ada-tests/tmtests/tm21/Makefile.am b/c/src/ada-tests/tmtests/tm21/Makefile.am
index 7ac2eb8acc..fd898e1b9a 100644
--- a/c/src/ada-tests/tmtests/tm21/Makefile.am
+++ b/c/src/ada-tests/tmtests/tm21/Makefile.am
@@ -2,14 +2,14 @@
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
 
 include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = tm21
 tm21_SOURCES = tm21.adb config.h tmtest.adb tmtest.ads
+tm21_SOURCES += ../../support/init.c
 
-tm21$(EXEEXT): tm21.adb
+tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 include $(top_srcdir)/../../../automake/local.am