github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-27 21:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some updates for automake 1.7 and prep for releasing 3.80.

Browse Source
This commit is contained in:
Paul Smith 2002-10-03 05:46:12 +00:00
parent 2de1b62112
commit 1d3dfeb74b
7 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 2002-09-30 Martin P.J. Zinser <zinser@decus.de>
* makefile.com: Updates for GNU make 3.80. * makefile.com: Updates for GNU make 3.80.

6
Makefile.am
View File

@ -1,6 +1,6 @@
# This is a -*-Makefile-*-, or close enough # 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 ACLOCAL_AMFLAGS = -I config
SUBDIRS = glob config po doc SUBDIRS = glob config po doc
@ -51,10 +51,10 @@ MAKE_HOST = @MAKE_HOST@
# Forward targets # Forward targets
html pdf: html:
cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
.PHONY: html pdf .PHONY: html
# --------------- Internationalization Section # --------------- Internationalization Section

2
NEWS
View File

@ -1,6 +1,6 @@
GNU make NEWS -*-indented-text-*- GNU make NEWS -*-indented-text-*-
History of user-visible changes. History of user-visible changes.
10 September 2002 03 October 2002
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.

6
configure.in
View File

@ -1,15 +1,15 @@
# Process this file with autoconf to produce a configure script. # 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$]]) AC_REVISION([[$Id$]])
# Autoconf setup # Autoconf setup
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(vpath.c) AC_CONFIG_SRCDIR(vpath.c)
AM_CONFIG_HEADER(config.h) AC_CONFIG_HEADERS(config.h)
# Automake setup # Automake setup
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE

10
doc/Makefile.am
View File

@ -9,7 +9,7 @@ TEXI2HTML_FLAGS = -split_chapter
info_TEXINFOS = make.texi info_TEXINFOS = make.texi
make_TEXINFOS = fdl.texi make-stds.texi make_TEXINFOS = fdl.texi make-stds.texi
CLEANFILES = make*.html make*.pdf CLEANFILES = make*.html
## ----------------------------- ## ## ----------------------------- ##
## Other documentation formats. ## ## Other documentation formats. ##
@ -20,10 +20,4 @@ html: make_1.html
make_1.html: $(info_TEXINFOS) $(make_TEXINFOS) make_1.html: $(info_TEXINFOS) $(make_TEXINFOS)
$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/make.texi $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/make.texi
.PHONY: html
pdf: make.pdf
make.pdf: $(info_TEXINFOS) $(make_TEXINFOS)
$(TEXI2DVI) --pdf --batch $(srcdir)/make.texi
.PHONY: html pdf

2
glob/Makefile.am
View File

@ -1,6 +1,6 @@
# -*-Makefile-*-, or close enough # -*-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. # Only build the library when the system doesn't already have GNU glob.
if USE_LOCAL_GLOB if USE_LOCAL_GLOB

22
tests/scripts/functions/wildcard
View File

@ -1,16 +1,17 @@
# -*-perl-*- # -*-perl-*-
$description = "The following test creates a makefile to test wildcard\n" $description = "The following test creates a makefile to test wildcard
."expansions and the ability to put a command on the same\n" expansions and the ability to put a command on the same
."line as the target name separated by a semi-colon."; line as the target name separated by a semi-colon.";
$details = "This test creates 4 files by the names of 1.example, \n" $details = "\
."two.example and 3.example. We execute three tests. The first\n" This test creates 4 files by the names of 1.example,
."executes the print1 target which tests the '*' wildcard by \n" two.example and 3.example. We execute three tests. The first
."echoing all filenames by the name of '*.example'. The second\n" executes the print1 target which tests the '*' wildcard by
."test echo's all files which match '?.example' and \n" echoing all filenames by the name of '*.example'. The second
."[a-z0-9].example. Lastly we clean up all of the files using\n" test echo's all files which match '?.example' and
."the '*' wildcard as in the first test"; [a-z0-9].example. Lastly we clean up all of the files using
the '*' wildcard as in the first test";
if ($vos) if ($vos)
{ {
@ -27,6 +28,7 @@ open(MAKEFILE,"> $makefile");
# The Contents of the MAKEFILE ... # The Contents of the MAKEFILE ...
print MAKEFILE <<EOM; print MAKEFILE <<EOM;
.PHONY: print1 print2 clean
print1: ;\@echo \$(wildcard example.*) print1: ;\@echo \$(wildcard example.*)
print2: print2:
\t\@echo \$(wildcard example.?) \t\@echo \$(wildcard example.?)