rename the substitution vars for the test subjects

Want to make sure these are not confused with the substitution vars for the
various progs that are used in buiding (eg colm, aapl).

4 files changed, 16 insertions, 28 deletions

diff --git a/test/ragel.d/Makefile.am b/test/ragel.d/Makefile.am
index 1f5a678f..4c6bd1df 100644
--- a/test/ragel.d/Makefile.am
+++ b/test/ragel.d/Makefile.am
@@ -26,7 +26,7 @@ COLM_xLDFLAGS = -L../../colm
 
 TESTS = gentests
 
-noinst_SCRIPTS = gentests subject.mk subject.sh
+noinst_SCRIPTS = gentests
 noinst_PROGRAMS = trans
 
 EXTRA_DIST = \
@@ -67,9 +67,3 @@ trans.c: trans.lm $(TRANS_DEPS)
 
 gentests: gentests.sh Makefile
 	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
-
-subject.mk: subject.mk.in Makefile
-	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
-
-subject.sh: subject.sh.in Makefile
-	@$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST)
diff --git a/test/ragel.d/gentests.sh b/test/ragel.d/gentests.sh
index 4cc30f4d..41603ecd 100644
--- a/test/ragel.d/gentests.sh
+++ b/test/ragel.d/gentests.sh
@@ -14,21 +14,21 @@ TRANS=./trans
 
 # Make available to to test directories below us that are not part of this
 # repository and cannot source one dir up.
-export RAGEL_BIN="@RAGEL_BIN@"
-export RAGEL_CPPFLAGS="@RAGEL_CPPFLAGS@"
-export RAGEL_LDFLAGS="@RAGEL_LDFLAGS@"
-
-export RAGEL_C_BIN="@RAGEL_C_BIN@"
-export RAGEL_D_BIN="@RAGEL_D_BIN@"
-export RAGEL_JAVA_BIN="@RAGEL_JAVA_BIN@"
-export RAGEL_RUBY_BIN="@RAGEL_RUBY_BIN@"
-export RAGEL_CSHARP_BIN="@RAGEL_CSHARP_BIN@"
-export RAGEL_GO_BIN="@RAGEL_GO_BIN@"
-export RAGEL_OCAML_BIN="@RAGEL_OCAML_BIN@"
-export RAGEL_ASM_BIN="@RAGEL_ASM_BIN@"
-export RAGEL_RUST_BIN="@RAGEL_RUST_BIN@"
-export RAGEL_CRACK_BIN="@RAGEL_CRACK_BIN@"
-export RAGEL_JULIA_BIN="@RAGEL_JULIA_BIN@"
+export RAGEL_BIN="@SUBJ_RAGEL_BIN@"
+export RAGEL_CPPFLAGS="@SUBJ_RAGEL_CPPFLAGS@"
+export RAGEL_LDFLAGS="@SUBJ_RAGEL_LDFLAGS@"
+
+export RAGEL_C_BIN="@SUBJ_RAGEL_C_BIN@"
+export RAGEL_D_BIN="@SUBJ_RAGEL_D_BIN@"
+export RAGEL_JAVA_BIN="@SUBJ_RAGEL_JAVA_BIN@"
+export RAGEL_RUBY_BIN="@SUBJ_RAGEL_RUBY_BIN@"
+export RAGEL_CSHARP_BIN="@SUBJ_RAGEL_CSHARP_BIN@"
+export RAGEL_GO_BIN="@SUBJ_RAGEL_GO_BIN@"
+export RAGEL_OCAML_BIN="@SUBJ_RAGEL_OCAML_BIN@"
+export RAGEL_ASM_BIN="@SUBJ_RAGEL_ASM_BIN@"
+export RAGEL_RUST_BIN="@SUBJ_RAGEL_RUST_BIN@"
+export RAGEL_CRACK_BIN="@SUBJ_RAGEL_CRACK_BIN@"
+export RAGEL_JULIA_BIN="@SUBJ_RAGEL_JULIA_BIN@"
 
 function sig_exit()
 {
diff --git a/test/ragel.d/subject.mk.in b/test/ragel.d/subject.mk.in
deleted file mode 100644
index 7f4bfd99..00000000
--- a/test/ragel.d/subject.mk.in
+++ /dev/null
@@ -1,3 +0,0 @@
-RAGEL_BIN = @RAGEL_BIN@
-RAGEL_CPPFLAGS = @RAGEL_CPPFLAGS@
-RAGEL_LDFLAGS = @RAGEL_LDFLAGS@
diff --git a/test/ragel.d/subject.sh.in b/test/ragel.d/subject.sh.in
deleted file mode 100644
index 561624f0..00000000
--- a/test/ragel.d/subject.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-RAGEL_BIN="@RAGEL_BIN@";
-RAGEL_CPPFLAGS="@RAGEL_CPPFLAGS@";
-RAGEL_LDFLAGS="@RAGEL_LDFLAGS@";