some tweaks to colm vars for building other projects in tree

14 files changed, 71 insertions, 71 deletions

diff --git a/configure.ac b/configure.ac
index 884d193a..a3d109b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,18 +118,18 @@ AM_CONDITIONAL([LINKER_NO_UNDEFINED], [test "x$host_os" = "xlinux-gnu"])
 #
 # For building within the tree.
 #
-COLM='$(top_srcdir)/colm/colm'
-COLM_LD='$(top_srcdir)/colm/libcolm.la'
-COLM_LIBDEP="${COLM_LD}"
+COLM_BIN='$(top_srcdir)/colm/colm'
+COLM_LA='$(top_srcdir)/colm/libcolm.la'
+COLM_LIBDEP="${COLM_LA}"
 COLM_BINDEP="${COLM}"
 
-SED_SUBST="$SED_SUBST -e 's|@COLM@|${COLM}|g'"
-SED_SUBST="$SED_SUBST -e 's|@COLM_LD@|${COLM_LD}|g'"
+SED_SUBST="$SED_SUBST -e 's|@COLM_BIN@|${COLM_BIN}|g'"
+SED_SUBST="$SED_SUBST -e 's|@COLM_LA@|${COLM_LA}|g'"
 SED_SUBST="$SED_SUBST -e 's|@COLM_LIBDEP@|${COLM_LIBDEP}|g'"
 SED_SUBST="$SED_SUBST -e 's|@COLM_BINDEP@|${COLM_BINDEP}|g'"
 
-AC_SUBST(COLM)
-AC_SUBST(COLM_LD)
+AC_SUBST(COLM_BIN)
+AC_SUBST(COLM_LA)
 AC_SUBST(COLM_LIBDEP)
 AC_SUBST(COLM_BINDEP)
 
diff --git a/ragel/Makefile.am b/ragel/Makefile.am
index 6d8f7132..4d49a210 100644
--- a/ragel/Makefile.am
+++ b/ragel/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = . host-ruby host-asm host-julia host-ocaml host-c \
 	host-d host-csharp host-go host-java host-rust host-crack host-js
 
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 KELBT       = @KELBT@
@@ -66,7 +66,7 @@ dist_libragel_la_SOURCES = \
 	parsetree.cc longest.cc parsedata.cc inputdata.cc load.cc reducer.cc
 
 libragel_la_LDFLAGS = -no-undefined
-libragel_la_LIBADD = libfsm.la $(COLM_LD)
+libragel_la_LIBADD = libfsm.la $(COLM_LA)
 
 if LINKER_NO_UNDEFINED
 libfsm_la_LDFLAGS += -Wl,--no-undefined
@@ -84,7 +84,7 @@ dist_ragel_SOURCES = \
 nodist_ragel_SOURCES = \
 	parse.c rlreduce.cc
 
-ragel_LDADD = libragel.la libfsm.la $(COLM_LD)
+ragel_LDADD = libragel.la libfsm.la $(COLM_LA)
 ragel_DEPENDENCIES = libragel.la libfsm.la $(COLM_LIBDEP)
 
 BUILT_SOURCES = \
diff --git a/ragel/host-asm/Makefile.am b/ragel/host-asm/Makefile.am
index d85b3665..9a9a77bb 100644
--- a/ragel/host-asm/Makefile.am
+++ b/ragel/host-asm/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,14 +12,14 @@ dist_ragel_asm_SOURCES = main.cc
 nodist_ragel_asm_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_asm_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_asm_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc
 
 EXTRA_DIST = rlparse.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseAsm -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseAsm -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
diff --git a/ragel/host-c/Makefile.am b/ragel/host-c/Makefile.am
index fcd91d5c..46962848 100644
--- a/ragel/host-c/Makefile.am
+++ b/ragel/host-c/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_c_SOURCES = main.cc rlhc.c
 nodist_ragel_c_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_c_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_c_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseC -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseC -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm ../ril.lm
-	$(COLM) -I.. -c -b rlhcC -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcC -o $@ $<
diff --git a/ragel/host-crack/Makefile.am b/ragel/host-crack/Makefile.am
index d003cb4f..69164bfe 100644
--- a/ragel/host-crack/Makefile.am
+++ b/ragel/host-crack/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_crack_SOURCES = main.cc rlhc.c
 nodist_ragel_crack_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_crack_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_crack_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseCrack -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseCrack -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcCrack -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcCrack -o $@ $<
diff --git a/ragel/host-csharp/Makefile.am b/ragel/host-csharp/Makefile.am
index 2629c5bc..332dfba4 100644
--- a/ragel/host-csharp/Makefile.am
+++ b/ragel/host-csharp/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_csharp_SOURCES = main.cc rlhc.c
 nodist_ragel_csharp_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_csharp_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_csharp_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseCSharp -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseCSharp -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcCSharp -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcCSharp -o $@ $<
diff --git a/ragel/host-d/Makefile.am b/ragel/host-d/Makefile.am
index f38540ff..3fee70b0 100644
--- a/ragel/host-d/Makefile.am
+++ b/ragel/host-d/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_d_SOURCES = main.cc rlhc.c
 nodist_ragel_d_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_d_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_d_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseD -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseD -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcD -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcD -o $@ $<
diff --git a/ragel/host-go/Makefile.am b/ragel/host-go/Makefile.am
index e356d93a..35d98c5c 100644
--- a/ragel/host-go/Makefile.am
+++ b/ragel/host-go/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -14,16 +14,16 @@ dist_ragel_go_SOURCES = main.cc rlhc.c
 nodist_ragel_go_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_go_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_go_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseGo -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseGo -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcGo -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcGo -o $@ $<
diff --git a/ragel/host-java/Makefile.am b/ragel/host-java/Makefile.am
index 060302c4..47a8d9ce 100644
--- a/ragel/host-java/Makefile.am
+++ b/ragel/host-java/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_java_SOURCES = main.cc rlhc.c
 nodist_ragel_java_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_java_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_java_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseJava -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseJava -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcJava -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcJava -o $@ $<
diff --git a/ragel/host-js/Makefile.am b/ragel/host-js/Makefile.am
index 1ae32470..5a8384f6 100644
--- a/ragel/host-js/Makefile.am
+++ b/ragel/host-js/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_js_SOURCES = main.cc rlhc.c
 nodist_ragel_js_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_js_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_js_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseJs -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseJs -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcJs -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcJs -o $@ $<
diff --git a/ragel/host-julia/Makefile.am b/ragel/host-julia/Makefile.am
index 2249979b..267b184a 100644
--- a/ragel/host-julia/Makefile.am
+++ b/ragel/host-julia/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_julia_SOURCES = main.cc rlhc.c
 nodist_ragel_julia_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_julia_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_julia_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseJulia -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseJulia -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcJulia -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcJulia -o $@ $<
diff --git a/ragel/host-ocaml/Makefile.am b/ragel/host-ocaml/Makefile.am
index 23cd4819..31acb568 100644
--- a/ragel/host-ocaml/Makefile.am
+++ b/ragel/host-ocaml/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,21 +12,21 @@ dist_ragel_ocaml_SOURCES = main.cc rlhc.c
 nodist_ragel_ocaml_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_ocaml_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_ocaml_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseOCaml -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseOCaml -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc$(EXEEXT): rlhc.lm
-	$(COLM) -I.. -o $@ $<
+	$(COLM_BIN) -I.. -o $@ $<
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcOCaml -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcOCaml -o $@ $<
 
 
diff --git a/ragel/host-ruby/Makefile.am b/ragel/host-ruby/Makefile.am
index 3853ca95..d4dae7d7 100644
--- a/ragel/host-ruby/Makefile.am
+++ b/ragel/host-ruby/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_ruby_SOURCES = main.cc rlhc.c
 nodist_ragel_ruby_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_ruby_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_ruby_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseRuby -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseRuby -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcRuby -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcRuby -o $@ $<
diff --git a/ragel/host-rust/Makefile.am b/ragel/host-rust/Makefile.am
index 2b04dba2..96c076f5 100644
--- a/ragel/host-rust/Makefile.am
+++ b/ragel/host-rust/Makefile.am
@@ -1,5 +1,5 @@
-COLM        = @COLM@
-COLM_LD     = @COLM_LD@
+COLM_BIN    = @COLM_BIN@
+COLM_LA     = @COLM_LA@
 COLM_LIBDEP = @COLM_LIBDEP@
 COLM_BINDEP = @COLM_BINDEP@
 
@@ -12,16 +12,16 @@ dist_ragel_rust_SOURCES = main.cc rlhc.c
 nodist_ragel_rust_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_rust_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
+ragel_rust_LDADD = ../libragel.la ../libfsm.la $(COLM_LA)
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
 rlparse.c: rlparse.lm $(COLM_BINDEP)
-	$(COLM) -I.. -c -b rlparseRust -o $@ -m rlreduce.cc $<
+	$(COLM_BIN) -I.. -c -b rlparseRust -o $@ -m rlreduce.cc $<
 
 rlreduce.cc: rlparse.c
 
 rlhc.c: rlhc.lm
-	$(COLM) -I.. -c -b rlhcRust -o $@ $<
+	$(COLM_BIN) -I.. -c -b rlhcRust -o $@ $<