From: Will Estes <wlestes@users.sourceforge.net>
Date: Tue, 13 Feb 2007 15:07:43 +0000 (+0000)
Subject: move automake options from Makefile.am to configure.in
X-Git-Tag: flex-2-5-34~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a7c023ff947da836e2f6573ba34c0d8b7b1532a;p=flex

move automake options from Makefile.am to configure.in
---

diff --git a/Makefile.am b/Makefile.am
index 34c144c..0fbf9ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,12 +38,6 @@ ACLOCAL_AMFLAGS = -I m4
 m4 = @M4@
 indent = @INDENT@
 
-AUTOMAKE_OPTIONS = \
-	gnits \
-	check-news \
-	dist-bzip2 \
-	1.7
-
 bin_PROGRAMS = flex
 lib_LIBRARIES = libfl.a
 
@@ -151,12 +145,13 @@ yylex.o: yylex.c flexdef.h flexint.h parse.h
 filter.o: filter.c flexdef.h flexint.h
 
 # Create a tags file.
+
 tags:
 	ctags --c-types='defgmstuv' $(srcdir)/*.[ch]
 
 # Create the ChangeLog, but only if we're inside a cvs working directory
 
-ChangeLog:
+ChangeLog: $(srcdir)/tools/cvsauthors $(srcdir)/tools/cvs2cl.pl
 	if [ -d CVS ] ; then \
 		sh $(srcdir)/tools/cvs2cl.pl -F trunk -U $(srcdir)/tools/cvsauthors \
 	; fi
diff --git a/configure.in b/configure.in
index e8d1ec6..35547df 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ dnl autoconf requirements and initialization
 AC_PREREQ(2.54)
 AC_INIT(flex,2.5.33,flex-help@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(scan.l)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(gnits check-news dist-bzip2)
 AC_CONFIG_HEADER(config.h:conf.in)
 
 dnl checks for programs