use libcolm and libfsm .la files when linking

14 files changed, 52 insertions, 156 deletions

diff --git a/configure.ac b/configure.ac
index 13ba82cc..62632d47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,39 +48,19 @@ AC_CHECK_SIZEOF([unsigned long])
 AC_CHECK_SIZEOF([unsigned long long])
 AC_CHECK_HEADERS([sys/mman.h sys/wait.h unistd.h])
 
-AC_CHECK_SIZEOF([long])
-
-dnl Generic dependency specification.
-AC_ARG_WITH(deps,
-	[AC_HELP_STRING([--with-deps], [generic dependency location])],
-	[DEPS="$withval"],
-	[DEPS="/opt/colm"]
-)
-
-EXPECTED_COLM_VER=0.14
-
 AC_ARG_WITH(colm,
 	[AC_HELP_STRING([--with-colm], [location of colm install])],
 	[
+		COLM="$withval/bin/colm"
+		COLM_WRAP="$withval/bin/colm-wrap"
 		CPPFLAGS="-I$withval/include ${CPPFLAGS}"
 		CPPFLAGS="-I$withval/include/aapl ${CPPFLAGS}"
 		LDFLAGS="-L$withval/lib ${LDFLAGS}"
-		COLM="$withval/bin/colm"
-		COLM_WRAP="$withval/bin/colm-wrap"
+		LIBCOLM_LA="$withval/lib/libcolm.la"
+		LIBFSM_LA="$withval/lib/libfsm.la"
 		COLM_SHARE="$withval/share"
-		LIBCOLM="$withval/lib/libcolm.a"
-		LIBFSM="$withval/lib/libfsm.a"
 	],
-	[
-		CPPFLAGS="${CPPFLAGS} -I$DEPS/include"
-		CPPFLAGS="${CPPFLAGS} -I$DEPS/include/aapl"
-		LDFLAGS="${LDFLAGS} -L$DEPS/lib"
-		COLM="$DEPS/bin/colm"
-		COLM_WRAP="$DEPS/bin/colm-wrap"
-		COLM_SHARE="$withval/share"
-		LIBCOLM="$DEPS/lib/libcolm.a"
-		LIBFSM="$DEPS/lib/libfsm.a"
-	]
+	[]
 )
 
 AC_CHECK_FILES(
@@ -91,9 +71,10 @@ AC_CHECK_FILES(
 AC_SUBST(COLM)
 AC_SUBST(COLM_WRAP)
 AC_SUBST(COLM_SHARE)
-AC_SUBST(LIBCOLM)
-AC_SUBST(LIBFSM)
+AC_SUBST(LIBCOLM_LA)
+AC_SUBST(LIBFSM_LA)
 
+EXPECTED_COLM_VER=0.14
 INSTALLED_COLM_VER=`$COLM -v | sed -n -e '1 {' -e 's/^.*version //' -e 's/ .*$//' -e p -e '}'`
 if test "x$INSTALLED_COLM_VER" != "x$EXPECTED_COLM_VER"; then
 	AC_ERROR( [check colm: expected version $EXPECTED_COLM_VER, but $INSTALLED_COLM_VER is installed] )
diff --git a/src/Makefile.am b/src/Makefile.am
index f654674f..52e0b6c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,6 @@
 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_BIN    = @COLM@
-COLM_WRAP   = @COLM_WRAP@
-COLM_LA     = @LIBCOLM@
-LIBFSM      = @LIBFSM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-KELBT       = @KELBT@
-RAGEL       = @RAGEL@
-
 # libragel contains the parse tree and other parsing support code. Everything
 # except the reducers, which are specific to the frontends.
 lib_LTLIBRARIES = libragel.la
@@ -30,7 +21,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) $(COLM_LA)
+libragel_la_LIBADD = $(LIBFSM_LA) $(LIBCOLM_LA)
 
 if LINKER_NO_UNDEFINED
 libragel_la_LDFLAGS += -Wl,--no-undefined
@@ -47,8 +38,8 @@ dist_ragel_SOURCES = \
 nodist_ragel_SOURCES = \
 	parse.c rlreduce.cc
 
-ragel_LDADD = libragel.la $(LIBFSM) $(COLM_LA)
-ragel_DEPENDENCIES = libragel.la $(LIBFSM) $(COLM_LIBDEP)
+ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
 
 BUILT_SOURCES = \
 	version.h \
@@ -90,7 +81,7 @@ RAGEL_LM = \
 	ragel.lm \
 	rlreduce.lm
 
-parse.pack: $(RAGEL_LM) $(COLM_BINDEP)
+parse.pack: $(RAGEL_LM) $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -b rlparseC -o $@ -p parse.c -m rlreduce.cc $<
 
 rlreduce.cc: parse.pack
diff --git a/src/host-asm/Makefile.am b/src/host-asm/Makefile.am
index c7e675ae..ef334bf3 100644
--- a/src/host-asm/Makefile.am
+++ b/src/host-asm/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-asm
 
 ragel_asm_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_asm_SOURCES = main.cc
 nodist_ragel_asm_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_asm_LDADD = ../libragel.la @LIBFSM@ $(COLM_LA)
+ragel_asm_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc
 
 EXTRA_DIST = rlparse.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseAsm -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
diff --git a/src/host-c/Makefile.am b/src/host-c/Makefile.am
index 8601a95f..e5309fe9 100644
--- a/src/host-c/Makefile.am
+++ b/src/host-c/Makefile.am
@@ -1,11 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM_WRAP@
-COLM_SHARE  = @COLM_SHARE@
-COLM_LA     = @LIBCOLM@
-LIBFSM      = @LIBFSM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-c
 
 ragel_c_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -15,13 +7,13 @@ dist_ragel_c_SOURCES = main.cc rlhc.c
 nodist_ragel_c_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_c_LDADD = ../libragel.la $(LIBCOLM) $(COLM_LA)
+ragel_c_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseC -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -31,4 +23,4 @@ rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
 rlhc.c: $(COLM_SHARE)/rlhc-c.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcC -o $@ $<
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcC -o $@ $<
diff --git a/src/host-crack/Makefile.am b/src/host-crack/Makefile.am
index fac52e0b..1da6a65f 100644
--- a/src/host-crack/Makefile.am
+++ b/src/host-crack/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-crack
 
 ragel_crack_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_crack_SOURCES = main.cc rlhc.c
 nodist_ragel_crack_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_crack_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_crack_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la 
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseCrack -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -29,4 +23,4 @@ rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
 rlhc.c: $(COLM_SHARE)/rlhc-crack.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcCrack -o $@ $<
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcCrack -o $@ $<
diff --git a/src/host-csharp/Makefile.am b/src/host-csharp/Makefile.am
index 21312026..845e4358 100644
--- a/src/host-csharp/Makefile.am
+++ b/src/host-csharp/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-csharp
 
 ragel_csharp_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_csharp_SOURCES = main.cc rlhc.c
 nodist_ragel_csharp_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_csharp_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_csharp_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la 
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseCSharp -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -28,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-csharp.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcCSharp -o $@ $<
+rlhc.c: $(COLM_SHARE)/rlhc-csharp.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcCSharp -o $@ $<
diff --git a/src/host-d/Makefile.am b/src/host-d/Makefile.am
index 221126ed..3f85a2bf 100644
--- a/src/host-d/Makefile.am
+++ b/src/host-d/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-d
 
 ragel_d_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_d_SOURCES = main.cc rlhc.c
 nodist_ragel_d_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_d_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_d_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la 
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseD -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -28,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-d.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
+rlhc.c: $(COLM_SHARE)/rlhc-d.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
 	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcD -o $@ $<
diff --git a/src/host-go/Makefile.am b/src/host-go/Makefile.am
index e4444882..6e3a2339 100644
--- a/src/host-go/Makefile.am
+++ b/src/host-go/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-go
 
 data_DATA = out-go.lm
@@ -15,13 +9,13 @@ dist_ragel_go_SOURCES = main.cc rlhc.c
 nodist_ragel_go_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_go_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_go_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la 
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm out-go.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseGo -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -30,5 +24,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-go.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcGo -o $@ $<
+rlhc.c: $(COLM_SHARE)/rlhc-go.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcGo -o $@ $<
diff --git a/src/host-java/Makefile.am b/src/host-java/Makefile.am
index e09bcfc3..c0377757 100644
--- a/src/host-java/Makefile.am
+++ b/src/host-java/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-java
 
 ragel_java_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_java_SOURCES = main.cc rlhc.c
 nodist_ragel_java_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_java_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_java_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseJava -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -28,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-java.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
+rlhc.c: $(COLM_SHARE)/rlhc-java.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
 	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcJava -o $@ $<
diff --git a/src/host-js/Makefile.am b/src/host-js/Makefile.am
index 5e7f30ab..7433f80d 100644
--- a/src/host-js/Makefile.am
+++ b/src/host-js/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-js
 
 ragel_js_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_js_SOURCES = main.cc rlhc.c
 nodist_ragel_js_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_js_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_js_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseJs -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -28,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-js.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
+rlhc.c: $(COLM_SHARE)/rlhc-js.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
 	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcJs -o $@ $<
diff --git a/src/host-julia/Makefile.am b/src/host-julia/Makefile.am
index 70ee94c2..2af9dd5d 100644
--- a/src/host-julia/Makefile.am
+++ b/src/host-julia/Makefile.am
@@ -1,10 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM_WRAP@
-COLM_SHARE  = @COLM_SHARE@
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-julia
 
 ragel_julia_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -14,13 +7,13 @@ dist_ragel_julia_SOURCES = main.cc rlhc.c
 nodist_ragel_julia_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_julia_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_julia_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseJulia -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -29,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-julia.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcJulia -o $@ $<
+rlhc.c: $(COLM_SHARE)/rlhc-julia.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcJulia -o $@ $<
diff --git a/src/host-ocaml/Makefile.am b/src/host-ocaml/Makefile.am
index a96fb33e..606d2137 100644
--- a/src/host-ocaml/Makefile.am
+++ b/src/host-ocaml/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM_WRAP@
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-ocaml
 
 ragel_ocaml_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_ocaml_SOURCES = main.cc rlhc.c
 nodist_ragel_ocaml_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_ocaml_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_ocaml_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseOCaml -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -28,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-ocaml.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcOCaml -o $@ $<
+rlhc.c: $(COLM_SHARE)/rlhc-ocaml.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcOCaml -o $@ $<
diff --git a/src/host-ruby/Makefile.am b/src/host-ruby/Makefile.am
index 06ad823a..9825cac0 100644
--- a/src/host-ruby/Makefile.am
+++ b/src/host-ruby/Makefile.am
@@ -1,10 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM_WRAP@
-COLM_SHARE  = @COLM_SHARE@
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-ruby
 
 ragel_ruby_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -14,13 +7,13 @@ dist_ragel_ruby_SOURCES = main.cc rlhc.c
 nodist_ragel_ruby_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_ruby_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_ruby_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseRuby -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -29,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-ruby.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
-	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcRuby -o $@ $<
+rlhc.c: $(COLM_SHARE)/rlhc-ruby.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
+	$(COLM) -c -I $(COLM_SHARE) -b rlhcRuby -o $@ $<
diff --git a/src/host-rust/Makefile.am b/src/host-rust/Makefile.am
index 905df913..ccafba9d 100644
--- a/src/host-rust/Makefile.am
+++ b/src/host-rust/Makefile.am
@@ -1,9 +1,3 @@
-COLM_BIN    = @COLM@
-COLM_WRAP   = @COLM@-wrap
-COLM_LA     = @LIBCOLM@
-COLM_LIBDEP = $(COLM_LA)
-COLM_BINDEP = $(COLM_BIN) $(COLM_WRAP)
-
 bin_PROGRAMS = ragel-rust
 
 ragel_rust_CPPFLAGS = -I$(top_srcdir)/aapl -I$(top_srcdir)/ragel -I$(top_srcdir)/colm/include
@@ -13,13 +7,13 @@ dist_ragel_rust_SOURCES = main.cc rlhc.c
 nodist_ragel_rust_SOURCES = \
 	rlparse.c rlreduce.cc
 
-ragel_rust_LDADD = ../libragel.la @LIBCOLM@ $(COLM_LA)
+ragel_rust_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) ../libragel.la
 
 BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
 
 EXTRA_DIST = rlparse.lm rlhc.lm
 
-rlparse.pack: rlparse.lm $(COLM_BINDEP)
+rlparse.pack: rlparse.lm $(COLM) $(COLM_WRAP)
 	$(COLM_WRAP) -c -I .. -b rlparseRust -o $@ -p rlparse.c -m rlreduce.cc $<
 
 rlparse.c: rlparse.pack
@@ -28,5 +22,5 @@ rlparse.c: rlparse.pack
 rlreduce.cc: rlparse.pack
 	$(COLM_WRAP) -o $@ $<
 
-rlhc.c: $(COLM_SHARE)/rlhc-rust.lm $(COLM_SHARE)/ril.lm $(COLM_BINDEP)
+rlhc.c: $(COLM_SHARE)/rlhc-rust.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP)
 	$(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcRust -o $@ $<