summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am6
-rw-r--r--NEWS2
-rw-r--r--configure.in6
-rw-r--r--doc/Makefile.am10
-rw-r--r--glob/Makefile.am2
-rw-r--r--tests/scripts/functions/wildcard24
7 files changed, 32 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 7be6353..f4204eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-03 Paul D. Smith <psmith@gnu.org>
+
+ Update to automake 1.7.
+
+ * Makefile.am (AUTOMAKE_OPTIONS): Update to require 1.7.
+ (pdf): Remove this target as automake now provides one.
+
+ * configure.in: Change AM_CONFIG_HEADER to AC_CONFIG_HEADERS.
+
2002-09-30 Martin P.J. Zinser <zinser@decus.de>
* makefile.com: Updates for GNU make 3.80.
diff --git a/Makefile.am b/Makefile.am
index e00cc6f..c40f18b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
# This is a -*-Makefile-*-, or close enough
-AUTOMAKE_OPTIONS = 1.6 dist-bzip2
+AUTOMAKE_OPTIONS = 1.7 dist-bzip2 check-news
ACLOCAL_AMFLAGS = -I config
SUBDIRS = glob config po doc
@@ -51,10 +51,10 @@ MAKE_HOST = @MAKE_HOST@
# Forward targets
-html pdf:
+html:
cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
-.PHONY: html pdf
+.PHONY: html
# --------------- Internationalization Section
diff --git a/NEWS b/NEWS
index ef961e2..dad7606 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
GNU make NEWS -*-indented-text-*-
History of user-visible changes.
- 10 September 2002
+ 03 October 2002
Copyright (C) 2002 Free Software Foundation, Inc.
See the end for copying conditions.
diff --git a/configure.in b/configure.in
index c5c8026..df18069 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,15 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(GNU make,3.80rc2,bug-make@gnu.org)
+AC_INIT(GNU make,3.80,bug-make@gnu.org)
-AC_PREREQ(2.53)
+AC_PREREQ(2.54)
AC_REVISION([[$Id$]])
# Autoconf setup
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(vpath.c)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Automake setup
AM_INIT_AUTOMAKE
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bf979c8..4aa626c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,7 +9,7 @@ TEXI2HTML_FLAGS = -split_chapter
info_TEXINFOS = make.texi
make_TEXINFOS = fdl.texi make-stds.texi
-CLEANFILES = make*.html make*.pdf
+CLEANFILES = make*.html
## ----------------------------- ##
## Other documentation formats. ##
@@ -20,10 +20,4 @@ html: make_1.html
make_1.html: $(info_TEXINFOS) $(make_TEXINFOS)
$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/make.texi
-
-pdf: make.pdf
-
-make.pdf: $(info_TEXINFOS) $(make_TEXINFOS)
- $(TEXI2DVI) --pdf --batch $(srcdir)/make.texi
-
-.PHONY: html pdf
+.PHONY: html
diff --git a/glob/Makefile.am b/glob/Makefile.am
index 325d200..7623ffe 100644
--- a/glob/Makefile.am
+++ b/glob/Makefile.am
@@ -1,6 +1,6 @@
# -*-Makefile-*-, or close enough
-AUTOMAKE_OPTIONS = 1.6 foreign
+AUTOMAKE_OPTIONS = 1.7 foreign
# Only build the library when the system doesn't already have GNU glob.
if USE_LOCAL_GLOB
diff --git a/tests/scripts/functions/wildcard b/tests/scripts/functions/wildcard
index d21747f..0f79acc 100644
--- a/tests/scripts/functions/wildcard
+++ b/tests/scripts/functions/wildcard
@@ -1,16 +1,17 @@
# -*-perl-*-
-$description = "The following test creates a makefile to test wildcard\n"
- ."expansions and the ability to put a command on the same\n"
- ."line as the target name separated by a semi-colon.";
-
-$details = "This test creates 4 files by the names of 1.example, \n"
- ."two.example and 3.example. We execute three tests. The first\n"
- ."executes the print1 target which tests the '*' wildcard by \n"
- ."echoing all filenames by the name of '*.example'. The second\n"
- ."test echo's all files which match '?.example' and \n"
- ."[a-z0-9].example. Lastly we clean up all of the files using\n"
- ."the '*' wildcard as in the first test";
+$description = "The following test creates a makefile to test wildcard
+expansions and the ability to put a command on the same
+line as the target name separated by a semi-colon.";
+
+$details = "\
+This test creates 4 files by the names of 1.example,
+two.example and 3.example. We execute three tests. The first
+executes the print1 target which tests the '*' wildcard by
+echoing all filenames by the name of '*.example'. The second
+test echo's all files which match '?.example' and
+[a-z0-9].example. Lastly we clean up all of the files using
+the '*' wildcard as in the first test";
if ($vos)
{
@@ -27,6 +28,7 @@ open(MAKEFILE,"> $makefile");
# The Contents of the MAKEFILE ...
print MAKEFILE <<EOM;
+.PHONY: print1 print2 clean
print1: ;\@echo \$(wildcard example.*)
print2:
\t\@echo \$(wildcard example.?)