diff options
| author | Eric Blake <ebb9@byu.net> | 2008-01-22 13:35:00 -0700 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-01-22 13:37:10 -0700 |
| commit | bf389f4092e0b674a521291b2c6f5862fd14072f (patch) | |
| tree | 85dad3f425d31014df945275ca3f0abbc360bae1 /Makefile.am | |
| parent | 28cd2024b5c84141f2c3cf08602141b33eadd85a (diff) | |
| download | m4-bf389f4092e0b674a521291b2c6f5862fd14072f.tar.gz | |
Rely on newer automake.
* configure.ac (AM_INIT_AUTOMAKE): Require 1.10.1, and add lzma
distribution.
* bootstrap: Update automake requirement.
(func_version): Fix --version output, broken since 2007-08-06.
* HACKING: Likewise. Add lzma requirement.
* Makefile.am (clean-local-src): Not needed any more with newest
Automake.
(clean-local): Adjust.
* TODO: Remove completed item.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 49db5ef2..e79210c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am - template for generating Makefile via Automake ## -## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software -## Foundation, Inc. +## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free +## Software Foundation, Inc. ## ## This file is part of GNU M4. ## @@ -86,13 +86,6 @@ src_m4_LDFLAGS = $(AM_LDFLAGS) $(DLPREOPEN) src_m4_LDADD = m4/libm4.la src_m4_DEPENDENCIES = $(PREOPEN_DEPENDENCIES) m4/libm4.la -## Since we do not build a libtool library in src, Automake fails to infer -## that there may be a libs directory there. FIXME - revisit this if -## automake 1.10 fixes the bug. -clean-local-src: - -rm -rf src/.libs src/_libs - - ## ## ## --- PASTED MANUALLY FROM GNULIB --- ## ## To avoid adding unnecessary objects to libm4.la these gnulib ## @@ -441,7 +434,7 @@ OTHER_FILES = tests/iso8859.m4 tests/stackovf.test \ DISTCLEANFILES += tests/atconfig tests/atlocal tests/m4 MAINTAINERCLEANFILES += tests/generated.at '$(TESTSUITE)' -clean-local: clean-local-src clean-local-tests +clean-local: clean-local-tests ## ## ## --- RULES FOR THE MAINTAINER --- ## |