Clean up recent patches a little.

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ed3e5a867e5982d05b15d1934bf141e7e4fe7991..e1c85061d04e6f20b5e024722246f0e8d43eed04 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-## Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+## Free Software Foundation, Inc.
 
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po runtime-po lib . tests
+SUBDIRS = po runtime-po .
 if BISON_CXX_WORKS
 SUBDIRS += examples/calc++
 endif
@@ -31,7 +31,10 @@ EXTRA_DIST = .prev-version .version \
   OChangeLog PACKAGING
 
 # Initialization before completion by local.mk's.
+AM_CFLAGS = $(WARN_CFLAGS)
+AM_CPPFLAGS =
 BUILT_SOURCES =
+DISTCLEANFILES =
 MOSTLYCLEANFILES =
 include build-aux/local.mk
 include data/local.mk
@@ -39,19 +42,9 @@ include djgpp/local.mk
 include doc/local.mk
 include etc/local.mk
 include examples/local.mk
+include lib/local.mk
 include src/local.mk
-
-.PHONY: maintainer-check
-maintainer-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
-
-.PHONY: maintainer-push-check
-maintainer-push-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
-
-.PHONY: maintainer-xml-check
-maintainer-xml-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+include tests/local.mk
 
 # See comments in build-aux/git-version-gen.  However, we make .version depend
 # on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the