Add scndir. Install *.scn to scndir.

2005-11-20 08:51:05 +00:00
parent 1471bd9b41
commit c2cdd9d4d9
28 changed files with 56 additions and 28 deletions
--- a/c/src/ada-tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node1/Makefile.am
@@ -17,6 +17,7 @@ if EXPADA
 noinst_PROGRAMS = node1
 endif

-EXTRA_DIST = base_mp-node1.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = base_mp-node1.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/ada-tests/samples/base_mp/node2/Makefile.am
@@ -19,6 +19,7 @@ endif

 node2_SOURCES = mptest-per_node_configuration.adb

-EXTRA_DIST = base_mp-node2.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = base_mp-node2.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/samples/base_sp/Makefile.am
+++ b/c/src/ada-tests/samples/base_sp/Makefile.am
@@ -15,6 +15,7 @@ noinst_PROGRAMS = base_sp

 base_sp_SOURCES = base_sp.adb config.h sptest.adb sptest.ads

-EXTRA_DIST = base_sp.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = base_sp.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/samples/hello/Makefile.am
+++ b/c/src/ada-tests/samples/hello/Makefile.am
@@ -15,6 +15,7 @@ noinst_PROGRAMS = hello

 hello_SOURCES = hello.adb config.h sptest.adb sptest.ads

-EXTRA_DIST = hello.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = hello.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -15,6 +15,7 @@ noinst_PROGRAMS = ticker

 ticker_SOURCES = ticker.adb config.h sptest.adb sptest.ads

-EXTRA_DIST = ticker.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = ticker.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/c/src/ada-tests/sptests/sp01/Makefile.am
@@ -12,6 +12,7 @@ sp01_SOURCES += ../../support/init.c
 sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp01.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp01.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp02/Makefile.am
+++ b/c/src/ada-tests/sptests/sp02/Makefile.am
@@ -12,6 +12,7 @@ sp02_SOURCES += ../../support/init.c
 sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp02.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp02.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp03/Makefile.am
+++ b/c/src/ada-tests/sptests/sp03/Makefile.am
@@ -12,6 +12,7 @@ sp03_SOURCES += ../../support/init.c
 sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp03.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp03.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/c/src/ada-tests/sptests/sp04/Makefile.am
@@ -12,6 +12,7 @@ sp04_SOURCES += ../../support/init.c
 sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp04.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp04.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp05/Makefile.am
+++ b/c/src/ada-tests/sptests/sp05/Makefile.am
@@ -12,6 +12,7 @@ sp05_SOURCES += ../../support/init.c
 sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp05.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp05.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp06/Makefile.am
+++ b/c/src/ada-tests/sptests/sp06/Makefile.am
@@ -12,6 +12,7 @@ sp06_SOURCES += ../../support/init.c
 sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp06.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp06.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp07/Makefile.am
+++ b/c/src/ada-tests/sptests/sp07/Makefile.am
@@ -13,6 +13,7 @@ sp07_SOURCES += ../../support/init.c
 sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp07.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp07.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp08/Makefile.am
+++ b/c/src/ada-tests/sptests/sp08/Makefile.am
@@ -12,6 +12,7 @@ sp08_SOURCES += ../../support/init.c
 sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp08.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp08.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp09/Makefile.am
+++ b/c/src/ada-tests/sptests/sp09/Makefile.am
@@ -13,6 +13,7 @@ sp09_SOURCES += ../../support/init.c
 sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp09.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp09.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp11/Makefile.am
+++ b/c/src/ada-tests/sptests/sp11/Makefile.am
@@ -12,6 +12,7 @@ sp11_SOURCES += ../../support/init.c
 sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp11.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp11.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp12/Makefile.am
+++ b/c/src/ada-tests/sptests/sp12/Makefile.am
@@ -12,6 +12,7 @@ sp12_SOURCES += ../../support/init.c
 sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp12.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp12.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp13/Makefile.am
+++ b/c/src/ada-tests/sptests/sp13/Makefile.am
@@ -12,6 +12,7 @@ sp13_SOURCES += ../../support/init.c
 sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp13.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp13.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp14/Makefile.am
+++ b/c/src/ada-tests/sptests/sp14/Makefile.am
@@ -12,6 +12,7 @@ sp14_SOURCES += ../../support/init.c
 sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp14.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp14.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp15/Makefile.am
+++ b/c/src/ada-tests/sptests/sp15/Makefile.am
@@ -12,6 +12,7 @@ sp15_SOURCES += ../../support/init.c
 sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp15.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp15.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp16/Makefile.am
+++ b/c/src/ada-tests/sptests/sp16/Makefile.am
@@ -12,6 +12,7 @@ sp16_SOURCES += ../../support/init.c
 sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp16.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp16.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp17/Makefile.am
+++ b/c/src/ada-tests/sptests/sp17/Makefile.am
@@ -12,6 +12,7 @@ sp17_SOURCES += ../../support/init.c
 sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp17.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp17.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp19/Makefile.am
+++ b/c/src/ada-tests/sptests/sp19/Makefile.am
@@ -17,6 +17,7 @@ CLEANFILES += sptest.adb
 sp19$(EXEEXT): sp19.adb sptest.adb sptest.ads init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp19.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp19.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp20/Makefile.am
+++ b/c/src/ada-tests/sptests/sp20/Makefile.am
@@ -12,6 +12,7 @@ sp20_SOURCES += ../../support/init.c
 sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp20.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp20.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp21/Makefile.am
+++ b/c/src/ada-tests/sptests/sp21/Makefile.am
@@ -13,6 +13,7 @@ sp21_SOURCES += ../../support/init.c
 sp21$(EXEEXT): sp21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp21.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp21.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp22/Makefile.am
+++ b/c/src/ada-tests/sptests/sp22/Makefile.am
@@ -12,6 +12,7 @@ sp22_SOURCES += ../../support/init.c
 sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp22.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp22.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp23/Makefile.am
+++ b/c/src/ada-tests/sptests/sp23/Makefile.am
@@ -12,6 +12,7 @@ sp23_SOURCES += ../../support/init.c
 sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp23.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp23.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp24/Makefile.am
+++ b/c/src/ada-tests/sptests/sp24/Makefile.am
@@ -12,6 +12,7 @@ sp24_SOURCES += ../../support/init.c
 sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp24.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp24.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am
--- a/c/src/ada-tests/sptests/sp25/Makefile.am
+++ b/c/src/ada-tests/sptests/sp25/Makefile.am
@@ -12,6 +12,7 @@ sp25_SOURCES += ../../support/init.c
 sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@

-EXTRA_DIST = sp25.scn
+scndir = $(rtems_ada_testsdir)
+dist_scn_DATA = sp25.scn

 include $(top_srcdir)/../../../testsuites/automake/local.am