renamed colm dir to src

Renamed 'colm' dir to 'src'. To allow colm to work out of the installed
location or the source tree, while the installed includes reference
<colm/include.h>, a symlink to '..' is placed at src/include/colm.

79 files changed, 18 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index 34ccd53c..4201a24f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 
-SUBDIRS = colm
+SUBDIRS = src
 DIST_SUBDIRS = $(SUBDIRS) aapl test
 
 dist_doc_DATA =  colm.vim
diff --git a/configure.in b/configure.in
index d6707402..7f101425 100644
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,7 @@ PUBDATE="Apr 2013"
 AM_INIT_AUTOMAKE([foreign])
 
 AC_SUBST(PUBDATE)
-AC_CONFIG_HEADER([colm/config.h colm/defs.h])
+AC_CONFIG_HEADER([src/config.h src/defs.h])
 
 dnl Choose a default for the build_manual var. If the dist file is present in
 dnl the root then default to no, otherwise go for it.
@@ -68,6 +68,6 @@ AC_ARG_ENABLE(debug,
 		AC_DEFINE([DEBUG], [1], [enable debug statements]))
 
 dnl write output files
-AC_OUTPUT(Makefile colm/Makefile aapl/Makefile test/Makefile)
+AC_OUTPUT(Makefile src/Makefile aapl/Makefile test/Makefile)
 
 echo "configuration of colm complete"
diff --git a/colm/.gitignore b/src/.gitignore
index 54a642c1..e249b838 100644
--- a/colm/.gitignore
+++ b/src/.gitignore
@@ -12,6 +12,7 @@
 /.*.d
 /colm
 /config.h.in
+/config.h.in~
 /config.h
 /defs.h
 /version.h
@@ -23,6 +24,8 @@
 /stamp-h1
 /stamp-h2
 
+/include
+
 /bootstrap0
 
 /bootstrap1
diff --git a/colm/Makefile.am b/src/Makefile.am
index fcf5ce0e..387a703d 100644
--- a/colm/Makefile.am
+++ b/src/Makefile.am
@@ -36,15 +36,15 @@ lib_LIBRARIES = libcolmp.a libcolmd.a
 noinst_LIBRARIES = libprog.a
 
 libcolmp_a_SOURCES = $(RUNTIME_SRC)
-libcolmp_a_CFLAGS = -I..
+libcolmp_a_CFLAGS = -Iinclude
 
 libcolmd_a_SOURCES = $(RUNTIME_SRC)
-libcolmd_a_CFLAGS = -I..
+libcolmd_a_CFLAGS = -Iinclude
 
 common_CFLAGS = \
 	-Wall \
 	-DPREFIX='"$(prefix)"' \
-	-I..
+	-Iinclude
 
 libprog_a_SOURCES = \
 	buffer.h bytecode.h colm.h debug.h dotgen.h fsmcodegen.h fsmgraph.h \
@@ -101,7 +101,11 @@ bootstrap1-loadinit.$(OBJEXT): if1.h if1.cc parse1.c
 colm-if2.$(OBJEXT): if2.h if2.cc parse2.c
 colm-loadcolm.$(OBJEXT): if2.h if2.cc parse2.c
 
-BUILT_SOURCES = version.h 
+BUILT_SOURCES = version.h include/colm
+
+include/colm:
+	mkdir -p include
+	ln -s .. include/colm
 
 version.h: Makefile
 	echo '#define VERSION "$(PACKAGE_VERSION)"' > version.h
diff --git a/colm/buffer.h b/src/buffer.h
index 9039ad4b..9039ad4b 100644
--- a/colm/buffer.h
+++ b/src/buffer.h
diff --git a/colm/bytecode.c b/src/bytecode.c
index e6b9cb53..e6b9cb53 100644
--- a/colm/bytecode.c
+++ b/src/bytecode.c
diff --git a/colm/bytecode.h b/src/bytecode.h
index c54dba4b..c54dba4b 100644
--- a/colm/bytecode.h
+++ b/src/bytecode.h
diff --git a/colm/closure.cc b/src/closure.cc
index f587ea0e..f587ea0e 100644
--- a/colm/closure.cc
+++ b/src/closure.cc
diff --git a/colm/codegen.cc b/src/codegen.cc
index b48ebbb7..b48ebbb7 100644
--- a/colm/codegen.cc
+++ b/src/codegen.cc
diff --git a/colm/codevect.c b/src/codevect.c
index a05c7ea4..a05c7ea4 100644
--- a/colm/codevect.c
+++ b/src/codevect.c
diff --git a/colm/colm.h b/src/colm.h
index 8bfdb94e..8bfdb94e 100644
--- a/colm/colm.h
+++ b/src/colm.h
diff --git a/colm/colm.lm b/src/colm.lm
index 4cf12923..4cf12923 100644
--- a/colm/colm.lm
+++ b/src/colm.lm
diff --git a/colm/compiler.cc b/src/compiler.cc
index f4f79744..f4f79744 100644
--- a/colm/compiler.cc
+++ b/src/compiler.cc
diff --git a/colm/consinit.cc b/src/consinit.cc
index 6a3d3d30..6a3d3d30 100644
--- a/colm/consinit.cc
+++ b/src/consinit.cc
diff --git a/colm/consinit.h b/src/consinit.h
index 093f75aa..093f75aa 100644
--- a/colm/consinit.h
+++ b/src/consinit.h
diff --git a/colm/ctinput.cc b/src/ctinput.cc
index e8aa0f7f..e8aa0f7f 100644
--- a/colm/ctinput.cc
+++ b/src/ctinput.cc
diff --git a/colm/debug.c b/src/debug.c
index c43f5a68..c43f5a68 100644
--- a/colm/debug.c
+++ b/src/debug.c
diff --git a/colm/debug.h b/src/debug.h
index 91e1c46c..91e1c46c 100644
--- a/colm/debug.h
+++ b/src/debug.h
diff --git a/colm/declare.cc b/src/declare.cc
index a9dcc737..a9dcc737 100644
--- a/colm/declare.cc
+++ b/src/declare.cc
diff --git a/colm/defs.h.in b/src/defs.h.in
index 4281536d..4281536d 100644
--- a/colm/defs.h.in
+++ b/src/defs.h.in
diff --git a/colm/dotgen.cc b/src/dotgen.cc
index e2078053..e2078053 100644
--- a/colm/dotgen.cc
+++ b/src/dotgen.cc
diff --git a/colm/dotgen.h b/src/dotgen.h
index d05a2410..d05a2410 100644
--- a/colm/dotgen.h
+++ b/src/dotgen.h
diff --git a/colm/exports.cc b/src/exports.cc
index aeeea62a..aeeea62a 100644
--- a/colm/exports.cc
+++ b/src/exports.cc
diff --git a/colm/fsmap.cc b/src/fsmap.cc
index cd955614..cd955614 100644
--- a/colm/fsmap.cc
+++ b/src/fsmap.cc
diff --git a/colm/fsmattach.cc b/src/fsmattach.cc
index a58ed9a4..a58ed9a4 100644
--- a/colm/fsmattach.cc
+++ b/src/fsmattach.cc
diff --git a/colm/fsmbase.cc b/src/fsmbase.cc
index 90341039..90341039 100644
--- a/colm/fsmbase.cc
+++ b/src/fsmbase.cc
diff --git a/colm/fsmcodegen.cc b/src/fsmcodegen.cc
index 61a48f7c..61a48f7c 100644
--- a/colm/fsmcodegen.cc
+++ b/src/fsmcodegen.cc
diff --git a/colm/fsmcodegen.h b/src/fsmcodegen.h
index 7c88dc84..7c88dc84 100644
--- a/colm/fsmcodegen.h
+++ b/src/fsmcodegen.h
diff --git a/colm/fsmexec.cc b/src/fsmexec.cc
index bec899f7..bec899f7 100644
--- a/colm/fsmexec.cc
+++ b/src/fsmexec.cc
diff --git a/colm/fsmgraph.cc b/src/fsmgraph.cc
index bf2d2446..bf2d2446 100644
--- a/colm/fsmgraph.cc
+++ b/src/fsmgraph.cc
diff --git a/colm/fsmgraph.h b/src/fsmgraph.h
index 9a0f2aea..9a0f2aea 100644
--- a/colm/fsmgraph.h
+++ b/src/fsmgraph.h
diff --git a/colm/fsmmin.cc b/src/fsmmin.cc
index cbb2b99f..cbb2b99f 100644
--- a/colm/fsmmin.cc
+++ b/src/fsmmin.cc
diff --git a/colm/fsmstate.cc b/src/fsmstate.cc
index f917302e..f917302e 100644
--- a/colm/fsmstate.cc
+++ b/src/fsmstate.cc
diff --git a/colm/global.h b/src/global.h
index 2dd6e4f1..2dd6e4f1 100644
--- a/colm/global.h
+++ b/src/global.h
diff --git a/colm/input.c b/src/input.c
index a41aa5b8..a41aa5b8 100644
--- a/colm/input.c
+++ b/src/input.c
diff --git a/colm/input.h b/src/input.h
index 1605ebce..1605ebce 100644
--- a/colm/input.h
+++ b/src/input.h
diff --git a/colm/keyops.h b/src/keyops.h
index a79881e7..a79881e7 100644
--- a/colm/keyops.h
+++ b/src/keyops.h
diff --git a/colm/list.c b/src/list.c
index d9180b73..d9180b73 100644
--- a/colm/list.c
+++ b/src/list.c
diff --git a/colm/lmparse.kh b/src/lmparse.kh
index 416ba41f..416ba41f 100644
--- a/colm/lmparse.kh
+++ b/src/lmparse.kh
diff --git a/colm/lmparse.kl b/src/lmparse.kl
index fafa653a..fafa653a 100644
--- a/colm/lmparse.kl
+++ b/src/lmparse.kl
diff --git a/colm/lmscan.h b/src/lmscan.h
index 0c4a6812..0c4a6812 100644
--- a/colm/lmscan.h
+++ b/src/lmscan.h
diff --git a/colm/lmscan.rl b/src/lmscan.rl
index 797cbaeb..797cbaeb 100644
--- a/colm/lmscan.rl
+++ b/src/lmscan.rl
diff --git a/colm/loadcolm.cc b/src/loadcolm.cc
index 45565a25..45565a25 100644
--- a/colm/loadcolm.cc
+++ b/src/loadcolm.cc
diff --git a/colm/loadcolm.h b/src/loadcolm.h
index bfc0589f..bfc0589f 100644
--- a/colm/loadcolm.h
+++ b/src/loadcolm.h
diff --git a/colm/loadinit.cc b/src/loadinit.cc
index 1d165ece..1d165ece 100644
--- a/colm/loadinit.cc
+++ b/src/loadinit.cc
diff --git a/colm/loadinit.h b/src/loadinit.h
index 4a3120c7..4a3120c7 100644
--- a/colm/loadinit.h
+++ b/src/loadinit.h
diff --git a/colm/main.cc b/src/main.cc
index a8ba663b..aa9e97d8 100644
--- a/colm/main.cc
+++ b/src/main.cc
@@ -412,14 +412,14 @@ void compileOutputInSource( const char *argv0 )
 	char *location = strdup( argv0 );
 	char *last = strrchr( location, '/' );
 	assert( last != 0 );
-	last[1] = 0;
+	last[0] = 0;
 
 	int length = 1024 + 3 * strlen(location) + strlen(intermedFn) + strlen(binaryFn);
 	char command[length];
 	sprintf( command, 
 		"gcc -Wall -Wwrite-strings"
-		" -I%s.."
-		" -I%s../aapl"
+		" -I%s/../aapl"
+		" -I%s/include"
 		" -g"
 		" -o %s"
 		" %s"
diff --git a/colm/map.c b/src/map.c
index 4609db58..4609db58 100644
--- a/colm/map.c
+++ b/src/map.c
diff --git a/colm/map.cc b/src/map.cc
index 52dd2697..52dd2697 100644
--- a/colm/map.cc
+++ b/src/map.cc
diff --git a/colm/map.h b/src/map.h
index 06007ad8..06007ad8 100644
--- a/colm/map.h
+++ b/src/map.h
diff --git a/colm/parsedata.h b/src/parsedata.h
index 6acf5e50..6acf5e50 100644
--- a/colm/parsedata.h
+++ b/src/parsedata.h
diff --git a/colm/parser.cc b/src/parser.cc
index 23a16e7f..23a16e7f 100644
--- a/colm/parser.cc
+++ b/src/parser.cc
diff --git a/colm/parser.h b/src/parser.h
index 10b995bf..10b995bf 100644
--- a/colm/parser.h
+++ b/src/parser.h
diff --git a/colm/parsetree.cc b/src/parsetree.cc
index 08cf0dec..08cf0dec 100644
--- a/colm/parsetree.cc
+++ b/src/parsetree.cc
diff --git a/colm/parsetree.h b/src/parsetree.h
index f75705e8..f75705e8 100644
--- a/colm/parsetree.h
+++ b/src/parsetree.h
diff --git a/colm/pcheck.cc b/src/pcheck.cc
index d5401f7d..d5401f7d 100644
--- a/colm/pcheck.cc
+++ b/src/pcheck.cc
diff --git a/colm/pcheck.h b/src/pcheck.h
index 5be60426..5be60426 100644
--- a/colm/pcheck.h
+++ b/src/pcheck.h
diff --git a/colm/pdabuild.cc b/src/pdabuild.cc
index b38c80de..b38c80de 100644
--- a/colm/pdabuild.cc
+++ b/src/pdabuild.cc
diff --git a/colm/pdacodegen.cc b/src/pdacodegen.cc
index 469f95c0..469f95c0 100644
--- a/colm/pdacodegen.cc
+++ b/src/pdacodegen.cc
diff --git a/colm/pdacodegen.h b/src/pdacodegen.h
index 7a9e4f98..7a9e4f98 100644
--- a/colm/pdacodegen.h
+++ b/src/pdacodegen.h
diff --git a/colm/pdagraph.cc b/src/pdagraph.cc
index 8f17b7a5..8f17b7a5 100644
--- a/colm/pdagraph.cc
+++ b/src/pdagraph.cc
diff --git a/colm/pdagraph.h b/src/pdagraph.h
index af6eb3d5..af6eb3d5 100644
--- a/colm/pdagraph.h
+++ b/src/pdagraph.h
diff --git a/colm/pdarun.c b/src/pdarun.c
index 5b85f5ef..5b85f5ef 100644
--- a/colm/pdarun.c
+++ b/src/pdarun.c
diff --git a/colm/pdarun.h b/src/pdarun.h
index 4af8fc2a..4af8fc2a 100644
--- a/colm/pdarun.h
+++ b/src/pdarun.h
diff --git a/colm/pool.c b/src/pool.c
index 93cabd2a..93cabd2a 100644
--- a/colm/pool.c
+++ b/src/pool.c
diff --git a/colm/pool.h b/src/pool.h
index 3a547bb8..3a547bb8 100644
--- a/colm/pool.h
+++ b/src/pool.h
diff --git a/colm/program.c b/src/program.c
index fc728344..fc728344 100644
--- a/colm/program.c
+++ b/src/program.c
diff --git a/colm/program.h b/src/program.h
index 225dc140..225dc140 100644
--- a/colm/program.h
+++ b/src/program.h
diff --git a/colm/redbuild.cc b/src/redbuild.cc
index 257bc929..257bc929 100644
--- a/colm/redbuild.cc
+++ b/src/redbuild.cc
diff --git a/colm/redbuild.h b/src/redbuild.h
index eb2ce102..eb2ce102 100644
--- a/colm/redbuild.h
+++ b/src/redbuild.h
diff --git a/colm/redfsm.cc b/src/redfsm.cc
index 5ec075ce..5ec075ce 100644
--- a/colm/redfsm.cc
+++ b/src/redfsm.cc
diff --git a/colm/redfsm.h b/src/redfsm.h
index 1858fe82..1858fe82 100644
--- a/colm/redfsm.h
+++ b/src/redfsm.h
diff --git a/colm/resolve.cc b/src/resolve.cc
index f5aa4540..f5aa4540 100644
--- a/colm/resolve.cc
+++ b/src/resolve.cc
diff --git a/colm/rtvector.h b/src/rtvector.h
index e03a17f9..e03a17f9 100644
--- a/colm/rtvector.h
+++ b/src/rtvector.h
diff --git a/colm/string.c b/src/string.c
index 31472e21..31472e21 100644
--- a/colm/string.c
+++ b/src/string.c
diff --git a/colm/synthesis.cc b/src/synthesis.cc
index 11ca9390..11ca9390 100644
--- a/colm/synthesis.cc
+++ b/src/synthesis.cc
diff --git a/colm/tree.c b/src/tree.c
index 515aadef..515aadef 100644
--- a/colm/tree.c
+++ b/src/tree.c
diff --git a/colm/tree.h b/src/tree.h
index 91051022..91051022 100644
--- a/colm/tree.h
+++ b/src/tree.h
diff --git a/test/runtests.sh b/test/runtests.sh
index 1ecd1e23..dd683017 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -23,7 +23,7 @@
 #######################################
 
 WORKING=working
-COLM=../colm/colm
+COLM=../src/colm
 ERRORS=0
 
 cd `dirname $0`