removed version.h from libfsm, updated the dist test

6 files changed, 15 insertions, 32 deletions

diff --git a/libfsm/Makefile.am b/libfsm/Makefile.am
index 261aa0a4..5e870bdb 100644
--- a/libfsm/Makefile.am
+++ b/libfsm/Makefile.am
@@ -16,7 +16,7 @@ libfsminclude_HEADERS = \
 libfsm_la_CPPFLAGS = -I$(top_srcdir)/aapl
 
 dist_libfsm_la_SOURCES = \
-	buffer.h codegen.h \
+	parsedata.h parsetree.h inputdata.h codegen.h \
 	actloop.h actexp.h \
 	tables.h \
 	binary.h bingoto.h binbreak.h binvar.h \
@@ -35,9 +35,6 @@ dist_libfsm_la_SOURCES = \
 	goto.cc gotoloop.cc gotoexp.cc ipgoto.cc \
 	dot.cc asm.cc
 
-nodist_libfsm_la_SOURCES = \
-	version.h
-
 libfsm_la_LDFLAGS = -no-undefined
 
 if LINKER_NO_UNDEFINED
diff --git a/libfsm/allocgen.cc b/libfsm/allocgen.cc
index fee37940..9f3fbe51 100644
--- a/libfsm/allocgen.cc
+++ b/libfsm/allocgen.cc
@@ -25,7 +25,6 @@
 #include "fsmgraph.h"
 #include "gendata.h"
 #include "inputdata.h"
-#include "version.h"
 
 /*
  * Code generators.
diff --git a/libfsm/gendata.cc b/libfsm/gendata.cc
index c44f7049..a11f3ce7 100644
--- a/libfsm/gendata.cc
+++ b/libfsm/gendata.cc
@@ -25,7 +25,6 @@
 #include "parsedata.h"
 #include "fsmgraph.h"
 #include "inputdata.h"
-#include "version.h"
 
 #include <string.h>
 #include <iostream>
diff --git a/libfsm/version.h.cmake.in b/libfsm/version.h.cmake.in
deleted file mode 100644
index 0f9fa015..00000000
--- a/libfsm/version.h.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-/* version.h Generated from version.h.cmake.in by cmake */
-
-#ifndef _RAGEL_VERSION_H
-#define _RAGEL_VERSION_H
-
-#cmakedefine RAGEL_VERSION "@RAGEL_VERSION@"
-#cmakedefine RAGEL_PUBDATE "@RAGEL_PUBDATE@"
-
-#endif /* _RAGEL_VERSION_H */
diff --git a/test/Makefile.am b/test/Makefile.am
index 5220fe30..baeb7354 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,3 +11,7 @@ subject.mk: subject.mk.in Makefile
 
 subject.sh: subject.sh.in Makefile
 	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+
+dist: dist.sh
+	@$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST)
+
diff --git a/test/dist.sh b/test/dist.sh
index 297e9bad..9fbf96b5 100644..100755
--- a/test/dist.sh
+++ b/test/dist.sh
@@ -1,25 +1,18 @@
 #!/bin/bash
 #
 
-# Make the dist, build from the dist it, install, then run the test suite
-# against what's been installed.
+set -x
 
-set -ex
-
-VERSION=`sed -n '/^[ \t]*AC_INIT\>/{ s/.*, *//; s/ *).*//; p }' configure.ac`
-
-rm -Rf colm-suite-${VERSION}.tar.{gz,bz2} colm-suite-${VERSION}
+eval `grep VERSION= config.status`
+DIST=colm-$VERSION.tar.gz
 
+trap "rm -f $DIST" EXIT
 make dist
-tar -zxvf colm-suite-${VERSION}.tar.gz
-
-cd colm-suite-${VERSION}
-
-./configure --prefix=/tmp/colm-suite \
-	--with-crack=/home/thurston/pkgs/crack --enable-manual --enable-debug
-
-make
 
-cd test
+WORKDIR=`mktemp -d /tmp/colm.XXXXXX`
+#trap "rm -Rf $DIST $WORKDIR" EXIT
+tar -C $WORKDIR -xzvf $DIST
 
-./runtests
+cd $WORKDIR/${DIST%.tar.gz}
+./configure && make -j8
+cd test && ./runtests