From 07a964b53875be80a5e9d34f71fa530e1c72076f Mon Sep 17 00:00:00 2001 From: thurston Date: Thu, 9 Apr 2009 02:39:13 +0000 Subject: [PATCH] Removed the dist-hook. Just going to use ragel-release for changing build_parsers. Added the ragel and kelbt sources to EXTRA_DIST. Fixed the wrapper around the checks for ragel and kelbt in the configure script. git-svn-id: http://svn.complang.org/ragel/trunk@786 052ea7fc-9027-0410-9066-f65837a77df0 --- Makefile.am | 8 -------- configure.in | 3 ++- ragel/Makefile.am | 2 ++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 27ed26d..97bdc8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,3 @@ SUBDIRS = ragel aapl doc test contrib dist_doc_DATA = ChangeLog -sed_script = 's/build_parsers=yes/build_parsers=no/;s/build_manual=yes/build_manual=no/;' - -dist-hook: - cp $(top_distdir)/configure $(top_distdir)/configure.tmp - cp $(top_distdir)/configure.in $(top_distdir)/configure.in.tmp - sed $(sed_script) $(top_distdir)/configure.tmp > $(top_distdir)/configure - sed $(sed_script) $(top_distdir)/configure.in.tmp > $(top_distdir)/configure.in - rm $(top_distdir)/configure.tmp $(top_distdir)/configure.in.tmp diff --git a/configure.in b/configure.in index 00f1e11..a711112 100644 --- a/configure.in +++ b/configure.in @@ -31,6 +31,7 @@ dnl (production). build_parsers=yes; AM_CONDITIONAL(BUILD_PARSERS, [test "x$build_parsers" = "xyes"]) +dnl Set to true if the manual should be built. build_manual=yes; AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"]) @@ -46,7 +47,7 @@ AC_LANG_CPLUSPLUS dnl Check for definition of MAKE. AC_PROG_MAKE_SET -if test "x$enable_parsers" = "xyes"; then +if test "x$build_parsers" = "xyes"; then dnl Check for Ragel AC_CHECK_PROG(RAGEL, ragel, ragel) diff --git a/ragel/Makefile.am b/ragel/Makefile.am index 76c4ea2..2d62db2 100644 --- a/ragel/Makefile.am +++ b/ragel/Makefile.am @@ -27,6 +27,8 @@ version.h: Makefile echo '#define VERSION "$(PACKAGE_VERSION)"' > version.h echo '#define PUBDATE "$(PUBDATE)"' >> version.h +EXTRA_DIST = rlscan.rl rlparse.kh rlparse.kl + if BUILD_PARSERS CLEANFILES = \ -- 2.7.4