Mercurial > emacs

--- a/doc/emacs/ChangeLog	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/emacs/ChangeLog	Fri Oct 08 18:02:21 2010 -0700
@@ -1,3 +1,9 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
+	(emacs): Remove rule.
+	(dist): No need to deal with the emacs rule any more.
+
 2010-10-07  Glenn Morris  <rgm@gnu.org>

 	* Makefile.in (version): New, set by configure.
--- a/doc/emacs/Makefile.in	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/emacs/Makefile.in	Fri Oct 08 18:02:21 2010 -0700
@@ -33,6 +33,11 @@

 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
+## This is a bit funny.  Because the info files are in the
+## distribution tarfiles, they are always made in $scrdir/../../info,
+## even for out-of-tree builds.  So infodir is really relative to srcdir.
+## The use of VPATH makes it work out, but why not set
+## infodir = $(srcdir)/../../info and make it explicit?
 infodir=../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
@@ -111,6 +116,8 @@
 	${srcdir}/kmacro.texi \
 	$(EMACS_XTRA)

+.PHONY: info dvi pdf
+
 info: $(infodir)/emacs

 $(infodir):
@@ -123,8 +130,6 @@
 # There is no provision for Info files to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.

-emacs : $(infodir)/emacs
-
 $(infodir)/emacs: $(infodir) ${EMACSSOURCES}
 	cd $(srcdir); $(MAKEINFO) emacs.texi -o $@

@@ -161,17 +166,17 @@

 maintainer-clean: distclean infoclean

+.PHONY: dist
+
 ## Make a standalone tarfile of the Emacs manual sources.
 ## The [c] is a dumb way to prevent configure expanding it.
-## The emacs: rule becomes circular when we change infodir to ".".
 dist:
 	rm -rf emacs-manual-${version}
 	mkdir emacs-manual-${version}
 	cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
 	  ${srcdir}/ChangeLog* emacs-manual-${version}/
 	sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
-	  -e 's/\(infodir *=\).*/\1 ./' -e '/^emacs *:/d' \
-	  -e 's/^\(clean:.*\)/\1 infoclean/' \
+	  -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
 	  -e "s/@ver[s]ion@/${version}/" \
 	  ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
 	tar -cf emacs-manual-${version}.tar emacs-manual-${version}
--- a/doc/lispintro/ChangeLog	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/lispintro/ChangeLog	Fri Oct 08 18:02:21 2010 -0700
@@ -1,3 +1,7 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.
+
 2010-10-07  Glenn Morris  <rgm@gnu.org>

 	* Makefile.in (version): New, set by configure.
--- a/doc/lispintro/Makefile.in	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/lispintro/Makefile.in	Fri Oct 08 18:02:21 2010 -0700
@@ -36,6 +36,8 @@

 .SUFFIXES: .dvi .ps .texi

+.PHONY: info dvi html pdf
+
 info: ${infodir}/eintr

 $(infodir):
@@ -80,6 +82,8 @@

 maintainer-clean: distclean infoclean

+.PHONY: dist
+
 dist:
 	rm -rf emacs-lispintro-${version}
 	mkdir emacs-lispintro-${version}
--- a/doc/lispref/ChangeLog	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/lispref/ChangeLog	Fri Oct 08 18:02:21 2010 -0700
@@ -1,3 +1,7 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
+
 2010-10-07  Glenn Morris  <rgm@gnu.org>

 	* Makefile.in (version): New, set by configure.
--- a/doc/lispref/Makefile.in	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/lispref/Makefile.in	Fri Oct 08 18:02:21 2010 -0700
@@ -93,6 +93,8 @@
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi

+.PHONY: info dvi pdf
+
 # The info file is named `elisp'.
 info: $(infodir)/elisp
 dvi: elisp.dvi
@@ -129,6 +131,8 @@

 maintainer-clean: distclean infoclean

+.PHONY: dist
+
 ## Note this excludes the two-volume stuff.
 dist:
 	rm -rf emacs-lispref-${version}
--- a/doc/misc/ChangeLog	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/misc/ChangeLog	Fri Oct 08 18:02:21 2010 -0700
@@ -1,3 +1,7 @@
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.
+
 2010-10-08  Julien Danjou  <julien@danjou.info>

 	* gnus.texi: add mm-shr
--- a/doc/misc/Makefile.in	Fri Oct 08 17:52:12 2010 -0700
+++ b/doc/misc/Makefile.in	Fri Oct 08 18:02:21 2010 -0700
@@ -199,6 +199,8 @@
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"


+.PHONY: info dvi pdf
+
 info: $(INFO_TARGETS)

 $(infodir):
@@ -611,6 +613,8 @@
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi


+.PHONY: mostlyclean clean distclean maintainer-clean
+
 mostlyclean:
 	rm -f *.aux *.log *.cp *.cps *.fn *.fns *.ky *.kys \
 	  *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs