revert "moved 'colm' dir to 'src'"

Colm includes a library component with headers installed to a private dir
inside include: $prefix/include/colm. We need our headers to reference each
other using this colm prefix. This needs to be true for compiling our source
and also for compiling external programs. It is conventient to have all the
source in a directory called colm and then to use -I <source-root> when
building colm. We use $prefix/include when building external programs.

This reverts commit 247904a84430b8c9151fa6afb68f01b60afb92c9.

71 files changed, 66 insertions, 67 deletions

diff --git a/Makefile.am b/Makefile.am
index 0a852f66..60ebe031 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,7 @@
 # ADT install: $(INSTALL_SUBDIRS)
 # ADT 
 
-SUBDIRS = src
+SUBDIRS = colm
 DIST_SUBDIRS = $(SUBDIRS) aapl test
 
 dist_doc_DATA =  colm.vim
diff --git a/src/.gitignore b/colm/.gitignore
index c2e96f8e..fe077f2c 100644
--- a/src/.gitignore
+++ b/colm/.gitignore
@@ -14,7 +14,6 @@
 /lmparse.cc
 /lmscan.cc
 /config.h.in
-/config.h.in~
 /config.h
 /defs.h
 /version.h
diff --git a/src/Makefile.am b/colm/Makefile.am
index c4a3504a..c4a3504a 100644
--- a/src/Makefile.am
+++ b/colm/Makefile.am
diff --git a/src/buffer.h b/colm/buffer.h
index 9039ad4b..9039ad4b 100644
--- a/src/buffer.h
+++ b/colm/buffer.h
diff --git a/src/bytecode.c b/colm/bytecode.c
index 10b40cef..2eb4d0cc 100644
--- a/src/bytecode.c
+++ b/colm/bytecode.c
@@ -21,13 +21,13 @@
 
 //#define COLM_LOG
 
-#include <pdarun.h>
-#include <fsmrun.h>
-#include <tree.h>
-#include <bytecode.h>
-#include <pool.h>
-#include <debug.h>
-#include <config.h>
+#include <colm/pdarun.h>
+#include <colm/fsmrun.h>
+#include <colm/tree.h>
+#include <colm/bytecode.h>
+#include <colm/pool.h>
+#include <colm/debug.h>
+#include <colm/config.h>
 
 #include <alloca.h>
 #include <sys/mman.h>
diff --git a/src/bytecode.h b/colm/bytecode.h
index 2d3afd64..d6c0e4aa 100644
--- a/src/bytecode.h
+++ b/colm/bytecode.h
@@ -22,8 +22,8 @@
 #ifndef _BYTECODE_H
 #define _BYTECODE_H
 
-#include <pdarun.h>
-#include <tree.h>
+#include <colm/pdarun.h>
+#include <colm/tree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/closure.cc b/colm/closure.cc
index f587ea0e..f587ea0e 100644
--- a/src/closure.cc
+++ b/colm/closure.cc
diff --git a/src/codegen.cc b/colm/codegen.cc
index f55257e7..f55257e7 100644
--- a/src/codegen.cc
+++ b/colm/codegen.cc
diff --git a/src/codevect.c b/colm/codevect.c
index f8997423..a05c7ea4 100644
--- a/src/codevect.c
+++ b/colm/codevect.c
@@ -19,8 +19,8 @@
  *  Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <rtvector.h>
-#include <pdarun.h>
+#include <colm/rtvector.h>
+#include <colm/pdarun.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/colm.h b/colm/colm.h
index f76c46b2..f76c46b2 100644
--- a/src/colm.h
+++ b/colm/colm.h
diff --git a/src/compiler.cc b/colm/compiler.cc
index 1e0c8c7f..1e0c8c7f 100644
--- a/src/compiler.cc
+++ b/colm/compiler.cc
diff --git a/src/ctinput.cc b/colm/ctinput.cc
index eb71e560..eb71e560 100644
--- a/src/ctinput.cc
+++ b/colm/ctinput.cc
diff --git a/src/debug.c b/colm/debug.c
index 8efaf510..6d9689e0 100644
--- a/src/debug.c
+++ b/colm/debug.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <debug.h>
+#include <colm/debug.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/debug.h b/colm/debug.h
index 3fd9bb8e..3fd9bb8e 100644
--- a/src/debug.h
+++ b/colm/debug.h
diff --git a/src/declare.cc b/colm/declare.cc
index 214b5e04..214b5e04 100644
--- a/src/declare.cc
+++ b/colm/declare.cc
diff --git a/src/defs.h.in b/colm/defs.h.in
index 06a3f9df..06a3f9df 100644
--- a/src/defs.h.in
+++ b/colm/defs.h.in
diff --git a/src/dotgen.cc b/colm/dotgen.cc
index e4474958..e4474958 100644
--- a/src/dotgen.cc
+++ b/colm/dotgen.cc
diff --git a/src/dotgen.h b/colm/dotgen.h
index d05a2410..d05a2410 100644
--- a/src/dotgen.h
+++ b/colm/dotgen.h
diff --git a/src/exports.cc b/colm/exports.cc
index f5153330..f5153330 100644
--- a/src/exports.cc
+++ b/colm/exports.cc
diff --git a/src/fsmap.cc b/colm/fsmap.cc
index a4c072b6..a4c072b6 100644
--- a/src/fsmap.cc
+++ b/colm/fsmap.cc
diff --git a/src/fsmattach.cc b/colm/fsmattach.cc
index a58ed9a4..a58ed9a4 100644
--- a/src/fsmattach.cc
+++ b/colm/fsmattach.cc
diff --git a/src/fsmbase.cc b/colm/fsmbase.cc
index 90341039..90341039 100644
--- a/src/fsmbase.cc
+++ b/colm/fsmbase.cc
diff --git a/src/fsmcodegen.cc b/colm/fsmcodegen.cc
index 8f3ab597..86302c31 100644
--- a/src/fsmcodegen.cc
+++ b/colm/fsmcodegen.cc
@@ -1039,20 +1039,20 @@ void FsmCodeGen::writeExec()
 void FsmCodeGen::writeIncludes()
 {
 	out << 
-		"#include <pdarun.h>\n"
-		"#include <fsmrun.h>\n"
-		"#include <debug.h>\n"
-		"#include <bytecode.h>\n"
-		"#include <config.h>\n"
-		"#include <defs.h>\n"
-		"#include <input.h>\n"
-		"#include <tree.h>\n"
-		"#include <program.h>\n"
-		"#include <colm.h>\n"
+		"#include <colm/pdarun.h>\n"
+		"#include <colm/fsmrun.h>\n"
+		"#include <colm/debug.h>\n"
+		"#include <colm/bytecode.h>\n"
 		"#include <stdio.h>\n"
 		"#include <stdlib.h>\n"
 		"#include <string.h>\n"
 		"#include <assert.h>\n"
+		"#include <colm/config.h>\n"
+		"#include <colm/defs.h>\n"
+		"#include <colm/input.h>\n"
+		"#include <colm/tree.h>\n"
+		"#include <colm/program.h>\n"
+		"#include <colm/colm.h>\n"
 		"\n"
 		"\n";
 }
diff --git a/src/fsmcodegen.h b/colm/fsmcodegen.h
index 41cd88ec..41cd88ec 100644
--- a/src/fsmcodegen.h
+++ b/colm/fsmcodegen.h
diff --git a/src/fsmexec.cc b/colm/fsmexec.cc
index f922c7a4..f922c7a4 100644
--- a/src/fsmexec.cc
+++ b/colm/fsmexec.cc
diff --git a/src/fsmgraph.cc b/colm/fsmgraph.cc
index 590d7902..590d7902 100644
--- a/src/fsmgraph.cc
+++ b/colm/fsmgraph.cc
diff --git a/src/fsmgraph.h b/colm/fsmgraph.h
index fca23cc1..fca23cc1 100644
--- a/src/fsmgraph.h
+++ b/colm/fsmgraph.h
diff --git a/src/fsmmin.cc b/colm/fsmmin.cc
index cbb2b99f..cbb2b99f 100644
--- a/src/fsmmin.cc
+++ b/colm/fsmmin.cc
diff --git a/src/fsmrun.h b/colm/fsmrun.h
index f92b5e5e..821b3ccf 100644
--- a/src/fsmrun.h
+++ b/colm/fsmrun.h
@@ -22,7 +22,7 @@
 #ifndef _FSMRUN2_H
 #define _FSMRUN2_H
 
-#include <input.h>
+#include <colm/input.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/fsmstate.cc b/colm/fsmstate.cc
index dae1479b..dae1479b 100644
--- a/src/fsmstate.cc
+++ b/colm/fsmstate.cc
diff --git a/src/global.h b/colm/global.h
index d67c55e4..d67c55e4 100644
--- a/src/global.h
+++ b/colm/global.h
diff --git a/src/input.c b/colm/input.c
index d181b556..b6c96369 100644
--- a/src/input.c
+++ b/colm/input.c
@@ -19,10 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <input.h>
-#include <fsmrun.h>
-#include <pdarun.h>
-#include <debug.h>
+#include <colm/input.h>
+#include <colm/fsmrun.h>
+#include <colm/pdarun.h>
+#include <colm/debug.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/input.h b/colm/input.h
index 882c6b31..882c6b31 100644
--- a/src/input.h
+++ b/colm/input.h
diff --git a/src/keyops.h b/colm/keyops.h
index 1808c6a6..1808c6a6 100644
--- a/src/keyops.h
+++ b/colm/keyops.h
diff --git a/src/list.c b/colm/list.c
index f57109e1..d9180b73 100644
--- a/src/list.c
+++ b/colm/list.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <pdarun.h>
+#include <colm/pdarun.h>
 
 void listAddAfter( List *list, ListEl *prev_el, ListEl *new_el )
 {
diff --git a/src/lmparse.kh b/colm/lmparse.kh
index e55f3c25..e55f3c25 100644
--- a/src/lmparse.kh
+++ b/colm/lmparse.kh
diff --git a/src/lmparse.kl b/colm/lmparse.kl
index e94a1ac8..e94a1ac8 100644
--- a/src/lmparse.kl
+++ b/colm/lmparse.kl
diff --git a/src/lmscan.h b/colm/lmscan.h
index 5badaed5..5badaed5 100644
--- a/src/lmscan.h
+++ b/colm/lmscan.h
diff --git a/src/lmscan.rl b/colm/lmscan.rl
index d38df495..d38df495 100644
--- a/src/lmscan.rl
+++ b/colm/lmscan.rl
diff --git a/src/main.cc b/colm/main.cc
index 6856da27..435bb697 100644
--- a/src/main.cc
+++ b/colm/main.cc
@@ -350,7 +350,7 @@ void compileOutputInstalled( const char *argv0 )
 	char command[length];
 	sprintf( command, 
 		"gcc -Wall -Wwrite-strings"
-		" -I" PREFIX "/include/colm"
+		" -I" PREFIX "/include"
 		" -g"
 		" -o %s"
 		" %s"
@@ -375,7 +375,7 @@ void compileOutputInSource( const char *argv0 )
 	char command[length];
 	sprintf( command, 
 		"gcc -Wall -Wwrite-strings"
-		" -I%s."
+		" -I%s.."
 		" -I%s../aapl"
 		" -g"
 		" -o %s"
diff --git a/src/map.c b/colm/map.c
index 72f4a18c..4609db58 100644
--- a/src/map.c
+++ b/colm/map.c
@@ -20,9 +20,9 @@
  */
 
 #include <assert.h>
-#include <pdarun.h>
-#include <map.h>
-#include <pool.h>
+#include <colm/pdarun.h>
+#include <colm/map.h>
+#include <colm/pool.h>
 
 #define true 1
 #define false 0
diff --git a/src/map.cc b/colm/map.cc
index 52dd2697..52dd2697 100644
--- a/src/map.cc
+++ b/colm/map.cc
diff --git a/src/map.h b/colm/map.h
index acb415b9..993ca86e 100644
--- a/src/map.h
+++ b/colm/map.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <program.h>
+#include <colm/program.h>
 
 typedef struct _MapEl
 {
diff --git a/src/parsedata.h b/colm/parsedata.h
index 41ab9781..41ab9781 100644
--- a/src/parsedata.h
+++ b/colm/parsedata.h
diff --git a/src/parsetree.cc b/colm/parsetree.cc
index ddd0f15d..ddd0f15d 100644
--- a/src/parsetree.cc
+++ b/colm/parsetree.cc
diff --git a/src/parsetree.h b/colm/parsetree.h
index da0346d3..da0346d3 100644
--- a/src/parsetree.h
+++ b/colm/parsetree.h
diff --git a/src/pcheck.cc b/colm/pcheck.cc
index d5401f7d..d5401f7d 100644
--- a/src/pcheck.cc
+++ b/colm/pcheck.cc
diff --git a/src/pcheck.h b/colm/pcheck.h
index 5be60426..5be60426 100644
--- a/src/pcheck.h
+++ b/colm/pcheck.h
diff --git a/src/pdabuild.cc b/colm/pdabuild.cc
index 8fd1f11e..8fd1f11e 100644
--- a/src/pdabuild.cc
+++ b/colm/pdabuild.cc
diff --git a/src/pdacodegen.cc b/colm/pdacodegen.cc
index 9e3dca47..9e3dca47 100644
--- a/src/pdacodegen.cc
+++ b/colm/pdacodegen.cc
diff --git a/src/pdacodegen.h b/colm/pdacodegen.h
index 99043b6d..99043b6d 100644
--- a/src/pdacodegen.h
+++ b/colm/pdacodegen.h
diff --git a/src/pdagraph.cc b/colm/pdagraph.cc
index 8f17b7a5..8f17b7a5 100644
--- a/src/pdagraph.cc
+++ b/colm/pdagraph.cc
diff --git a/src/pdagraph.h b/colm/pdagraph.h
index 742fb047..742fb047 100644
--- a/src/pdagraph.h
+++ b/colm/pdagraph.h
diff --git a/src/pdarun.c b/colm/pdarun.c
index 62ab107e..62ab107e 100644
--- a/src/pdarun.c
+++ b/colm/pdarun.c
diff --git a/src/pdarun.h b/colm/pdarun.h
index 1bdf651c..4ab648a6 100644
--- a/src/pdarun.h
+++ b/colm/pdarun.h
@@ -22,10 +22,10 @@
 #ifndef __COLM_PDARUN_H
 #define __COLM_PDARUN_H
 
-#include <input.h>
-#include <fsmrun.h>
-#include <defs.h>
-#include <tree.h>
+#include <colm/input.h>
+#include <colm/fsmrun.h>
+#include <colm/defs.h>
+#include <colm/tree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/pool.c b/colm/pool.c
index e1c3c240..f531338d 100644
--- a/src/pool.c
+++ b/colm/pool.c
@@ -22,9 +22,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <pdarun.h>
-#include <pool.h>
-#include <debug.h>
+#include <colm/pdarun.h>
+#include <colm/pool.h>
+#include <colm/debug.h>
 
 void initPoolAlloc( PoolAlloc *poolAlloc, int sizeofT )
 {
diff --git a/src/pool.h b/colm/pool.h
index ae647abd..454a5354 100644
--- a/src/pool.h
+++ b/colm/pool.h
@@ -25,9 +25,9 @@
 /* Allocation, number of items. */
 #define FRESH_BLOCK 8128                    
 
-#include <pdarun.h>
-#include <map.h>
-#include <tree.h>
+#include <colm/pdarun.h>
+#include <colm/map.h>
+#include <colm/tree.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/program.c b/colm/program.c
index 63763fc6..9faa99cf 100644
--- a/src/program.c
+++ b/colm/program.c
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <pdarun.h>
-#include <fsmrun.h>
-#include <tree.h>
-#include <bytecode.h>
-#include <pool.h>
-#include <debug.h>
-#include <config.h>
+#include <colm/pdarun.h>
+#include <colm/fsmrun.h>
+#include <colm/tree.h>
+#include <colm/bytecode.h>
+#include <colm/pool.h>
+#include <colm/debug.h>
+#include <colm/config.h>
 
 #include <alloca.h>
 #include <sys/mman.h>
diff --git a/src/program.h b/colm/program.h
index 9a50274d..b5de90b3 100644
--- a/src/program.h
+++ b/colm/program.h
@@ -22,7 +22,7 @@
 #ifndef __COLM_PROGRAM_H
 #define __COLM_PROGRAM_H
 
-#include <pdarun.h>
+#include <colm/pdarun.h>
 
 typedef struct ColmRuntimeData
 {
diff --git a/src/redbuild.cc b/colm/redbuild.cc
index ae5faf38..ae5faf38 100644
--- a/src/redbuild.cc
+++ b/colm/redbuild.cc
diff --git a/src/redbuild.h b/colm/redbuild.h
index dbbb3e19..dbbb3e19 100644
--- a/src/redbuild.h
+++ b/colm/redbuild.h
diff --git a/src/redfsm.cc b/colm/redfsm.cc
index d3a65b7c..d3a65b7c 100644
--- a/src/redfsm.cc
+++ b/colm/redfsm.cc
diff --git a/src/redfsm.h b/colm/redfsm.h
index 39b98d5f..39b98d5f 100644
--- a/src/redfsm.h
+++ b/colm/redfsm.h
diff --git a/src/resolve.cc b/colm/resolve.cc
index 4e848ca7..4e848ca7 100644
--- a/src/resolve.cc
+++ b/colm/resolve.cc
diff --git a/src/rtvector.h b/colm/rtvector.h
index e03a17f9..e03a17f9 100644
--- a/src/rtvector.h
+++ b/colm/rtvector.h
diff --git a/src/string.c b/colm/string.c
index 7508a39a..d670b68c 100644
--- a/src/string.c
+++ b/colm/string.c
@@ -19,9 +19,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <pool.h>
-#include <pdarun.h>
-#include <bytecode.h>
+#include <colm/pool.h>
+#include <colm/pdarun.h>
+#include <colm/bytecode.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/synthesis.cc b/colm/synthesis.cc
index ef91d2f3..ef91d2f3 100644
--- a/src/synthesis.cc
+++ b/colm/synthesis.cc
diff --git a/src/tree.c b/colm/tree.c
index 17b1f537..eac26354 100644
--- a/src/tree.c
+++ b/colm/tree.c
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 
-#include <pdarun.h>
-#include <tree.h>
-#include <pool.h>
-#include <bytecode.h>
-#include <debug.h>
-#include <map.h>
+#include <colm/pdarun.h>
+#include <colm/tree.h>
+#include <colm/pool.h>
+#include <colm/bytecode.h>
+#include <colm/debug.h>
+#include <colm/map.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/tree.h b/colm/tree.h
index 8a19bf96..e0d390a8 100644
--- a/src/tree.h
+++ b/colm/tree.h
@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#include <colm.h>
+#include <colm/colm.h>
 
 typedef unsigned char Code;
 typedef unsigned long Word;
diff --git a/configure.in b/configure.in
index 948225cc..59bf09f1 100644
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,7 @@ PUBDATE="June 2012"
 AM_INIT_AUTOMAKE([foreign])
 
 AC_SUBST(PUBDATE)
-AC_CONFIG_HEADER([src/config.h src/defs.h])
+AC_CONFIG_HEADER([colm/config.h colm/defs.h])
 
 dnl Choose defaults for the build_parsers and build_manual vars. If the dist
 dnl file is present in the root then default to no, otherwise go for it.
@@ -133,6 +133,6 @@ AC_SUBST(KELBT)
 fi # build_parsers
 
 dnl write output files
-AC_OUTPUT(Makefile src/Makefile aapl/Makefile test/Makefile)
+AC_OUTPUT(Makefile colm/Makefile aapl/Makefile test/Makefile)
 
 echo "configuration of colm complete"
diff --git a/test/runtests.sh b/test/runtests.sh
index 39ec642b..3b141891 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -38,7 +38,7 @@ errors=0
 #trap sig_exit SIGINT
 #trap sig_exit SIGQUIT
 
-COLM=../src/colm
+COLM=../colm/colm
 
 [ -d $DATA ] || die "error: data directory not found"