summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@colm.net>2020-10-18 11:44:43 -0700
committerAdrian Thurston <thurston@colm.net>2020-10-18 11:44:43 -0700
commit85b76476de71f43d3eb25d6bef4ee6d84cb71f6c (patch)
tree65c127fbcf70e62d8a4848be2c9c4ff7d74d86a1
parent86bb5882a70224a29650ccfa1e46c9b023c2a3ef (diff)
downloadcolm-into-src.tar.gz
lift all source code into src/ dirinto-src
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac10
-rw-r--r--src/Makefile.am4
-rw-r--r--src/aapl/.gitignore (renamed from aapl/.gitignore)0
-rw-r--r--src/aapl/COPYING (renamed from aapl/COPYING)0
-rw-r--r--src/aapl/ChangeLog (renamed from aapl/ChangeLog)0
-rw-r--r--src/aapl/Makefile.am (renamed from aapl/Makefile.am)0
-rw-r--r--src/aapl/README (renamed from aapl/README)0
-rw-r--r--src/aapl/astring.h (renamed from aapl/astring.h)0
-rw-r--r--src/aapl/avlbasic.h (renamed from aapl/avlbasic.h)0
-rw-r--r--src/aapl/avlcommon.h (renamed from aapl/avlcommon.h)0
-rw-r--r--src/aapl/avlibasic.h (renamed from aapl/avlibasic.h)0
-rw-r--r--src/aapl/avlikeyless.h (renamed from aapl/avlikeyless.h)0
-rw-r--r--src/aapl/avlimap.h (renamed from aapl/avlimap.h)0
-rw-r--r--src/aapl/avlimel.h (renamed from aapl/avlimel.h)0
-rw-r--r--src/aapl/avlimelkey.h (renamed from aapl/avlimelkey.h)0
-rw-r--r--src/aapl/avliset.h (renamed from aapl/avliset.h)0
-rw-r--r--src/aapl/avlitree.h (renamed from aapl/avlitree.h)0
-rw-r--r--src/aapl/avlkeyless.h (renamed from aapl/avlkeyless.h)0
-rw-r--r--src/aapl/avlmap.h (renamed from aapl/avlmap.h)0
-rw-r--r--src/aapl/avlmel.h (renamed from aapl/avlmel.h)0
-rw-r--r--src/aapl/avlmelkey.h (renamed from aapl/avlmelkey.h)0
-rw-r--r--src/aapl/avlset.h (renamed from aapl/avlset.h)0
-rw-r--r--src/aapl/avltree.h (renamed from aapl/avltree.h)0
-rw-r--r--src/aapl/bstcommon.h (renamed from aapl/bstcommon.h)0
-rw-r--r--src/aapl/bstmap.h (renamed from aapl/bstmap.h)0
-rw-r--r--src/aapl/bstset.h (renamed from aapl/bstset.h)0
-rw-r--r--src/aapl/bsttable.h (renamed from aapl/bsttable.h)0
-rw-r--r--src/aapl/bubblesort.h (renamed from aapl/bubblesort.h)0
-rw-r--r--src/aapl/buffer.h (renamed from aapl/buffer.h)0
-rw-r--r--src/aapl/compare.h (renamed from aapl/compare.h)0
-rw-r--r--src/aapl/dlcommon.h (renamed from aapl/dlcommon.h)0
-rw-r--r--src/aapl/dlist.h (renamed from aapl/dlist.h)0
-rw-r--r--src/aapl/dlistmel.h (renamed from aapl/dlistmel.h)0
-rw-r--r--src/aapl/dlistval.h (renamed from aapl/dlistval.h)0
-rw-r--r--src/aapl/insertsort.h (renamed from aapl/insertsort.h)0
-rw-r--r--src/aapl/mergesort.h (renamed from aapl/mergesort.h)0
-rw-r--r--src/aapl/quicksort.h (renamed from aapl/quicksort.h)0
-rw-r--r--src/aapl/resize.h (renamed from aapl/resize.h)0
-rw-r--r--src/aapl/rope.h (renamed from aapl/rope.h)0
-rw-r--r--src/aapl/sbstmap.h (renamed from aapl/sbstmap.h)0
-rw-r--r--src/aapl/sbstset.h (renamed from aapl/sbstset.h)0
-rw-r--r--src/aapl/sbsttable.h (renamed from aapl/sbsttable.h)0
-rw-r--r--src/aapl/svector.h (renamed from aapl/svector.h)0
-rw-r--r--src/aapl/table.h (renamed from aapl/table.h)0
-rw-r--r--src/aapl/vector.h (renamed from aapl/vector.h)0
-rw-r--r--src/aapl/version.mk (renamed from aapl/version.mk)0
-rw-r--r--src/cgil/.gitignore (renamed from cgil/.gitignore)0
-rw-r--r--src/cgil/Makefile.am (renamed from cgil/Makefile.am)0
-rw-r--r--src/cgil/ragel.lm (renamed from cgil/ragel.lm)0
-rw-r--r--src/cgil/ril.lm (renamed from cgil/ril.lm)0
-rw-r--r--src/cgil/rlhc-c.lm (renamed from cgil/rlhc-c.lm)0
-rw-r--r--src/cgil/rlhc-crack.lm (renamed from cgil/rlhc-crack.lm)0
-rw-r--r--src/cgil/rlhc-csharp.lm (renamed from cgil/rlhc-csharp.lm)0
-rw-r--r--src/cgil/rlhc-d.lm (renamed from cgil/rlhc-d.lm)0
-rw-r--r--src/cgil/rlhc-go.lm (renamed from cgil/rlhc-go.lm)0
-rw-r--r--src/cgil/rlhc-java.lm (renamed from cgil/rlhc-java.lm)0
-rw-r--r--src/cgil/rlhc-js.lm (renamed from cgil/rlhc-js.lm)0
-rw-r--r--src/cgil/rlhc-julia.lm (renamed from cgil/rlhc-julia.lm)0
-rw-r--r--src/cgil/rlhc-main.lm (renamed from cgil/rlhc-main.lm)0
-rw-r--r--src/cgil/rlhc-ocaml.lm (renamed from cgil/rlhc-ocaml.lm)0
-rw-r--r--src/cgil/rlhc-ruby.lm (renamed from cgil/rlhc-ruby.lm)0
-rw-r--r--src/cgil/rlhc-rust.lm (renamed from cgil/rlhc-rust.lm)0
-rw-r--r--src/libfsm/.exrc (renamed from libfsm/.exrc)0
-rw-r--r--src/libfsm/.gitignore (renamed from libfsm/.gitignore)0
-rw-r--r--src/libfsm/CMakeLists.txt (renamed from libfsm/CMakeLists.txt)0
-rw-r--r--src/libfsm/Makefile.am (renamed from libfsm/Makefile.am)2
-rw-r--r--src/libfsm/actexp.cc (renamed from libfsm/actexp.cc)0
-rw-r--r--src/libfsm/actexp.h (renamed from libfsm/actexp.h)0
-rw-r--r--src/libfsm/action.h (renamed from libfsm/action.h)0
-rw-r--r--src/libfsm/actloop.cc (renamed from libfsm/actloop.cc)0
-rw-r--r--src/libfsm/actloop.h (renamed from libfsm/actloop.h)0
-rw-r--r--src/libfsm/allocgen.cc (renamed from libfsm/allocgen.cc)0
-rw-r--r--src/libfsm/asm.cc (renamed from libfsm/asm.cc)0
-rw-r--r--src/libfsm/asm.h (renamed from libfsm/asm.h)0
-rw-r--r--src/libfsm/binary.cc (renamed from libfsm/binary.cc)0
-rw-r--r--src/libfsm/binary.h (renamed from libfsm/binary.h)0
-rw-r--r--src/libfsm/binbreak.cc (renamed from libfsm/binbreak.cc)0
-rw-r--r--src/libfsm/binbreak.h (renamed from libfsm/binbreak.h)0
-rw-r--r--src/libfsm/bingoto.cc (renamed from libfsm/bingoto.cc)0
-rw-r--r--src/libfsm/bingoto.h (renamed from libfsm/bingoto.h)0
-rw-r--r--src/libfsm/binvar.cc (renamed from libfsm/binvar.cc)0
-rw-r--r--src/libfsm/binvar.h (renamed from libfsm/binvar.h)0
-rw-r--r--src/libfsm/codegen.cc (renamed from libfsm/codegen.cc)0
-rw-r--r--src/libfsm/codegen.h (renamed from libfsm/codegen.h)0
-rw-r--r--src/libfsm/common.cc (renamed from libfsm/common.cc)0
-rw-r--r--src/libfsm/common.h (renamed from libfsm/common.h)0
-rw-r--r--src/libfsm/config.h.cmake.in (renamed from libfsm/config.h.cmake.in)0
-rw-r--r--src/libfsm/dot.cc (renamed from libfsm/dot.cc)0
-rw-r--r--src/libfsm/dot.h (renamed from libfsm/dot.h)0
-rw-r--r--src/libfsm/flat.cc (renamed from libfsm/flat.cc)0
-rw-r--r--src/libfsm/flat.h (renamed from libfsm/flat.h)0
-rw-r--r--src/libfsm/flatbreak.cc (renamed from libfsm/flatbreak.cc)0
-rw-r--r--src/libfsm/flatbreak.h (renamed from libfsm/flatbreak.h)0
-rw-r--r--src/libfsm/flatgoto.cc (renamed from libfsm/flatgoto.cc)0
-rw-r--r--src/libfsm/flatgoto.h (renamed from libfsm/flatgoto.h)0
-rw-r--r--src/libfsm/flatvar.cc (renamed from libfsm/flatvar.cc)0
-rw-r--r--src/libfsm/flatvar.h (renamed from libfsm/flatvar.h)0
-rw-r--r--src/libfsm/fsmap.cc (renamed from libfsm/fsmap.cc)0
-rw-r--r--src/libfsm/fsmattach.cc (renamed from libfsm/fsmattach.cc)0
-rw-r--r--src/libfsm/fsmbase.cc (renamed from libfsm/fsmbase.cc)0
-rw-r--r--src/libfsm/fsmcond.cc (renamed from libfsm/fsmcond.cc)0
-rw-r--r--src/libfsm/fsmgraph.cc (renamed from libfsm/fsmgraph.cc)0
-rw-r--r--src/libfsm/fsmgraph.h (renamed from libfsm/fsmgraph.h)0
-rw-r--r--src/libfsm/fsmmin.cc (renamed from libfsm/fsmmin.cc)0
-rw-r--r--src/libfsm/fsmnfa.cc (renamed from libfsm/fsmnfa.cc)0
-rw-r--r--src/libfsm/fsmstate.cc (renamed from libfsm/fsmstate.cc)0
-rw-r--r--src/libfsm/gendata.cc (renamed from libfsm/gendata.cc)0
-rw-r--r--src/libfsm/gendata.h (renamed from libfsm/gendata.h)0
-rw-r--r--src/libfsm/goto.cc (renamed from libfsm/goto.cc)0
-rw-r--r--src/libfsm/goto.h (renamed from libfsm/goto.h)0
-rw-r--r--src/libfsm/gotoexp.cc (renamed from libfsm/gotoexp.cc)0
-rw-r--r--src/libfsm/gotoexp.h (renamed from libfsm/gotoexp.h)0
-rw-r--r--src/libfsm/gotoloop.cc (renamed from libfsm/gotoloop.cc)0
-rw-r--r--src/libfsm/gotoloop.h (renamed from libfsm/gotoloop.h)0
-rw-r--r--src/libfsm/idbase.cc (renamed from libfsm/idbase.cc)0
-rw-r--r--src/libfsm/idbase.h (renamed from libfsm/idbase.h)0
-rw-r--r--src/libfsm/ipgoto.cc (renamed from libfsm/ipgoto.cc)0
-rw-r--r--src/libfsm/ipgoto.h (renamed from libfsm/ipgoto.h)0
-rw-r--r--src/libfsm/parsedata.h (renamed from libfsm/parsedata.h)0
-rw-r--r--src/libfsm/ragel-config.cmake.in (renamed from libfsm/ragel-config.cmake.in)0
-rw-r--r--src/libfsm/ragel.h (renamed from libfsm/ragel.h)0
-rw-r--r--src/libfsm/redfsm.cc (renamed from libfsm/redfsm.cc)0
-rw-r--r--src/libfsm/redfsm.h (renamed from libfsm/redfsm.h)0
-rw-r--r--src/libfsm/switch.cc (renamed from libfsm/switch.cc)0
-rw-r--r--src/libfsm/switch.h (renamed from libfsm/switch.h)0
-rw-r--r--src/libfsm/switchbreak.cc (renamed from libfsm/switchbreak.cc)0
-rw-r--r--src/libfsm/switchbreak.h (renamed from libfsm/switchbreak.h)0
-rw-r--r--src/libfsm/switchgoto.cc (renamed from libfsm/switchgoto.cc)0
-rw-r--r--src/libfsm/switchgoto.h (renamed from libfsm/switchgoto.h)0
-rw-r--r--src/libfsm/switchvar.cc (renamed from libfsm/switchvar.cc)0
-rw-r--r--src/libfsm/switchvar.h (renamed from libfsm/switchvar.h)0
-rw-r--r--src/libfsm/tabbreak.cc (renamed from libfsm/tabbreak.cc)0
-rw-r--r--src/libfsm/tabgoto.cc (renamed from libfsm/tabgoto.cc)0
-rw-r--r--src/libfsm/tables.cc (renamed from libfsm/tables.cc)0
-rw-r--r--src/libfsm/tables.h (renamed from libfsm/tables.h)0
-rw-r--r--src/libfsm/tabvar.cc (renamed from libfsm/tabvar.cc)0
137 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index c57c4071..0eb09cb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-SUBDIRS = aapl libfsm src cgil doc test
+SUBDIRS = src doc test
dist_doc_DATA = colm.vim
EXTRA_DIST = colm.vim sedsubst
diff --git a/configure.ac b/configure.ac
index a9b80e08..e3af1e4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,14 +189,14 @@ AC_ARG_WITH(subject,
SUBJ_RAGEL_JULIA_BIN="$withval/bin/ragel-julia"
],
[
- SUBJ_AAPL_CPPFLAGS='-I$(abs_top_builddir)/aapl'
+ SUBJ_AAPL_CPPFLAGS='-I$(abs_top_builddir)/src/aapl'
SUBJ_COLM_BIN='$(abs_top_builddir)/src/colm'
SUBJ_COLM_CPPFLAGS='-I$(abs_top_builddir)/src/include'
SUBJ_COLM_LDFLAGS='-L$(abs_top_builddir)/src/.libs -Wl,-rpath,${abs_top_builddir}/src/.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_CPPFLAGS='-I$(abs_top_builddir)/ragel/include -I$(abs_top_builddir)/src/aapl'
SUBJ_RAGEL_LDFLAGS='-L$(abs_top_builddir)/ragel/.libs -Wl,-rpath,$(abs_top_builddir)/ragel/.libs'
SUBJ_RAGEL_LM='$(abs_top_builddir)/ragel'
@@ -414,10 +414,10 @@ AC_SUBST(SED_SUBST)
AC_CONFIG_HEADERS([src/config.h src/defs.h])
AC_OUTPUT([
Makefile
- aapl/Makefile
- libfsm/Makefile
+ src/aapl/Makefile
+ src/libfsm/Makefile
+ src/cgil/Makefile
src/Makefile
- cgil/Makefile
test/Makefile
test/aapl.d/Makefile
test/colm.d/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a53f040..bc43d75d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,9 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-AM_CPPFLAGS = -I$(top_srcdir)/aapl
+SUBDIRS = aapl libfsm cgil
+
+AM_CPPFLAGS = -I$(top_srcdir)/src/aapl
AUTOMAKE_OPTIONS = subdir-objects
diff --git a/aapl/.gitignore b/src/aapl/.gitignore
index b336cc7c..b336cc7c 100644
--- a/aapl/.gitignore
+++ b/src/aapl/.gitignore
diff --git a/aapl/COPYING b/src/aapl/COPYING
index e246673a..e246673a 100644
--- a/aapl/COPYING
+++ b/src/aapl/COPYING
diff --git a/aapl/ChangeLog b/src/aapl/ChangeLog
index 483ad825..483ad825 100644
--- a/aapl/ChangeLog
+++ b/src/aapl/ChangeLog
diff --git a/aapl/Makefile.am b/src/aapl/Makefile.am
index b3cd0c94..b3cd0c94 100644
--- a/aapl/Makefile.am
+++ b/src/aapl/Makefile.am
diff --git a/aapl/README b/src/aapl/README
index a2fa5e65..a2fa5e65 100644
--- a/aapl/README
+++ b/src/aapl/README
diff --git a/aapl/astring.h b/src/aapl/astring.h
index 29d876f4..29d876f4 100644
--- a/aapl/astring.h
+++ b/src/aapl/astring.h
diff --git a/aapl/avlbasic.h b/src/aapl/avlbasic.h
index 4e31dd97..4e31dd97 100644
--- a/aapl/avlbasic.h
+++ b/src/aapl/avlbasic.h
diff --git a/aapl/avlcommon.h b/src/aapl/avlcommon.h
index a1f86692..a1f86692 100644
--- a/aapl/avlcommon.h
+++ b/src/aapl/avlcommon.h
diff --git a/aapl/avlibasic.h b/src/aapl/avlibasic.h
index 5f9b2c7f..5f9b2c7f 100644
--- a/aapl/avlibasic.h
+++ b/src/aapl/avlibasic.h
diff --git a/aapl/avlikeyless.h b/src/aapl/avlikeyless.h
index 8d90443b..8d90443b 100644
--- a/aapl/avlikeyless.h
+++ b/src/aapl/avlikeyless.h
diff --git a/aapl/avlimap.h b/src/aapl/avlimap.h
index f2b1b0c5..f2b1b0c5 100644
--- a/aapl/avlimap.h
+++ b/src/aapl/avlimap.h
diff --git a/aapl/avlimel.h b/src/aapl/avlimel.h
index 9a7ff951..9a7ff951 100644
--- a/aapl/avlimel.h
+++ b/src/aapl/avlimel.h
diff --git a/aapl/avlimelkey.h b/src/aapl/avlimelkey.h
index 41d4ae49..41d4ae49 100644
--- a/aapl/avlimelkey.h
+++ b/src/aapl/avlimelkey.h
diff --git a/aapl/avliset.h b/src/aapl/avliset.h
index e309c3ad..e309c3ad 100644
--- a/aapl/avliset.h
+++ b/src/aapl/avliset.h
diff --git a/aapl/avlitree.h b/src/aapl/avlitree.h
index 54c8f30f..54c8f30f 100644
--- a/aapl/avlitree.h
+++ b/src/aapl/avlitree.h
diff --git a/aapl/avlkeyless.h b/src/aapl/avlkeyless.h
index 9ba769c2..9ba769c2 100644
--- a/aapl/avlkeyless.h
+++ b/src/aapl/avlkeyless.h
diff --git a/aapl/avlmap.h b/src/aapl/avlmap.h
index 9b52c8ba..9b52c8ba 100644
--- a/aapl/avlmap.h
+++ b/src/aapl/avlmap.h
diff --git a/aapl/avlmel.h b/src/aapl/avlmel.h
index fe7671b8..fe7671b8 100644
--- a/aapl/avlmel.h
+++ b/src/aapl/avlmel.h
diff --git a/aapl/avlmelkey.h b/src/aapl/avlmelkey.h
index cce7126f..cce7126f 100644
--- a/aapl/avlmelkey.h
+++ b/src/aapl/avlmelkey.h
diff --git a/aapl/avlset.h b/src/aapl/avlset.h
index 97e5c484..97e5c484 100644
--- a/aapl/avlset.h
+++ b/src/aapl/avlset.h
diff --git a/aapl/avltree.h b/src/aapl/avltree.h
index 9237810e..9237810e 100644
--- a/aapl/avltree.h
+++ b/src/aapl/avltree.h
diff --git a/aapl/bstcommon.h b/src/aapl/bstcommon.h
index 391b4ff1..391b4ff1 100644
--- a/aapl/bstcommon.h
+++ b/src/aapl/bstcommon.h
diff --git a/aapl/bstmap.h b/src/aapl/bstmap.h
index 4a5f5310..4a5f5310 100644
--- a/aapl/bstmap.h
+++ b/src/aapl/bstmap.h
diff --git a/aapl/bstset.h b/src/aapl/bstset.h
index 14e0375a..14e0375a 100644
--- a/aapl/bstset.h
+++ b/src/aapl/bstset.h
diff --git a/aapl/bsttable.h b/src/aapl/bsttable.h
index cb9a056a..cb9a056a 100644
--- a/aapl/bsttable.h
+++ b/src/aapl/bsttable.h
diff --git a/aapl/bubblesort.h b/src/aapl/bubblesort.h
index 42482991..42482991 100644
--- a/aapl/bubblesort.h
+++ b/src/aapl/bubblesort.h
diff --git a/aapl/buffer.h b/src/aapl/buffer.h
index 2aef08ca..2aef08ca 100644
--- a/aapl/buffer.h
+++ b/src/aapl/buffer.h
diff --git a/aapl/compare.h b/src/aapl/compare.h
index bbfa2136..bbfa2136 100644
--- a/aapl/compare.h
+++ b/src/aapl/compare.h
diff --git a/aapl/dlcommon.h b/src/aapl/dlcommon.h
index 92d45259..92d45259 100644
--- a/aapl/dlcommon.h
+++ b/src/aapl/dlcommon.h
diff --git a/aapl/dlist.h b/src/aapl/dlist.h
index 9663caca..9663caca 100644
--- a/aapl/dlist.h
+++ b/src/aapl/dlist.h
diff --git a/aapl/dlistmel.h b/src/aapl/dlistmel.h
index f2004b81..f2004b81 100644
--- a/aapl/dlistmel.h
+++ b/src/aapl/dlistmel.h
diff --git a/aapl/dlistval.h b/src/aapl/dlistval.h
index efdb1cc1..efdb1cc1 100644
--- a/aapl/dlistval.h
+++ b/src/aapl/dlistval.h
diff --git a/aapl/insertsort.h b/src/aapl/insertsort.h
index 386fd9c6..386fd9c6 100644
--- a/aapl/insertsort.h
+++ b/src/aapl/insertsort.h
diff --git a/aapl/mergesort.h b/src/aapl/mergesort.h
index 83f8b67b..83f8b67b 100644
--- a/aapl/mergesort.h
+++ b/src/aapl/mergesort.h
diff --git a/aapl/quicksort.h b/src/aapl/quicksort.h
index f23ec2ee..f23ec2ee 100644
--- a/aapl/quicksort.h
+++ b/src/aapl/quicksort.h
diff --git a/aapl/resize.h b/src/aapl/resize.h
index 6cc1090f..6cc1090f 100644
--- a/aapl/resize.h
+++ b/src/aapl/resize.h
diff --git a/aapl/rope.h b/src/aapl/rope.h
index 7a5e7b58..7a5e7b58 100644
--- a/aapl/rope.h
+++ b/src/aapl/rope.h
diff --git a/aapl/sbstmap.h b/src/aapl/sbstmap.h
index 3e159ab2..3e159ab2 100644
--- a/aapl/sbstmap.h
+++ b/src/aapl/sbstmap.h
diff --git a/aapl/sbstset.h b/src/aapl/sbstset.h
index 947f78dc..947f78dc 100644
--- a/aapl/sbstset.h
+++ b/src/aapl/sbstset.h
diff --git a/aapl/sbsttable.h b/src/aapl/sbsttable.h
index 9cfed437..9cfed437 100644
--- a/aapl/sbsttable.h
+++ b/src/aapl/sbsttable.h
diff --git a/aapl/svector.h b/src/aapl/svector.h
index 54db2007..54db2007 100644
--- a/aapl/svector.h
+++ b/src/aapl/svector.h
diff --git a/aapl/table.h b/src/aapl/table.h
index 303f473e..303f473e 100644
--- a/aapl/table.h
+++ b/src/aapl/table.h
diff --git a/aapl/vector.h b/src/aapl/vector.h
index 0ec385d5..0ec385d5 100644
--- a/aapl/vector.h
+++ b/src/aapl/vector.h
diff --git a/aapl/version.mk b/src/aapl/version.mk
index fa74770a..fa74770a 100644
--- a/aapl/version.mk
+++ b/src/aapl/version.mk
diff --git a/cgil/.gitignore b/src/cgil/.gitignore
index 9ee64540..9ee64540 100644
--- a/cgil/.gitignore
+++ b/src/cgil/.gitignore
diff --git a/cgil/Makefile.am b/src/cgil/Makefile.am
index 57d12e80..57d12e80 100644
--- a/cgil/Makefile.am
+++ b/src/cgil/Makefile.am
diff --git a/cgil/ragel.lm b/src/cgil/ragel.lm
index 1325bbb3..1325bbb3 100644
--- a/cgil/ragel.lm
+++ b/src/cgil/ragel.lm
diff --git a/cgil/ril.lm b/src/cgil/ril.lm
index cde6ce93..cde6ce93 100644
--- a/cgil/ril.lm
+++ b/src/cgil/ril.lm
diff --git a/cgil/rlhc-c.lm b/src/cgil/rlhc-c.lm
index dfc24d1d..dfc24d1d 100644
--- a/cgil/rlhc-c.lm
+++ b/src/cgil/rlhc-c.lm
diff --git a/cgil/rlhc-crack.lm b/src/cgil/rlhc-crack.lm
index bebe7cd5..bebe7cd5 100644
--- a/cgil/rlhc-crack.lm
+++ b/src/cgil/rlhc-crack.lm
diff --git a/cgil/rlhc-csharp.lm b/src/cgil/rlhc-csharp.lm
index 078157c5..078157c5 100644
--- a/cgil/rlhc-csharp.lm
+++ b/src/cgil/rlhc-csharp.lm
diff --git a/cgil/rlhc-d.lm b/src/cgil/rlhc-d.lm
index 2a047e68..2a047e68 100644
--- a/cgil/rlhc-d.lm
+++ b/src/cgil/rlhc-d.lm
diff --git a/cgil/rlhc-go.lm b/src/cgil/rlhc-go.lm
index b8353d10..b8353d10 100644
--- a/cgil/rlhc-go.lm
+++ b/src/cgil/rlhc-go.lm
diff --git a/cgil/rlhc-java.lm b/src/cgil/rlhc-java.lm
index a458369f..a458369f 100644
--- a/cgil/rlhc-java.lm
+++ b/src/cgil/rlhc-java.lm
diff --git a/cgil/rlhc-js.lm b/src/cgil/rlhc-js.lm
index 29a61346..29a61346 100644
--- a/cgil/rlhc-js.lm
+++ b/src/cgil/rlhc-js.lm
diff --git a/cgil/rlhc-julia.lm b/src/cgil/rlhc-julia.lm
index 72108994..72108994 100644
--- a/cgil/rlhc-julia.lm
+++ b/src/cgil/rlhc-julia.lm
diff --git a/cgil/rlhc-main.lm b/src/cgil/rlhc-main.lm
index f9abea7e..f9abea7e 100644
--- a/cgil/rlhc-main.lm
+++ b/src/cgil/rlhc-main.lm
diff --git a/cgil/rlhc-ocaml.lm b/src/cgil/rlhc-ocaml.lm
index f68b61be..f68b61be 100644
--- a/cgil/rlhc-ocaml.lm
+++ b/src/cgil/rlhc-ocaml.lm
diff --git a/cgil/rlhc-ruby.lm b/src/cgil/rlhc-ruby.lm
index 87119465..87119465 100644
--- a/cgil/rlhc-ruby.lm
+++ b/src/cgil/rlhc-ruby.lm
diff --git a/cgil/rlhc-rust.lm b/src/cgil/rlhc-rust.lm
index 03f8b688..03f8b688 100644
--- a/cgil/rlhc-rust.lm
+++ b/src/cgil/rlhc-rust.lm
diff --git a/libfsm/.exrc b/src/libfsm/.exrc
index 412b360f..412b360f 100644
--- a/libfsm/.exrc
+++ b/src/libfsm/.exrc
diff --git a/libfsm/.gitignore b/src/libfsm/.gitignore
index 78db4968..78db4968 100644
--- a/libfsm/.gitignore
+++ b/src/libfsm/.gitignore
diff --git a/libfsm/CMakeLists.txt b/src/libfsm/CMakeLists.txt
index 3e797981..3e797981 100644
--- a/libfsm/CMakeLists.txt
+++ b/src/libfsm/CMakeLists.txt
diff --git a/libfsm/Makefile.am b/src/libfsm/Makefile.am
index d1e8de9d..5efcb9b4 100644
--- a/libfsm/Makefile.am
+++ b/src/libfsm/Makefile.am
@@ -13,7 +13,7 @@ libfsminclude_HEADERS = \
#
# libfsm: state machine construction and direct code generation.
#
-libfsm_la_CPPFLAGS = -I$(top_srcdir)/aapl
+libfsm_la_CPPFLAGS = -I$(top_srcdir)/src/aapl
dist_libfsm_la_SOURCES = \
parsedata.h idbase.h codegen.h \
diff --git a/libfsm/actexp.cc b/src/libfsm/actexp.cc
index 771d4623..771d4623 100644
--- a/libfsm/actexp.cc
+++ b/src/libfsm/actexp.cc
diff --git a/libfsm/actexp.h b/src/libfsm/actexp.h
index 49165755..49165755 100644
--- a/libfsm/actexp.h
+++ b/src/libfsm/actexp.h
diff --git a/libfsm/action.h b/src/libfsm/action.h
index 5c79befe..5c79befe 100644
--- a/libfsm/action.h
+++ b/src/libfsm/action.h
diff --git a/libfsm/actloop.cc b/src/libfsm/actloop.cc
index 675e78fa..675e78fa 100644
--- a/libfsm/actloop.cc
+++ b/src/libfsm/actloop.cc
diff --git a/libfsm/actloop.h b/src/libfsm/actloop.h
index 238ba72a..238ba72a 100644
--- a/libfsm/actloop.h
+++ b/src/libfsm/actloop.h
diff --git a/libfsm/allocgen.cc b/src/libfsm/allocgen.cc
index 02278bfa..02278bfa 100644
--- a/libfsm/allocgen.cc
+++ b/src/libfsm/allocgen.cc
diff --git a/libfsm/asm.cc b/src/libfsm/asm.cc
index ecfe1c0f..ecfe1c0f 100644
--- a/libfsm/asm.cc
+++ b/src/libfsm/asm.cc
diff --git a/libfsm/asm.h b/src/libfsm/asm.h
index 2506e582..2506e582 100644
--- a/libfsm/asm.h
+++ b/src/libfsm/asm.h
diff --git a/libfsm/binary.cc b/src/libfsm/binary.cc
index 39b58a47..39b58a47 100644
--- a/libfsm/binary.cc
+++ b/src/libfsm/binary.cc
diff --git a/libfsm/binary.h b/src/libfsm/binary.h
index d947483d..d947483d 100644
--- a/libfsm/binary.h
+++ b/src/libfsm/binary.h
diff --git a/libfsm/binbreak.cc b/src/libfsm/binbreak.cc
index 18b71542..18b71542 100644
--- a/libfsm/binbreak.cc
+++ b/src/libfsm/binbreak.cc
diff --git a/libfsm/binbreak.h b/src/libfsm/binbreak.h
index 1b48ab24..1b48ab24 100644
--- a/libfsm/binbreak.h
+++ b/src/libfsm/binbreak.h
diff --git a/libfsm/bingoto.cc b/src/libfsm/bingoto.cc
index 1f4a818d..1f4a818d 100644
--- a/libfsm/bingoto.cc
+++ b/src/libfsm/bingoto.cc
diff --git a/libfsm/bingoto.h b/src/libfsm/bingoto.h
index 18fa8397..18fa8397 100644
--- a/libfsm/bingoto.h
+++ b/src/libfsm/bingoto.h
diff --git a/libfsm/binvar.cc b/src/libfsm/binvar.cc
index 27e40c03..27e40c03 100644
--- a/libfsm/binvar.cc
+++ b/src/libfsm/binvar.cc
diff --git a/libfsm/binvar.h b/src/libfsm/binvar.h
index cbbcef79..cbbcef79 100644
--- a/libfsm/binvar.h
+++ b/src/libfsm/binvar.h
diff --git a/libfsm/codegen.cc b/src/libfsm/codegen.cc
index db8cc60a..db8cc60a 100644
--- a/libfsm/codegen.cc
+++ b/src/libfsm/codegen.cc
diff --git a/libfsm/codegen.h b/src/libfsm/codegen.h
index dcc24e3b..dcc24e3b 100644
--- a/libfsm/codegen.h
+++ b/src/libfsm/codegen.h
diff --git a/libfsm/common.cc b/src/libfsm/common.cc
index 9ebbd905..9ebbd905 100644
--- a/libfsm/common.cc
+++ b/src/libfsm/common.cc
diff --git a/libfsm/common.h b/src/libfsm/common.h
index 142eb735..142eb735 100644
--- a/libfsm/common.h
+++ b/src/libfsm/common.h
diff --git a/libfsm/config.h.cmake.in b/src/libfsm/config.h.cmake.in
index ad4bf494..ad4bf494 100644
--- a/libfsm/config.h.cmake.in
+++ b/src/libfsm/config.h.cmake.in
diff --git a/libfsm/dot.cc b/src/libfsm/dot.cc
index f41ebc27..f41ebc27 100644
--- a/libfsm/dot.cc
+++ b/src/libfsm/dot.cc
diff --git a/libfsm/dot.h b/src/libfsm/dot.h
index 13f53532..13f53532 100644
--- a/libfsm/dot.h
+++ b/src/libfsm/dot.h
diff --git a/libfsm/flat.cc b/src/libfsm/flat.cc
index 8cda30db..8cda30db 100644
--- a/libfsm/flat.cc
+++ b/src/libfsm/flat.cc
diff --git a/libfsm/flat.h b/src/libfsm/flat.h
index 1e54f5ab..1e54f5ab 100644
--- a/libfsm/flat.h
+++ b/src/libfsm/flat.h
diff --git a/libfsm/flatbreak.cc b/src/libfsm/flatbreak.cc
index 08342625..08342625 100644
--- a/libfsm/flatbreak.cc
+++ b/src/libfsm/flatbreak.cc
diff --git a/libfsm/flatbreak.h b/src/libfsm/flatbreak.h
index 23400000..23400000 100644
--- a/libfsm/flatbreak.h
+++ b/src/libfsm/flatbreak.h
diff --git a/libfsm/flatgoto.cc b/src/libfsm/flatgoto.cc
index c3206191..c3206191 100644
--- a/libfsm/flatgoto.cc
+++ b/src/libfsm/flatgoto.cc
diff --git a/libfsm/flatgoto.h b/src/libfsm/flatgoto.h
index e21b6cd9..e21b6cd9 100644
--- a/libfsm/flatgoto.h
+++ b/src/libfsm/flatgoto.h
diff --git a/libfsm/flatvar.cc b/src/libfsm/flatvar.cc
index 40902940..40902940 100644
--- a/libfsm/flatvar.cc
+++ b/src/libfsm/flatvar.cc
diff --git a/libfsm/flatvar.h b/src/libfsm/flatvar.h
index 9cd80eab..9cd80eab 100644
--- a/libfsm/flatvar.h
+++ b/src/libfsm/flatvar.h
diff --git a/libfsm/fsmap.cc b/src/libfsm/fsmap.cc
index 98863f52..98863f52 100644
--- a/libfsm/fsmap.cc
+++ b/src/libfsm/fsmap.cc
diff --git a/libfsm/fsmattach.cc b/src/libfsm/fsmattach.cc
index 5e7e5e7c..5e7e5e7c 100644
--- a/libfsm/fsmattach.cc
+++ b/src/libfsm/fsmattach.cc
diff --git a/libfsm/fsmbase.cc b/src/libfsm/fsmbase.cc
index cc2c8757..cc2c8757 100644
--- a/libfsm/fsmbase.cc
+++ b/src/libfsm/fsmbase.cc
diff --git a/libfsm/fsmcond.cc b/src/libfsm/fsmcond.cc
index b2339c12..b2339c12 100644
--- a/libfsm/fsmcond.cc
+++ b/src/libfsm/fsmcond.cc
diff --git a/libfsm/fsmgraph.cc b/src/libfsm/fsmgraph.cc
index 819bfa96..819bfa96 100644
--- a/libfsm/fsmgraph.cc
+++ b/src/libfsm/fsmgraph.cc
diff --git a/libfsm/fsmgraph.h b/src/libfsm/fsmgraph.h
index aee6f718..aee6f718 100644
--- a/libfsm/fsmgraph.h
+++ b/src/libfsm/fsmgraph.h
diff --git a/libfsm/fsmmin.cc b/src/libfsm/fsmmin.cc
index cabe3968..cabe3968 100644
--- a/libfsm/fsmmin.cc
+++ b/src/libfsm/fsmmin.cc
diff --git a/libfsm/fsmnfa.cc b/src/libfsm/fsmnfa.cc
index cde4f82d..cde4f82d 100644
--- a/libfsm/fsmnfa.cc
+++ b/src/libfsm/fsmnfa.cc
diff --git a/libfsm/fsmstate.cc b/src/libfsm/fsmstate.cc
index 03a4df34..03a4df34 100644
--- a/libfsm/fsmstate.cc
+++ b/src/libfsm/fsmstate.cc
diff --git a/libfsm/gendata.cc b/src/libfsm/gendata.cc
index 4e3253ad..4e3253ad 100644
--- a/libfsm/gendata.cc
+++ b/src/libfsm/gendata.cc
diff --git a/libfsm/gendata.h b/src/libfsm/gendata.h
index f34f2629..f34f2629 100644
--- a/libfsm/gendata.h
+++ b/src/libfsm/gendata.h
diff --git a/libfsm/goto.cc b/src/libfsm/goto.cc
index 610f44d1..610f44d1 100644
--- a/libfsm/goto.cc
+++ b/src/libfsm/goto.cc
diff --git a/libfsm/goto.h b/src/libfsm/goto.h
index dcf13448..dcf13448 100644
--- a/libfsm/goto.h
+++ b/src/libfsm/goto.h
diff --git a/libfsm/gotoexp.cc b/src/libfsm/gotoexp.cc
index fe695401..fe695401 100644
--- a/libfsm/gotoexp.cc
+++ b/src/libfsm/gotoexp.cc
diff --git a/libfsm/gotoexp.h b/src/libfsm/gotoexp.h
index ddb3f138..ddb3f138 100644
--- a/libfsm/gotoexp.h
+++ b/src/libfsm/gotoexp.h
diff --git a/libfsm/gotoloop.cc b/src/libfsm/gotoloop.cc
index 1db3f2cd..1db3f2cd 100644
--- a/libfsm/gotoloop.cc
+++ b/src/libfsm/gotoloop.cc
diff --git a/libfsm/gotoloop.h b/src/libfsm/gotoloop.h
index 68c43ce2..68c43ce2 100644
--- a/libfsm/gotoloop.h
+++ b/src/libfsm/gotoloop.h
diff --git a/libfsm/idbase.cc b/src/libfsm/idbase.cc
index 38850b56..38850b56 100644
--- a/libfsm/idbase.cc
+++ b/src/libfsm/idbase.cc
diff --git a/libfsm/idbase.h b/src/libfsm/idbase.h
index a34837a8..a34837a8 100644
--- a/libfsm/idbase.h
+++ b/src/libfsm/idbase.h
diff --git a/libfsm/ipgoto.cc b/src/libfsm/ipgoto.cc
index 3718ea91..3718ea91 100644
--- a/libfsm/ipgoto.cc
+++ b/src/libfsm/ipgoto.cc
diff --git a/libfsm/ipgoto.h b/src/libfsm/ipgoto.h
index 1ec51bbf..1ec51bbf 100644
--- a/libfsm/ipgoto.h
+++ b/src/libfsm/ipgoto.h
diff --git a/libfsm/parsedata.h b/src/libfsm/parsedata.h
index 4d11b1c7..4d11b1c7 100644
--- a/libfsm/parsedata.h
+++ b/src/libfsm/parsedata.h
diff --git a/libfsm/ragel-config.cmake.in b/src/libfsm/ragel-config.cmake.in
index 8de5d2cb..8de5d2cb 100644
--- a/libfsm/ragel-config.cmake.in
+++ b/src/libfsm/ragel-config.cmake.in
diff --git a/libfsm/ragel.h b/src/libfsm/ragel.h
index c3fd6f22..c3fd6f22 100644
--- a/libfsm/ragel.h
+++ b/src/libfsm/ragel.h
diff --git a/libfsm/redfsm.cc b/src/libfsm/redfsm.cc
index 1b83e5b5..1b83e5b5 100644
--- a/libfsm/redfsm.cc
+++ b/src/libfsm/redfsm.cc
diff --git a/libfsm/redfsm.h b/src/libfsm/redfsm.h
index 392b1a9c..392b1a9c 100644
--- a/libfsm/redfsm.h
+++ b/src/libfsm/redfsm.h
diff --git a/libfsm/switch.cc b/src/libfsm/switch.cc
index 076f3585..076f3585 100644
--- a/libfsm/switch.cc
+++ b/src/libfsm/switch.cc
diff --git a/libfsm/switch.h b/src/libfsm/switch.h
index 7f23778b..7f23778b 100644
--- a/libfsm/switch.h
+++ b/src/libfsm/switch.h
diff --git a/libfsm/switchbreak.cc b/src/libfsm/switchbreak.cc
index 567dfbc4..567dfbc4 100644
--- a/libfsm/switchbreak.cc
+++ b/src/libfsm/switchbreak.cc
diff --git a/libfsm/switchbreak.h b/src/libfsm/switchbreak.h
index fdbac68c..fdbac68c 100644
--- a/libfsm/switchbreak.h
+++ b/src/libfsm/switchbreak.h
diff --git a/libfsm/switchgoto.cc b/src/libfsm/switchgoto.cc
index 3b293c70..3b293c70 100644
--- a/libfsm/switchgoto.cc
+++ b/src/libfsm/switchgoto.cc
diff --git a/libfsm/switchgoto.h b/src/libfsm/switchgoto.h
index d8207325..d8207325 100644
--- a/libfsm/switchgoto.h
+++ b/src/libfsm/switchgoto.h
diff --git a/libfsm/switchvar.cc b/src/libfsm/switchvar.cc
index 5382bc04..5382bc04 100644
--- a/libfsm/switchvar.cc
+++ b/src/libfsm/switchvar.cc
diff --git a/libfsm/switchvar.h b/src/libfsm/switchvar.h
index 220963a4..220963a4 100644
--- a/libfsm/switchvar.h
+++ b/src/libfsm/switchvar.h
diff --git a/libfsm/tabbreak.cc b/src/libfsm/tabbreak.cc
index ee82cc0c..ee82cc0c 100644
--- a/libfsm/tabbreak.cc
+++ b/src/libfsm/tabbreak.cc
diff --git a/libfsm/tabgoto.cc b/src/libfsm/tabgoto.cc
index ca90cb9d..ca90cb9d 100644
--- a/libfsm/tabgoto.cc
+++ b/src/libfsm/tabgoto.cc
diff --git a/libfsm/tables.cc b/src/libfsm/tables.cc
index 40edd93e..40edd93e 100644
--- a/libfsm/tables.cc
+++ b/src/libfsm/tables.cc
diff --git a/libfsm/tables.h b/src/libfsm/tables.h
index 258f869e..258f869e 100644
--- a/libfsm/tables.h
+++ b/src/libfsm/tables.h
diff --git a/libfsm/tabvar.cc b/src/libfsm/tabvar.cc
index 02bd7b55..02bd7b55 100644
--- a/libfsm/tabvar.cc
+++ b/src/libfsm/tabvar.cc