Moved the headers and code from common/ into colm/.

10 files changed, 18 insertions, 78 deletions

diff --git a/Makefile.in b/Makefile.in
index 26e4b879..f14d2473 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 
-BUILD_SUBDIRS = common colm
+BUILD_SUBDIRS = colm
 ALL_SUBDIRS = $(BUILD_SUBDIRS) test
 
 #*************************************
diff --git a/colm/Makefile.in b/colm/Makefile.in
index 61b57867..21dba83c 100644
--- a/colm/Makefile.in
+++ b/colm/Makefile.in
@@ -18,7 +18,7 @@
 #   along with Colm; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-INCS += -I../common -I../aapl
+INCS += -I../aapl
 DEFS +=
 
 CFLAGS += -g -Wall -Wwrite-strings
@@ -28,6 +28,7 @@ LDFLAGS +=
 CC_SRCS = \
 	compile.cpp \
 	bytecode.cpp \
+	tree.cpp \
 	fsmrun.cpp \
 	pdarun.cpp \
 	input.cpp \
@@ -54,18 +55,21 @@ CC_SRCS = \
 	closure.cpp \
 	fsmap.cpp \
 	dotgen.cpp \
-	tree.cpp
+	common.cpp
 
 RUNTIME_SRC = fsmrun.cpp pdarun.cpp bytecode.cpp list.cpp \
 	map.cpp string.cpp input.cpp tree.cpp
-GEN_SRC = lmscan.cpp lmparse.h lmparse.cpp 
+GEN_SRC = version.h lmscan.cpp lmparse.h lmparse.cpp 
 
 RUNTIME = runtime.a
 
-LIBS = ../common/common.a
+LIBS = 
 
 #*************************************
 
+# Get the version info.
+include ../version.mk
+
 PREFIX = @prefix@
 
 BUILD_PARSERS = @BUILD_PARSERS@
@@ -87,6 +91,10 @@ colm: $(GEN_SRC) $(OBJS) $(LIBS)
 $(RUNTIME): $(RUNTIME_OBJS)
 	ar -cr $@ $(RUNTIME_OBJS)
 
+version.h: ../version.mk
+	echo '#define VERSION "$(VERSION)"' > version.h
+	echo '#define PUBDATE "$(PUBDATE)"' >> version.h
+
 ifeq ($(BUILD_PARSERS),true)
 
 lmparse.h: lmparse.kh
diff --git a/common/buffer.h b/colm/buffer.h
index 99c4e82d..99c4e82d 100644
--- a/common/buffer.h
+++ b/colm/buffer.h
diff --git a/common/common.cpp b/colm/common.cpp
index e6b0a70b..e6b0a70b 100644
--- a/common/common.cpp
+++ b/colm/common.cpp
diff --git a/common/common.h b/colm/common.h
index 53ce443d..53ce443d 100644
--- a/common/common.h
+++ b/colm/common.h
diff --git a/common/config.h.in b/colm/config.h.in
index c370f3b6..c370f3b6 100644
--- a/common/config.h.in
+++ b/colm/config.h.in
diff --git a/common/pcheck.h b/colm/pcheck.h
index df3706c2..df3706c2 100644
--- a/common/pcheck.h
+++ b/colm/pcheck.h
diff --git a/common/Makefile.in b/common/Makefile.in
deleted file mode 100644
index 47dc3567..00000000
--- a/common/Makefile.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#   Copyright 2001-2006 Adrian Thurston <thurston@cs.queensu.ca>
-#
-
-#   This file is part of Ragel.
-#
-#   Ragel is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   Ragel is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with Ragel; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-
-INCS += 
-DEFS +=
-
-CFLAGS += -g -Wall
-LDFLAGS +=
-
-CC_SRCS = common.cpp
-
-GEN_SRC = version.h
-
-#*************************************
-
-# Programs
-CXX = @CXX@
-
-# Get objects and dependencies from sources.
-OBJS = $(CC_SRCS:%.cpp=%.o)
-DEPS = $(CC_SRCS:%.cpp=.%.d)
-
-# Get the version info.
-include ../version.mk
-
-# rules
-
-all: common.a
-
-common.a: $(GEN_SRC) $(OBJS)
-	ar -cr $@ $(OBJS) 
-
-version.h: ../version.mk
-	echo '#define VERSION "$(VERSION)"' > version.h
-	echo '#define PUBDATE "$(PUBDATE)"' >> version.h
-
-%.o: %.cpp
-	@$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-	$(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
-
-distclean: clean
-	rm -f Makefile config.h
-
-clean:
-	rm -f tags version.h .*.d *.o common.a
-
-install:
-	@true
-
--include $(DEPS)
diff --git a/configure b/configure
index be493813..0b75c81e 100755
--- a/configure
+++ b/configure
@@ -1649,7 +1649,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-ac_config_headers="$ac_config_headers common/config.h"
+ac_config_headers="$ac_config_headers colm/config.h"
 
 
 BUILD_PARSERS=true
@@ -3120,7 +3120,7 @@ fi
 
 fi # BUILD_PARSERS
 
-ac_config_files="$ac_config_files Makefile common/Makefile colm/Makefile"
+ac_config_files="$ac_config_files Makefile colm/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3674,9 +3674,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "common/config.h") CONFIG_HEADERS="$CONFIG_HEADERS common/config.h" ;;
+    "colm/config.h") CONFIG_HEADERS="$CONFIG_HEADERS colm/config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
     "colm/Makefile") CONFIG_FILES="$CONFIG_FILES colm/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.in b/configure.in
index 9a4d827d..575d2a7f 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ dnl   along with Colm; if not, write to the Free Software
 dnl   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
   
 AC_INIT(colm/main.cpp)
-AC_CONFIG_HEADER(common/config.h)
+AC_CONFIG_HEADER(colm/config.h)
 
 dnl Set to true if build system should generate parsers from ragel, kelbt, and
 dnl gperf sources. Set to false if generated files are included and not to be
@@ -74,6 +74,6 @@ fi
 fi # BUILD_PARSERS
 
 dnl write output files
-AC_OUTPUT(Makefile common/Makefile colm/Makefile)
+AC_OUTPUT(Makefile colm/Makefile)
 
 echo "configuration of colm complete"