Thien-Thi Nguyen wrote:
> Zonking a CVS-ism in gnulib documentation...
Thank you for the patch.
I couldn't apply it like this, however, because you cannot have rule
dependencies with wildcards like this:
update-stamp: *.texi */*.texi
You need to use the GNU make function $(wildcard ...) for this.
I applied these two patches.
Bruno
2008-06-19 Bruno Haible <[EMAIL PROTECTED]>
* doc/Makefile (gnulib.info): Update and simplify dependencies.
Reported by Thien-Thi Nguyen <[EMAIL PROTECTED]>.
*** doc/Makefile.orig 2008-06-19 13:46:57.000000000 +0200
--- doc/Makefile 2008-06-19 13:46:48.000000000 +0200
***************
*** 1,4 ****
- # $Id: Makefile,v 1.8 2007-07-06 22:56:38 haible Exp $
# Makefile for gnulib doc.
# Copyright (C) 2004, 2006-2008 Free Software Foundation, Inc.
#
--- 1,3 ----
***************
*** 25,31 ****
pdf: $(doc).pdf
# Dependencies. Search for @include to find them all.
! gnulib.info gnulib.html gnulib.dvi gnulib.pdf: gnulib.texi gnulib-intro.texi
gnulib-tool.texi $(wildcard headers/*.texi) $(wildcard functions/*.texi)
quote.texi error.texi gcd.texi relocatable-maint.texi regexprops-generic.texi
fdl.texi
standards.info standards.html standards.dvi: standards.texi make-stds.texi
fdl.texi
mostlyclean:
--- 24,30 ----
pdf: $(doc).pdf
# Dependencies. Search for @include to find them all.
! gnulib.info gnulib.html gnulib.dvi gnulib.pdf: $(filter-out maintain.texi
make-stds.texi standards.texi,$(wildcard *.texi)) $(wildcard
posix-headers/*.texi) $(wildcard posix-functions/*.texi) $(wildcard
glibc-headers/*.texi) $(wildcard glibc-functions/*.texi)
standards.info standards.html standards.dvi: standards.texi make-stds.texi
fdl.texi
mostlyclean:
2008-06-19 Bruno Haible <[EMAIL PROTECTED]>
Fix CVS-ism.
* doc/gnulib.texi: Include updated-stamp.texi.
* doc/Makefile (GNULIB_TEXI_FILES): New variable.
(updated-stamp.texi): New rule.
(gnulib.info): Depend on it.
* doc/.gitignore: Add updated-stamp.texi.
Based on a patch by Thien-Thi Nguyen <[EMAIL PROTECTED]>.
*** doc/.gitignore.orig 2008-06-19 13:50:58.000000000 +0200
--- doc/.gitignore 2008-06-19 13:49:57.000000000 +0200
***************
*** 14,16 ****
--- 14,17 ----
gnulib.info-2
gnulib.info-3
gnulib.html
+ updated-stamp
*** doc/Makefile.orig 2008-06-19 13:50:58.000000000 +0200
--- doc/Makefile 2008-06-19 13:50:38.000000000 +0200
***************
*** 23,34 ****
dvi: $(doc).dvi
pdf: $(doc).pdf
# Dependencies. Search for @include to find them all.
! gnulib.info gnulib.html gnulib.dvi gnulib.pdf: $(filter-out maintain.texi
make-stds.texi standards.texi,$(wildcard *.texi)) $(wildcard
posix-headers/*.texi) $(wildcard posix-functions/*.texi) $(wildcard
glibc-headers/*.texi) $(wildcard glibc-functions/*.texi)
standards.info standards.html standards.dvi: standards.texi make-stds.texi
fdl.texi
mostlyclean:
rm -f *.aux *.cp *.cps *.fn *.ky *.log *.pg *.toc *.tp *.vr *.vrs
clean: mostlyclean
rm -f *.info *.html *.dvi *.ps *.pdf
--- 23,41 ----
dvi: $(doc).dvi
pdf: $(doc).pdf
+ GNULIB_TEXI_FILES = $(filter-out maintain.texi make-stds.texi
standards.texi,$(wildcard *.texi)) $(wildcard posix-headers/*.texi) $(wildcard
posix-functions/*.texi) $(wildcard glibc-headers/*.texi) $(wildcard
glibc-functions/*.texi)
+
+ # Date of last update. Requires GNU date.
+ updated-stamp: $(GNULIB_TEXI_FILES)
+ date -u -r `ls -t $^ | sed 1q` +"@set UPDATED %F %T" > $@
+
# Dependencies. Search for @include to find them all.
! gnulib.info gnulib.html gnulib.dvi gnulib.pdf: $(GNULIB_TEXI_FILES)
updated-stamp
standards.info standards.html standards.dvi: standards.texi make-stds.texi
fdl.texi
mostlyclean:
rm -f *.aux *.cp *.cps *.fn *.ky *.log *.pg *.toc *.tp *.vr *.vrs
+ rm -f updated-stamp
clean: mostlyclean
rm -f *.info *.html *.dvi *.ps *.pdf
*** doc/gnulib.texi.orig 2008-06-19 13:50:58.000000000 +0200
--- doc/gnulib.texi 2008-06-19 13:49:57.000000000 +0200
***************
*** 10,16 ****
@end ifclear
@comment %**end of header
! @set UPDATED $Date: 2007-09-09 13:20:45 $
@copying
This manual is for GNU Gnulib (updated @value{UPDATED}),
--- 10,17 ----
@end ifclear
@comment %**end of header
! @comment Defines the UPDATED variable.
! @include updated-stamp
@copying
This manual is for GNU Gnulib (updated @value{UPDATED}),
