updated EXTRA_DIST in test/ragel.d and fixed rlparse COLM ref

2 files changed, 32 insertions, 19 deletions

diff --git a/test/ragel.d/Makefile.am b/test/ragel.d/Makefile.am
index 5e0a6955..84e6a159 100644
--- a/test/ragel.d/Makefile.am
+++ b/test/ragel.d/Makefile.am
@@ -30,27 +30,38 @@ noinst_SCRIPTS = gentests
 noinst_PROGRAMS = trans
 
 EXTRA_DIST = \
-	trans.lm \
+	gentests.sh trans.lm \
 	trans-asm.lm     trans-d.lm      trans-ocaml.lm \
 	trans-c.lm       trans-go.lm     trans-ruby.lm \
 	trans-crack.lm   trans-java.lm   trans-rust.lm \
 	trans-csharp.lm  trans-julia.lm \
-	gentests.sh \
-	atoi1.rl clang2.rl cond7.rl element3.rl erract8.rl forder3.rl java1.rl \
-	range.rl scan3.rl xml.rl atoi2.rl clang3.rl cppscan1.rl eofact.rl \
-	erract9.rl gotocallret1.rl java2.rl recdescent1.rl scan4.rl atoi3.rl \
-	clang4.rl cppscan2.rl erract1.rl export1.rl gotocallret2.rl keller1.rl \
-	recdescent2.rl stateact1.rl awkemu.rl cond1.rl cppscan3.rl erract2.rl \
-	export2.rl high1.rl lmgoto.rl statechart1.rl builtin.rl \
-	cond2.rl cppscan4.rl erract3.rl export3.rl high2.rl mailbox1.rl \
-	repetition.rl strings1.rl call1.rl cond3.rl cppscan5.rl erract4.rl \
-	export4.rl high3.rl mailbox2.rl rlscan.rl strings2.rl call2.rl cond4.rl \
-	cppscan6.rl erract5.rl fnext1.rl import1.rl mailbox3.rl ruby1.rl \
-	tokstart1.rl call3.rl cond5.rl element1.rl erract6.rl forder1.rl \
-	include1.rl minimize1.rl scan1.rl union.rl clang1.rl cond6.rl \
-	element2.rl erract7.rl forder2.rl include2.rl patact.rl scan2.rl \
-	xmlcommon.rl cppscan1.h eofact.h mailbox1.h strings2.h recdescent4.rl \
-	recdescent5.rl buffer.h strings3.rl
+	any1.rl args1.rl args2.rl argsinc.rl atoi1.rl atoi2.rl atoi3.rl \
+	atoi4.rl atoi5.rl awkemu.rl buffer.h builtin.rl call1.rl call2.rl \
+	call3.rl call4.rl caseindep.rl clang1.rl clang2.rl clang3.rl \
+	clang4.rl clang5.rl cond10.rl cond11.rl cond1.rl cond2.rl cond3.rl \
+	cond4.rl cond5.rl cond6.rl cond7.rl cond8.rl cond9.rl conderr1.rl \
+	conderr2.rl condrep1.rl condrep2.rl condrep3.rl condrep4.rl condrep5.rl \
+	cppscan1.h cppscan1.rl cppscan2.rl cppscan3.rl cppscan4.rl cppscan5.rl \
+	cppscan6.rl crack1.rl curs1.rl element1.rl element2.rl element3.rl \
+	empty1.rl eofact.h eofact.rl eofcall1.rl eofcall2.rl eofgoto1.rl \
+	eofgoto2.rl eofret1.rl erract1.rl erract2.rl erract3.rl erract4.rl \
+	erract5.rl erract6.rl erract7.rl erract8.rl erract9.rl export1.rl \
+	export2.rl export3.rl export4.rl fnext1.rl fnext2.rl fnext3.rl forder1.rl \
+	forder2.rl forder3.rl genrep1.rl genrep2.rl genrep3.rl genrep4.rl \
+	genrep5.rl genrep6.rl genrep7.rl genrep8.rl goto1.rl gotocallret1.rl \
+	gotocallret2.rl gotocallret3.rl high1.rl high2.rl high3.rl import1.rl \
+	import2.h import2.rl include1.rl include2.rl include3.rl \
+	include3/smtp_address.rl include3/smtp_addr_parser.rl \
+	include3/smtp_ip.rl include3/smtp_whitespace.rl \
+	java1.rl java2.rl julia1.rl keller1.rl lmgoto.rl lmnfa1.rl mailbox1.h \
+	mailbox1.rl mailbox2.rl mailbox3.rl minimize1.rl ncall1.rl next1.rl \
+	next2.rl nfa1.rl nfa2.rl nfa3.rl noignore.rl patact.rl rangei.rl \
+	range.rl recdescent1.rl recdescent2.rl recdescent4.rl recdescent5.rl \
+	repetition.rl rlscan.rl rpn1.rl ruby1.rl rust1.rl scan1.rl scan2.rl \
+	scan3.rl scan4.rl scan5.rl scan6.rl scan7.rl stateact1.rl \
+	statechart1.rl strings1.rl strings2.h strings2.rl strings3.rl targs1.rl \
+	tofrom1.rl tofrom2.rl tokstart1.rl union.rl url1.rl xmlcommon.rl xml.rl \
+	zlen1.rl
 
 CLEANFILES = working
 
@@ -73,3 +84,4 @@ trans.c: trans.lm $(TRANS_DEPS) $(COLM_BIN)
 
 gentests: gentests.sh Makefile
 	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+
diff --git a/test/rlparse.d/Makefile.am b/test/rlparse.d/Makefile.am
index 88f13323..1d8e9619 100644
--- a/test/rlparse.d/Makefile.am
+++ b/test/rlparse.d/Makefile.am
@@ -1,3 +1,4 @@
+COLM_BIN = ../../colm/colm
 COLM_xCPPFLAGS = -I../../colm/include
 COLM_xLDFLAGS = -L../../colm
 
@@ -32,8 +33,8 @@ EXTRA_DIST = \
 
 BUILT_SOURCES = parse.c if.h if.cc commit.cc
 
-parse.c: rlparse.lm reducer.lm $(RAGEL_LM) $(COLM)
-	$(COLM) -c -b rlparse_object -o $@ -e if.h -x if.cc -m commit.cc $<
+parse.c: rlparse.lm reducer.lm $(RAGEL_LM) $(COLM_BIN)
+	$(COLM_BIN) -c -b rlparse_object -o $@ -e if.h -x if.cc -m commit.cc $<
 
 if.h: parse.c
 if.cc: parse.c