diff options
author | Adrian Thurston <thurston@colm.net> | 2020-06-28 11:36:20 +0300 |
---|---|---|
committer | Adrian Thurston <thurston@colm.net> | 2020-06-28 11:36:20 +0300 |
commit | 401cb0041f5871215d83c64ab5e021149078e426 (patch) | |
tree | cf01312b8358362ad770b76c441f858785c32557 | |
parent | cc16042c05e241d1ad02551718fe458fce9f5555 (diff) | |
download | ragel-401cb0041f5871215d83c64ab5e021149078e426.tar.gz |
updated colm exptected version and fixed some makefile paths
-rw-r--r-- | configure.ac | 34 | ||||
-rw-r--r-- | src/host-d/Makefile.am | 2 | ||||
-rw-r--r-- | src/host-java/Makefile.am | 2 | ||||
-rw-r--r-- | src/host-js/Makefile.am | 2 | ||||
-rw-r--r-- | src/host-rust/Makefile.am | 2 | ||||
-rw-r--r-- | test/ragel.d/Makefile.am | 2 |
6 files changed, 22 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 62632d47..65d46f9c 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AC_SUBST(COLM_SHARE) AC_SUBST(LIBCOLM_LA) AC_SUBST(LIBFSM_LA) -EXPECTED_COLM_VER=0.14 +EXPECTED_COLM_VER=0.14.1 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] ) @@ -224,22 +224,22 @@ AC_ARG_WITH(subject, 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' + SUBJ_RAGEL_BIN='$(abs_top_builddir)/src/ragel' + SUBJ_RAGEL_CPPFLAGS='-I$(abs_top_builddir)/src/include -I$(abs_top_builddir)/aapl' + SUBJ_RAGEL_LDFLAGS='-L$(abs_top_builddir)/src/.libs -Wl,-rpath,$(abs_top_builddir)/src/.libs' + SUBJ_RAGEL_LM='$(abs_top_builddir)/src' + + SUBJ_RAGEL_C_BIN='$(abs_top_builddir)/src/host-c/ragel-c' + SUBJ_RAGEL_D_BIN='$(abs_top_builddir)/src/host-d/ragel-d' + SUBJ_RAGEL_JAVA_BIN='$(abs_top_builddir)/src/host-java/ragel-java' + SUBJ_RAGEL_RUBY_BIN='$(abs_top_builddir)/src/host-ruby/ragel-ruby' + SUBJ_RAGEL_CSHARP_BIN='$(abs_top_builddir)/src/host-csharp/ragel-csharp' + SUBJ_RAGEL_GO_BIN='$(abs_top_builddir)/src/host-go/ragel-go' + SUBJ_RAGEL_OCAML_BIN='$(abs_top_builddir)/src/host-ocaml/ragel-ocaml' + SUBJ_RAGEL_ASM_BIN='$(abs_top_builddir)/src/host-asm/ragel-asm' + SUBJ_RAGEL_RUST_BIN='$(abs_top_builddir)/src/host-rust/ragel-rust' + SUBJ_RAGEL_CRACK_BIN='$(abs_top_builddir)/src/host-crack/ragel-crack' + SUBJ_RAGEL_JULIA_BIN='$(abs_top_builddir)/src/host-julia/ragel-julia' ] ) diff --git a/src/host-d/Makefile.am b/src/host-d/Makefile.am index 3f85a2bf..6f2065f0 100644 --- a/src/host-d/Makefile.am +++ b/src/host-d/Makefile.am @@ -23,4 +23,4 @@ rlreduce.cc: rlparse.pack $(COLM_WRAP) -o $@ $< rlhc.c: $(COLM_SHARE)/rlhc-d.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP) - $(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcD -o $@ $< + $(COLM) -c -I $(COLM_SHARE) -b rlhcD -o $@ $< diff --git a/src/host-java/Makefile.am b/src/host-java/Makefile.am index c0377757..fe7a5f87 100644 --- a/src/host-java/Makefile.am +++ b/src/host-java/Makefile.am @@ -23,4 +23,4 @@ rlreduce.cc: rlparse.pack $(COLM_WRAP) -o $@ $< rlhc.c: $(COLM_SHARE)/rlhc-java.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP) - $(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcJava -o $@ $< + $(COLM) -c -I $(COLM_SHARE) -b rlhcJava -o $@ $< diff --git a/src/host-js/Makefile.am b/src/host-js/Makefile.am index 7433f80d..72d682b4 100644 --- a/src/host-js/Makefile.am +++ b/src/host-js/Makefile.am @@ -23,4 +23,4 @@ rlreduce.cc: rlparse.pack $(COLM_WRAP) -o $@ $< rlhc.c: $(COLM_SHARE)/rlhc-js.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP) - $(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcJs -o $@ $< + $(COLM) -c -I $(COLM_SHARE) -b rlhcJs -o $@ $< diff --git a/src/host-rust/Makefile.am b/src/host-rust/Makefile.am index ccafba9d..55b7c78a 100644 --- a/src/host-rust/Makefile.am +++ b/src/host-rust/Makefile.am @@ -23,4 +23,4 @@ rlreduce.cc: rlparse.pack $(COLM_WRAP) -o $@ $< rlhc.c: $(COLM_SHARE)/rlhc-rust.lm $(COLM_SHARE)/ril.lm $(COLM) $(COLM_WRAP) - $(COLM_BIN) -c -I $(COLM_SHARE) -b rlhcRust -o $@ $< + $(COLM) -c -I $(COLM_SHARE) -b rlhcRust -o $@ $< diff --git a/test/ragel.d/Makefile.am b/test/ragel.d/Makefile.am index f6845367..f581a909 100644 --- a/test/ragel.d/Makefile.am +++ b/test/ragel.d/Makefile.am @@ -80,7 +80,7 @@ trans_LDADD = -lcolm trans_LDFLAGS = $(COLM_xLDFLAGS) trans.c: trans.lm $(TRANS_DEPS) $(COLM_BIN) - $(COLM_BIN) -c -b trans_object -I$(RAGEL_LM) -I../../ragel/host-go -o $@ $< + $(COLM_BIN) -c -b trans_object -I$(RAGEL_LM) -I../../src/host-go -o $@ $< gentests: gentests.sh Makefile @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) |