summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2009-11-20 17:42:59 +0100
committerPaolo Bonzini <bonzini@gnu.org>2009-11-20 17:48:15 +0100
commit47f36af857e431d6b1da1dc29141010979fc4123 (patch)
tree8cf5e733dba35295dee30d1ee18ea3201ba3c03a /Makefile.am
parentdc71afef32e596523ed782bea0d1814975b76d36 (diff)
downloadgrep-47f36af857e431d6b1da1dc29141010979fc4123.tar.gz
start modernizing autoconf infrastructure
* configure.ac: Slightly modernize. * Makefile.am: Modernize, use dependencies. * Makefile.am: Modernize, use dependencies. * lib/Makefile.am: Remove ansi2knr. * src/Makefile.am: Remove ansi2knr. * .gitignore: Add INSTALL * build-aux/.gitignore: New.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am18
1 files changed, 2 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index efec9aa3..b96b7772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,27 +16,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS = gnu
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = intl po lib doc src tests m4 vms bootstrap
EXTRA_DIST = TODO README README-alpha
-# We should be able to just define `ACLOCAL_AMFLAGS = --acdir=m4',
-# but this runs afoul of a bug in automake 1.
-# The following hack works around this bug by creating acinclude.m4 manually.
-ACLOCAL_AMFLAGS =
-M4DIR = $(srcdir)/m4
-ACINCLUDE_INPUTS = $(M4DIR)/decl.m4 $(M4DIR)/djgpp.m4 $(M4DIR)/dosfile.m4 \
- $(M4DIR)/envsep.m4 $(M4DIR)/error.m4 $(M4DIR)/gettext.m4 $(M4DIR)/glibc.m4 \
- $(M4DIR)/header.m4 $(M4DIR)/init.m4 $(M4DIR)/install.m4 \
- $(M4DIR)/inttypes_h.m4 $(M4DIR)/isc-posix.m4 $(M4DIR)/largefile.m4 \
- $(M4DIR)/lcmessage.m4 $(M4DIR)/malloc.m4 $(M4DIR)/mbstate_t.m4 \
- $(M4DIR)/missing.m4 $(M4DIR)/progtest.m4 $(M4DIR)/realloc.m4 \
- $(M4DIR)/regex.m4 $(M4DIR)/sanity.m4 $(M4DIR)/strerror_r.m4 \
- $(M4DIR)/uintmax_t.m4 $(M4DIR)/ulonglong.m4 $(M4DIR)/xstrtoumax.m4
-$(srcdir)/acinclude.m4 : $(ACINCLUDE_INPUTS)
- cat $(ACINCLUDE_INPUTS) >$(srcdir)/acinclude.m4
# make cvs-clean blatantly stolen from KDE CVS ;)
cvs-clean: