summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac150
-rw-r--r--test/aapl.d/Makefile.am2
-rw-r--r--test/colm.d/gentests.sh6
-rw-r--r--test/ragel.d/Makefile.am8
-rw-r--r--test/ragel.d/gentests.sh30
-rw-r--r--test/ragel.d/subject.mk.in3
-rw-r--r--test/ragel.d/subject.sh.in3
-rw-r--r--test/rlhc.d/Makefile6
-rw-r--r--test/rlparse.d/Makefile6
-rw-r--r--test/subject.mk.in12
-rw-r--r--test/subject.sh.in12
-rw-r--r--test/trans.d/Makefile6
12 files changed, 117 insertions, 127 deletions
diff --git a/configure.ac b/configure.ac
index 0d1e7cdf..884d193a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,90 +134,92 @@ AC_SUBST(COLM_LIBDEP)
AC_SUBST(COLM_BINDEP)
dnl
+dnl Testing
+dnl
dnl Which installed target to test. Without this option supplied testing is
-dnl done against what's in the source tree.
+dnl done against what is in the source tree.
dnl
AC_ARG_WITH(subject,
[AC_HELP_STRING([--with-subject], [location of install tree test (defaults source tree)])],
[
- AAPL_CPPFLAGS="-I${withval}/include/aapl"
-
- COLM_BIN="${withval}/bin/colm"
- COLM_CPPFLAGS="-I${withval}/include"
- COLM_LDFLAGS="${LDFLAGS} -L${withval}/lib -Wl,-rpath,${withval}/lib"
-
- RAGEL_BIN="$withval/bin/ragel"
- RAGEL_CPPFLAGS="-I$withval/include"
- RAGEL_LDFLAGS="-L$withval/lib -Wl,-rpath,${withval}/lib"
- RAGEL_LM="${withval}/share"
-
- RAGEL_C_BIN="$withval/bin/ragel-c"
- RAGEL_D_BIN="$withval/bin/ragel-d"
- RAGEL_JAVA_BIN="$withval/bin/ragel-java"
- RAGEL_RUBY_BIN="$withval/bin/ragel-ruby"
- RAGEL_CSHARP_BIN="$withval/bin/ragel-csharp"
- RAGEL_GO_BIN="$withval/bin/ragel-go"
- RAGEL_OCAML_BIN="$withval/bin/ragel-ocaml"
- RAGEL_ASM_BIN="$withval/bin/ragel-asm"
- RAGEL_RUST_BIN="$withval/bin/ragel-rust"
- RAGEL_CRACK_BIN="$withval/bin/ragel-crack"
- RAGEL_JULIA_BIN="$withval/bin/ragel-julia"
+ SUBJ_AAPL_CPPFLAGS="-I${withval}/include/aapl"
+
+ SUBJ_COLM_BIN="${withval}/bin/colm"
+ SUBJ_COLM_CPPFLAGS="-I${withval}/include"
+ SUBJ_COLM_LDFLAGS="-L${withval}/lib -Wl,-rpath,${withval}/lib"
+
+ SUBJ_RAGEL_BIN="$withval/bin/ragel"
+ SUBJ_RAGEL_CPPFLAGS="-I$withval/include"
+ SUBJ_RAGEL_LDFLAGS="-L$withval/lib -Wl,-rpath,${withval}/lib"
+ SUBJ_RAGEL_LM="${withval}/share"
+
+ SUBJ_RAGEL_C_BIN="$withval/bin/ragel-c"
+ SUBJ_RAGEL_D_BIN="$withval/bin/ragel-d"
+ SUBJ_RAGEL_JAVA_BIN="$withval/bin/ragel-java"
+ SUBJ_RAGEL_RUBY_BIN="$withval/bin/ragel-ruby"
+ SUBJ_RAGEL_CSHARP_BIN="$withval/bin/ragel-csharp"
+ SUBJ_RAGEL_GO_BIN="$withval/bin/ragel-go"
+ SUBJ_RAGEL_OCAML_BIN="$withval/bin/ragel-ocaml"
+ SUBJ_RAGEL_ASM_BIN="$withval/bin/ragel-asm"
+ SUBJ_RAGEL_RUST_BIN="$withval/bin/ragel-rust"
+ SUBJ_RAGEL_CRACK_BIN="$withval/bin/ragel-crack"
+ SUBJ_RAGEL_JULIA_BIN="$withval/bin/ragel-julia"
],
[
- AAPL_CPPFLAGS='-I$(abs_top_builddir)/aapl'
-
- COLM_BIN='$(abs_top_builddir)/colm/colm'
- COLM_CPPFLAGS='-I$(abs_top_builddir)/colm/include'
- COLM_LDFLAGS='${LDFLAGS} -L$(abs_top_builddir)/colm/.libs -Wl,-rpath,${abs_top_builddir}/colm/.libs'
-
- RAGEL_BIN='$(abs_top_builddir)/ragel/ragel'
- RAGEL_CPPFLAGS='-I$(abs_top_builddir)/ragel/include -I$(abs_top_builddir)/aapl'
- RAGEL_LDFLAGS='-L$(abs_top_builddir)/ragel/.libs -Wl,-rpath,$(abs_top_builddir)/ragel/.libs'
- RAGEL_LM='$(abs_top_builddir)/ragel'
-
- RAGEL_C_BIN='$(abs_top_builddir)/ragel/host-c/ragel-c'
- RAGEL_D_BIN='$(abs_top_builddir)/ragel/host-d/ragel-d'
- RAGEL_JAVA_BIN='$(abs_top_builddir)/ragel/host-java/ragel-java'
- RAGEL_RUBY_BIN='$(abs_top_builddir)/ragel/host-ruby/ragel-ruby'
- RAGEL_CSHARP_BIN='$(abs_top_builddir)/ragel/host-csharp/ragel-csharp'
- RAGEL_GO_BIN='$(abs_top_builddir)/ragel/host-go/ragel-go'
- RAGEL_OCAML_BIN='$(abs_top_builddir)/ragel/host-ocaml/ragel-ocaml'
- RAGEL_ASM_BIN='$(abs_top_builddir)/ragel/host-asm/ragel-asm'
- RAGEL_RUST_BIN='$(abs_top_builddir)/ragel/host-rust/ragel-rust'
- RAGEL_CRACK_BIN='$(abs_top_builddir)/ragel/host-crack/ragel-crack'
- RAGEL_JULIA_BIN='$(abs_top_builddir)/ragel/host-julia/ragel-julia'
+ SUBJ_AAPL_CPPFLAGS='-I$(abs_top_builddir)/aapl'
+
+ SUBJ_COLM_BIN='$(abs_top_builddir)/colm/colm'
+ SUBJ_COLM_CPPFLAGS='-I$(abs_top_builddir)/colm/include'
+ SUBJ_COLM_LDFLAGS='-L$(abs_top_builddir)/colm/.libs -Wl,-rpath,${abs_top_builddir}/colm/.libs'
+
+ SUBJ_RAGEL_BIN='$(abs_top_builddir)/ragel/ragel'
+ SUBJ_RAGEL_CPPFLAGS='-I$(abs_top_builddir)/ragel/include -I$(abs_top_builddir)/aapl'
+ SUBJ_RAGEL_LDFLAGS='-L$(abs_top_builddir)/ragel/.libs -Wl,-rpath,$(abs_top_builddir)/ragel/.libs'
+ SUBJ_RAGEL_LM='$(abs_top_builddir)/ragel'
+
+ SUBJ_RAGEL_C_BIN='$(abs_top_builddir)/ragel/host-c/ragel-c'
+ SUBJ_RAGEL_D_BIN='$(abs_top_builddir)/ragel/host-d/ragel-d'
+ SUBJ_RAGEL_JAVA_BIN='$(abs_top_builddir)/ragel/host-java/ragel-java'
+ SUBJ_RAGEL_RUBY_BIN='$(abs_top_builddir)/ragel/host-ruby/ragel-ruby'
+ SUBJ_RAGEL_CSHARP_BIN='$(abs_top_builddir)/ragel/host-csharp/ragel-csharp'
+ SUBJ_RAGEL_GO_BIN='$(abs_top_builddir)/ragel/host-go/ragel-go'
+ SUBJ_RAGEL_OCAML_BIN='$(abs_top_builddir)/ragel/host-ocaml/ragel-ocaml'
+ SUBJ_RAGEL_ASM_BIN='$(abs_top_builddir)/ragel/host-asm/ragel-asm'
+ SUBJ_RAGEL_RUST_BIN='$(abs_top_builddir)/ragel/host-rust/ragel-rust'
+ SUBJ_RAGEL_CRACK_BIN='$(abs_top_builddir)/ragel/host-crack/ragel-crack'
+ SUBJ_RAGEL_JULIA_BIN='$(abs_top_builddir)/ragel/host-julia/ragel-julia'
]
)
-SED_SUBST="$SED_SUBST -e 's|@COLM_BIN@|${COLM_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@COLM_CPPFLAGS@|${COLM_CPPFLAGS}|g'"
-SED_SUBST="$SED_SUBST -e 's|@COLM_LDFLAGS@|${COLM_LDFLAGS}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_BIN@|${RAGEL_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_CPPFLAGS@|${RAGEL_CPPFLAGS}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_LDFLAGS@|${RAGEL_LDFLAGS}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_LM@|${RAGEL_LM}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_C_BIN@|${RAGEL_C_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_D_BIN@|${RAGEL_D_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_JAVA_BIN@|${RAGEL_JAVA_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_RUBY_BIN@|${RAGEL_RUBY_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_CSHARP_BIN@|${RAGEL_CSHARP_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_GO_BIN@|${RAGEL_GO_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_OCAML_BIN@|${RAGEL_OCAML_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_ASM_BIN@|${RAGEL_ASM_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_RUST_BIN@|${RAGEL_RUST_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_CRACK_BIN@|${RAGEL_CRACK_BIN}|g'"
-SED_SUBST="$SED_SUBST -e 's|@RAGEL_JULIA_BIN@|${RAGEL_JULIA_BIN}|g'"
-
-AC_SUBST(AAPL_CPPFLAGS)
-
-AC_SUBST(COLM_BIN)
-AC_SUBST(COLM_CPPFLAGS)
-AC_SUBST(COLM_LDFLAGS)
-
-AC_SUBST(RAGEL_BIN)
-AC_SUBST(RAGEL_CPPFLAGS)
-AC_SUBST(RAGEL_LDFLAGS)
-AC_SUBST(RAGEL_LM)
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_COLM_BIN@|${SUBJ_COLM_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_COLM_CPPFLAGS@|${SUBJ_COLM_CPPFLAGS}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_COLM_LDFLAGS@|${SUBJ_COLM_LDFLAGS}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_BIN@|${SUBJ_RAGEL_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_CPPFLAGS@|${SUBJ_RAGEL_CPPFLAGS}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_LDFLAGS@|${SUBJ_RAGEL_LDFLAGS}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_LM@|${SUBJ_RAGEL_LM}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_C_BIN@|${SUBJ_RAGEL_C_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_D_BIN@|${SUBJ_RAGEL_D_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_JAVA_BIN@|${SUBJ_RAGEL_JAVA_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_RUBY_BIN@|${SUBJ_RAGEL_RUBY_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_CSHARP_BIN@|${SUBJ_RAGEL_CSHARP_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_GO_BIN@|${SUBJ_RAGEL_GO_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_OCAML_BIN@|${SUBJ_RAGEL_OCAML_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_ASM_BIN@|${SUBJ_RAGEL_ASM_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_RUST_BIN@|${SUBJ_RAGEL_RUST_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_CRACK_BIN@|${SUBJ_RAGEL_CRACK_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@SUBJ_RAGEL_JULIA_BIN@|${SUBJ_RAGEL_JULIA_BIN}|g'"
+
+AC_SUBST(SUBJ_AAPL_CPPFLAGS)
+
+AC_SUBST(SUBJ_COLM_BIN)
+AC_SUBST(SUBJ_COLM_CPPFLAGS)
+AC_SUBST(SUBJ_COLM_LDFLAGS)
+
+AC_SUBST(SUBJ_RAGEL_BIN)
+AC_SUBST(SUBJ_RAGEL_CPPFLAGS)
+AC_SUBST(SUBJ_RAGEL_LDFLAGS)
+AC_SUBST(SUBJ_RAGEL_LM)
dnl
dnl Installed programs to test in
diff --git a/test/aapl.d/Makefile.am b/test/aapl.d/Makefile.am
index c408a36a..89647c4b 100644
--- a/test/aapl.d/Makefile.am
+++ b/test/aapl.d/Makefile.am
@@ -2,7 +2,7 @@
# Copyright 2001, 2002 Adrian Thurston <thurston@cs.queensu.ca>
#
-CPPFLAGS = @AAPL_CPPFLAGS@
+CPPFLAGS = @SUBJ_AAPL_CPPFLAGS@
noinst_PROGRAMS = \
stress_avltree stress_avliter stress_avlmel \
diff --git a/test/colm.d/gentests.sh b/test/colm.d/gentests.sh
index db29205f..61940ec8 100644
--- a/test/colm.d/gentests.sh
+++ b/test/colm.d/gentests.sh
@@ -44,9 +44,9 @@ ERRORS=0
# Make available to to test directories below us that are not part of this
# repository and cannot source one dir up.
-export COLM_BIN="@COLM_BIN@"
-export COLM_CPPFLAGS="@COLM_CPPFLAGS@"
-export COLM_LDFLAGS="@COLM_LDFLAGS@"
+export COLM_BIN="@SUBJ_COLM_BIN@"
+export COLM_CPPFLAGS="@SUBJ_COLM_CPPFLAGS@"
+export COLM_LDFLAGS="@SUBJ_COLM_LDFLAGS@"
# cd `dirname $0`
test -d $WORKING || mkdir $WORKING
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@";
diff --git a/test/rlhc.d/Makefile b/test/rlhc.d/Makefile
index 2c4276c5..db54925d 100644
--- a/test/rlhc.d/Makefile
+++ b/test/rlhc.d/Makefile
@@ -3,9 +3,9 @@ include ../subject.mk
all: rlhc
-COLM = $(COLM_BIN)
-COLM_INC = $(COLM_CPPFLAGS)
-COLM_LIB = $(COLM_LDFLAGS)
+COLM = $(SUBJ_COLM_BIN)
+COLM_INC = $(SUBJ_COLM_CPPFLAGS)
+COLM_LIB = $(SUBJ_COLM_LDFLAGS)
RLHC_DEP = \
rlhc-host.lm \
diff --git a/test/rlparse.d/Makefile b/test/rlparse.d/Makefile
index 6d5afcd0..d89975fa 100644
--- a/test/rlparse.d/Makefile
+++ b/test/rlparse.d/Makefile
@@ -1,8 +1,8 @@
include ../subject.mk
-COLM = $(COLM_BIN)
-COLM_INC = $(COLM_CPPFLAGS)
-COLM_LIB = $(COLM_LDFLAGS)
+COLM = $(SUBJ_COLM_BIN)
+COLM_INC = $(SUBJ_COLM_CPPFLAGS)
+COLM_LIB = $(SUBJ_COLM_LDFLAGS)
all: rlparse
diff --git a/test/subject.mk.in b/test/subject.mk.in
index c947016a..db915969 100644
--- a/test/subject.mk.in
+++ b/test/subject.mk.in
@@ -1,7 +1,7 @@
-COLM_BIN = @COLM_BIN@
-COLM_CPPFLAGS = @COLM_CPPFLAGS@
-COLM_LDFLAGS = @COLM_LDFLAGS@
+SUBJ_COLM_BIN = @SUBJ_COLM_BIN@
+SUBJ_COLM_CPPFLAGS = @SUBJ_COLM_CPPFLAGS@
+SUBJ_COLM_LDFLAGS = @SUBJ_COLM_LDFLAGS@
-RAGEL_BIN = @RAGEL_BIN@
-RAGEL_CPPFLAGS = @RAGEL_CPPFLAGS@
-RAGEL_LDFLAGS = @RAGEL_LDFLAGS@
+SUBJ_RAGEL_BIN = @SUBJ_RAGEL_BIN@
+SUBJ_RAGEL_CPPFLAGS = @SUBJ_RAGEL_CPPFLAGS@
+SUBJ_RAGEL_LDFLAGS = @SUBJ_RAGEL_LDFLAGS@
diff --git a/test/subject.sh.in b/test/subject.sh.in
index e90deae7..47b5aea3 100644
--- a/test/subject.sh.in
+++ b/test/subject.sh.in
@@ -1,7 +1,7 @@
-COLM_BIN="@COLM_BIN@"
-COLM_CPPFLAGS="@COLM_CPPFLAGS@"
-COLM_LDFLAGS="@COLM_LDFLAGS@"
+SUBJ_COLM_BIN="@SUBJ_COLM_BIN@"
+SUBJ_COLM_CPPFLAGS="@SUBJ_COLM_CPPFLAGS@"
+SUBJ_COLM_LDFLAGS="@SUBJ_COLM_LDFLAGS@"
-RAGEL_BIN="@RAGEL_BIN@";
-RAGEL_CPPFLAGS="@RAGEL_CPPFLAGS@"
-RAGEL_LDFLAGS="@RAGEL_LDFLAGS@"
+SUBJ_RAGEL_BIN="@SUBJ_RAGEL_BIN@";
+SUBJ_RAGEL_CPPFLAGS="@SUBJ_RAGEL_CPPFLAGS@"
+SUBJ_RAGEL_LDFLAGS="@SUBJ_RAGEL_LDFLAGS@"
diff --git a/test/trans.d/Makefile b/test/trans.d/Makefile
index 3154bd5c..6643fc74 100644
--- a/test/trans.d/Makefile
+++ b/test/trans.d/Makefile
@@ -3,9 +3,9 @@ include ../subject.mk
all: trans
-COLM = $(COLM_BIN)
-COLM_INC = $(COLM_CPPFLAGS)
-COLM_LIB = $(COLM_LDFLAGS)
+COLM = $(SUBJ_COLM_BIN)
+COLM_INC = $(SUBJ_COLM_CPPFLAGS)
+COLM_LIB = $(SUBJ_COLM_LDFLAGS)
TRANS_DEPS = $(wildcard *-*.lm)
View Lorry Controller Status