summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile.am4
-rw-r--r--src/flatgoto.cc3
-rw-r--r--src/flatvar.cc1
-rw-r--r--src/host-asm/Makefile.am4
-rw-r--r--src/host-c/Makefile.am7
-rw-r--r--src/host-crack/Makefile.am4
-rw-r--r--src/host-csharp/Makefile.am4
-rw-r--r--src/host-d/Makefile.am4
-rw-r--r--src/host-go/Makefile.am4
-rw-r--r--src/host-java/Makefile.am4
-rw-r--r--src/host-js/Makefile.am4
-rw-r--r--src/host-julia/Makefile.am4
-rw-r--r--src/host-ocaml/Makefile.am4
-rw-r--r--src/host-ruby/Makefile.am4
-rw-r--r--src/host-rust/Makefile.am4
16 files changed, 41 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac
index ef7d3b21..8294d3e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,10 +20,10 @@ dnl OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN TH
dnl SOFTWARE.
dnl
-AC_INIT(ragel, 7.0.0.10)
-PUBDATE="May 2017"
+AC_INIT(ragel, 7.0.0.11)
+PUBDATE="May 2018"
-EXPECTED_COLM=0.13.0.5
+EXPECTED_COLM=0.13.0.6
AM_INIT_AUTOMAKE([foreign])
AC_SUBST(PUBDATE)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0648784a..693837c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,8 +40,8 @@ dist_libfsm_la_SOURCES = \
actloop.h actexp.h \
tables.h \
binary.h bingoto.h binvar.h \
- flat.h flatgoto.h flatgotoloop.h flatgotoexp.h flatvar.h \
- flatvarloop.h flatvarexp.h goto.h gotoloop.h gotoexp.h \
+ flat.h flatgoto.h flatvar.h \
+ goto.h gotoloop.h gotoexp.h \
ipgoto.h asm.h \
idbase.cc fsmstate.cc fsmbase.cc fsmattach.cc fsmmin.cc fsmgraph.cc \
fsmap.cc fsmcond.cc fsmnfa.cc common.cc redfsm.cc gendata.cc \
diff --git a/src/flatgoto.cc b/src/flatgoto.cc
index 42d53e7e..74059f38 100644
--- a/src/flatgoto.cc
+++ b/src/flatgoto.cc
@@ -142,6 +142,3 @@ void FlatGoto::LOCATE_TRANS()
" goto _match_cond;\n"
;
}
-
-
-
diff --git a/src/flatvar.cc b/src/flatvar.cc
index cbb91e21..85e9b41e 100644
--- a/src/flatvar.cc
+++ b/src/flatvar.cc
@@ -25,7 +25,6 @@
#include "parsedata.h"
#include "inputdata.h"
-
void FlatVar::LOCATE_TRANS()
{
if ( redFsm->classMap == 0 ) {
diff --git a/src/host-asm/Makefile.am b/src/host-asm/Makefile.am
index 391e3c1a..71d4440f 100644
--- a/src/host-asm/Makefile.am
+++ b/src/host-asm/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-asm
+bin_PROGRAMS = ragel-asm
ragel_asm_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_asm_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc
+EXTRA_DIST = rlparse.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-c/Makefile.am b/src/host-c/Makefile.am
index c73bdf7e..21fab939 100644
--- a/src/host-c/Makefile.am
+++ b/src/host-c/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-c
+bin_PROGRAMS = ragel-c
ragel_c_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,13 +16,12 @@ ragel_c_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc
+EXTRA_DIST = rlparse.lm rlhc-c.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
rlreduce.cc: rlparse.c
-rlhc$(EXEEXT): rlhc.lm
- $(COLM) -I.. -o $@ $<
-
rlhc.c: rlhc-c.lm
$(COLM) -I.. -c -b rlhc -o $@ $<
diff --git a/src/host-crack/Makefile.am b/src/host-crack/Makefile.am
index c3272ffd..989cb560 100644
--- a/src/host-crack/Makefile.am
+++ b/src/host-crack/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-crack
+bin_PROGRAMS = ragel-crack
ragel_crack_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_crack_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-crack.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-csharp/Makefile.am b/src/host-csharp/Makefile.am
index 2b0e1ad2..0b15379f 100644
--- a/src/host-csharp/Makefile.am
+++ b/src/host-csharp/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-csharp
+bin_PROGRAMS = ragel-csharp
ragel_csharp_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_csharp_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-csharp.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-d/Makefile.am b/src/host-d/Makefile.am
index 0f1f9463..83d22fda 100644
--- a/src/host-d/Makefile.am
+++ b/src/host-d/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-d
+bin_PROGRAMS = ragel-d
ragel_d_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_d_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-d.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-go/Makefile.am b/src/host-go/Makefile.am
index 776f1f9c..91faa981 100644
--- a/src/host-go/Makefile.am
+++ b/src/host-go/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-go
+bin_PROGRAMS = ragel-go
ragel_go_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_go_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-go.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-java/Makefile.am b/src/host-java/Makefile.am
index 55dd6d64..345d8813 100644
--- a/src/host-java/Makefile.am
+++ b/src/host-java/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-java
+bin_PROGRAMS = ragel-java
ragel_java_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_java_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-java.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-js/Makefile.am b/src/host-js/Makefile.am
index 6511fcc8..98f07553 100644
--- a/src/host-js/Makefile.am
+++ b/src/host-js/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-js
+bin_PROGRAMS = ragel-js
ragel_js_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_js_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-js.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-julia/Makefile.am b/src/host-julia/Makefile.am
index 995d0467..ffd7dd91 100644
--- a/src/host-julia/Makefile.am
+++ b/src/host-julia/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-julia
+bin_PROGRAMS = ragel-julia
ragel_julia_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_julia_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-julia.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-ocaml/Makefile.am b/src/host-ocaml/Makefile.am
index 9aaae75b..9ff43b11 100644
--- a/src/host-ocaml/Makefile.am
+++ b/src/host-ocaml/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-ocaml
+bin_PROGRAMS = ragel-ocaml
ragel_ocaml_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_ocaml_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-ocaml.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-ruby/Makefile.am b/src/host-ruby/Makefile.am
index 6fcc381d..e10fc4a7 100644
--- a/src/host-ruby/Makefile.am
+++ b/src/host-ruby/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-ruby
+bin_PROGRAMS = ragel-ruby
ragel_ruby_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_ruby_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-ruby.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
diff --git a/src/host-rust/Makefile.am b/src/host-rust/Makefile.am
index 08329c52..6b03a862 100644
--- a/src/host-rust/Makefile.am
+++ b/src/host-rust/Makefile.am
@@ -3,7 +3,7 @@ COLM_LD = @COLM_LD@
COLM_LIBDEP = @COLM_LIBDEP@
COLM_BINDEP = @COLM_BINDEP@
-noinst_PROGRAMS = ragel-rust
+bin_PROGRAMS = ragel-rust
ragel_rust_CPPFLAGS = -I$(top_srcdir)/aapl
@@ -16,6 +16,8 @@ ragel_rust_LDADD = ../libragel.la ../libfsm.la $(COLM_LD)
BUILT_SOURCES = rlparse.c rlreduce.cc rlhc.c
+EXTRA_DIST = rlparse.lm rlhc-rust.lm
+
rlparse.c: rlparse.lm $(COLM_BINDEP)
$(COLM) -I.. -c -b rl_parse -o $@ -m rlreduce.cc $<
View Lorry Controller Status