9 files changed, 11 insertions, 13 deletions
diff --git a/testsuites/ada/ada.am b/testsuites/ada/ada.am
index 17084fb753..33d0c3ae2f 100644
--- a/testsuites/ada/ada.am
+++ b/testsuites/ada/ada.am
@@ -2,18 +2,14 @@ SUFFIXES = .adb .ali .ads .adp
 
 GNATMAKE = @GNATMAKE@
 
-AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \
--I$(PROJECT_ROOT)/@RTEMS_BSP@/lib/include/adainclude \
+AM_ADAFLAGS = -I$(RTEMS_SOURCE_ROOT)/cpukit/include/adainclude \
 -I$(top_srcdir)/support
 
 GNATCOMPILE = $(GNATMAKE) \
 -bargs -Mgnat_main \
 -margs $(AM_ADAFLAGS) $(ADAFLAGS) \
 -cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-    $(GCCSPECS) \
--largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-    $(GCCSPECS) \
-$(AM_LDFLAGS) $(LDFLAGS) init.o
+-largs $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) init.o
 
 CLEANFILES += *.ali *.o b~*.adb b~*.ads
 
diff --git a/testsuites/ada/configure.ac b/testsuites/ada/configure.ac
index a9293842b9..4ec8532ada 100644
--- a/testsuites/ada/configure.ac
+++ b/testsuites/ada/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
 AC_INIT([rtems-ada-tests],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([support])
 RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
 
 RTEMS_CANONICAL_TARGET_CPU
 
diff --git a/testsuites/ada/samples/base_mp/node1/Makefile.am b/testsuites/ada/samples/base_mp/node1/Makefile.am
index c6ec8cd42b..f9e45cfde3 100644
--- a/testsuites/ada/samples/base_mp/node1/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node1/Makefile.am
@@ -14,7 +14,7 @@ ada_base_mp_node1$(EXEEXT): ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.o: ../../../support/init.c
-	$(COMPILE.c) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=1 -I$(srcdir)/.. -c $<
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node1.scn
diff --git a/testsuites/ada/samples/base_mp/node2/Makefile.am b/testsuites/ada/samples/base_mp/node2/Makefile.am
index 9095902a0b..6567b95976 100644
--- a/testsuites/ada/samples/base_mp/node2/Makefile.am
+++ b/testsuites/ada/samples/base_mp/node2/Makefile.am
@@ -14,7 +14,7 @@ ada_base_mp_node2$(EXEEXT): ../mptest.adb init.o
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.o: ../../../support/init.c
-	$(COMPILE.c) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -DNODE_NUMBER=2 -I$(srcdir)/.. -c $<
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_base_mp-node2.scn
diff --git a/testsuites/ada/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am
index c6b2628735..97ed434c91 100644
--- a/testsuites/ada/samples/base_sp/Makefile.am
+++ b/testsuites/ada/samples/base_sp/Makefile.am
@@ -7,7 +7,7 @@ ada_base_sp$(EXEEXT): base_sp.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
-	$(COMPILE.c) -I$(srcdir) -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_base_sp
 
diff --git a/testsuites/ada/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am
index 9a6aa5eeb6..ccf8ccf37a 100644
--- a/testsuites/ada/samples/hello/Makefile.am
+++ b/testsuites/ada/samples/hello/Makefile.am
@@ -7,7 +7,7 @@ ada_hello$(EXEEXT): hello.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
-	$(COMPILE.c) -I$(srcdir) -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_hello
 
diff --git a/testsuites/ada/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
index 64a8145818..e0b0849a14 100644
--- a/testsuites/ada/samples/nsecs/Makefile.am
+++ b/testsuites/ada/samples/nsecs/Makefile.am
@@ -7,7 +7,7 @@ ada_nsecs$(EXEEXT): nsecs.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
-	$(COMPILE.c) -I$(srcdir) -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_nsecs
 
diff --git a/testsuites/ada/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
index 12594586b3..de5050e79b 100644
--- a/testsuites/ada/samples/ticker/Makefile.am
+++ b/testsuites/ada/samples/ticker/Makefile.am
@@ -7,7 +7,7 @@ ada_ticker$(EXEEXT): ticker.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
-	$(COMPILE.c) -I$(srcdir) -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_ticker
 
diff --git a/testsuites/ada/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am
index fccab37289..e011a95b79 100644
--- a/testsuites/ada/sptests/spname01/Makefile.am
+++ b/testsuites/ada/sptests/spname01/Makefile.am
@@ -10,7 +10,7 @@ ada_spname01$(EXEEXT): spname01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 init.$(OBJEXT): ../../support/init.c
-	$(COMPILE.c) -I$(srcdir) -c $<
+	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 scndir = $(rtems_ada_testsdir)
 dist_scn_DATA = ada_spname01.scn