diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 29 | ||||
| -rw-r--r-- | ragel/Makefile.am | 8 | ||||
| -rw-r--r-- | test/Makefile.am (renamed from test/Makefile.in) | 20 | ||||
| -rwxr-xr-x | test/runtests.in (renamed from test/runtests) | 16 | ||||
| -rw-r--r-- | version.mk | 2 |
6 files changed, 30 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am index 13d54fd3..8f908d91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = ragel aapl +SUBDIRS = ragel aapl test no_parsers = 's/build_parsers=yes/build_parsers=no/' diff --git a/configure.in b/configure.in index 9ce9dd9d..4533a151 100644 --- a/configure.in +++ b/configure.in @@ -19,8 +19,10 @@ dnl along with Ragel; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA AC_INIT(ragel, 6.4) -AM_INIT_AUTOMAKE +PUBDATE="March 2009" +AM_INIT_AUTOMAKE +AC_SUBST(PUBDATE) AC_CONFIG_HEADER(ragel/config.h) dnl Set to true if the build system should generate parsers from ragel and kelbt @@ -34,10 +36,6 @@ AC_PROG_CC AC_PROG_CXX AC_CHECK_TOOL(AR, ar) AC_PROG_RANLIB -#AC_DEFINE_UNQUOTED(CC,$CC) -#AC_DEFINE_UNQUOTED(CXX,$CXX) -#AC_DEFINE_UNQUOTED(AR,$AR) -#AC_DEFINE_UNQUOTED(RANLIB,$RANLIB) dnl Set test on c++ compiler. AC_LANG_CPLUSPLUS @@ -69,9 +67,6 @@ fi # BUILD_PARSERS dnl Check for the D compiler AC_CHECK_PROG(GDC, gdc, gdc) -#if test -n "$GDC"; then -# AC_DEFINE_UNQUOTED(GDC,$GDC) -#fi dnl Check for the Objective-C compiler AC_MSG_CHECKING([for the Objective-C compiler]) @@ -82,7 +77,6 @@ GOBJC="" if gcc -x objective-c conftest.m -o conftest.bin 2>/dev/null; then GOBJC="gcc -x objective-c" AC_MSG_RESULT([yes]) -# AC_DEFINE_UNQUOTED(GOBJC,$GOBJC) else AC_MSG_RESULT([no]) fi @@ -90,29 +84,20 @@ AC_SUBST(GOBJC) dnl Check for the Java compiler. AC_CHECK_PROG(JAVAC, javac, javac) -#if test -n "$JAVAC"; then -# AC_DEFINE_UNQUOTED(JAVAC,$JAVAC) -#fi dnl Check for TXL. AC_CHECK_PROG(TXL, txl, txl) -#if test -n "$TXL"; then -# AC_DEFINE_UNQUOTED(TXL,$TXL) -#fi dnl Check for Ruby. AC_CHECK_PROG(RUBY, ruby, ruby) -#if test -n "$RUBY"; then -# AC_DEFINE_UNQUOTED(RUBY,$RUBY) -#fi dnl Check for the C# compiler. AC_CHECK_PROG(GMCS, gmcs, gmcs) -#if test -n "$GMCS"; then -# AC_DEFINE_UNQUOTED(GMCS,$GMCS) -#fi dnl write output files -AC_OUTPUT(Makefile ragel/Makefile aapl/Makefile doc/Makefile test/Makefile) +AC_OUTPUT( + [Makefile ragel/Makefile aapl/Makefile doc/Makefile test/Makefile test/runtests], + [chmod +x test/runtests] +) echo "configuration of ragel complete" diff --git a/ragel/Makefile.am b/ragel/Makefile.am index c0b9a5a2..55ab9776 100644 --- a/ragel/Makefile.am +++ b/ragel/Makefile.am @@ -26,13 +26,9 @@ BUILT_SOURCES = \ CLEANFILES = \ rlscan.cpp rlparse.h rlparse.cpp -# Get the version info. -include ../version.mk - -version.h: ../version.mk - echo '#define VERSION "$(VERSION)"' > version.h +version.h: Makefile + echo '#define VERSION "$(PACKAGE_VERSION)"' > version.h echo '#define PUBDATE "$(PUBDATE)"' >> version.h - echo '#define PREFIX "$(prefix)"' >> version.h if BUILD_PARSERS diff --git a/test/Makefile.in b/test/Makefile.am index ab3c02c1..492dec3c 100644 --- a/test/Makefile.in +++ b/test/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2002-2006 Adrian Thurston <thurston@complang.org> +# Copyright 2002-2009 Adrian Thurston <thurston@complang.org> # # This file is part of Ragel. @@ -19,12 +19,16 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -test: - @./runtests +TESTS = runtests -clean: - rm -f *.c *.cpp *.m *.d *.java *.bin *.class *.exp \ - *.out *_c.rl *_d.rl *_java.rl *_ruby.rl *_csharp.rl *.cs *.exe -distclean: clean - rm -f Makefile +#clean: +# rm -f *.c *.cpp *.m *.d *.java *.bin *.class *.exp \ +# *.out *_c.rl *_d.rl *_java.rl *_ruby.rl *_csharp.rl *.cs *.exe +# +#distclean: clean +# rm -f Makefile +# + +#Makefile: runtests + diff --git a/test/runtests b/test/runtests.in index daa2791f..d912d556 100755 --- a/test/runtests +++ b/test/runtests.in @@ -54,14 +54,14 @@ shift $((OPTIND - 1)); config=../ragel/config.h ragel=../ragel/ragel -cxx_compiler=`sed '/^#define CXX/s/#define CXX *//p;d' $config` -c_compiler=`sed '/^#define CC/s/#define CC *//p;d' $config` -objc_compiler=`sed '/^#define GOBJC/s/#define GOBJC *//p;d' $config` -d_compiler=`sed '/^#define GDC/s/#define GDC *//p;d' $config` -java_compiler=`sed '/#define JAVAC/s/#define JAVAC *//p;d' $config` -txl_engine=`sed '/^#define TXL/s/#define TXL *//p;d' $config` -ruby_engine=`sed '/^#define RUBY/s/#define RUBY *//p;d' $config` -csharp_compiler=`sed '/#define GMCS/s/#define GMCS *//p;d' $config` +cxx_compiler="@CXX@" +c_compiler="@CC@" +objc_compiler="@GOBJC@" +d_compiler="@GDC@" +java_compiler="@JAVAC@" +txl_engine="@TXL@" +ruby_engine="@RUBY@" +csharp_compiler="@GMCS@" function test_error { diff --git a/version.mk b/version.mk deleted file mode 100644 index fd299938..00000000 --- a/version.mk +++ /dev/null @@ -1,2 +0,0 @@ -VERSION = 6.4 -PUBDATE = March 2009 |