Mark some doc/ rules as PHONY.

* doc/misc/Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.

* doc/lispref/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.

* doc/lispintro/Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.

* doc/emacs/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
(emacs): Remove rule.
(dist): No need to deal with the emacs rule any more.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 793645d6dfe5b6078b096209a29a7481bb71130a..b0d129c4497d58000b8f7f49d1ad4a9cad6f2513 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -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.

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 8c8f9b93729caead76bfcfe8cf695b7243a64db6..2e02ee6738f46a2a069f37771eecc3e92c232013 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -33,6 +33,11 @@ version=@version@
 
 ## 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 @@ EMACSSOURCES= \
        ${srcdir}/kmacro.texi \
        $(EMACS_XTRA)
 
+.PHONY: info dvi pdf
+
 info: $(infodir)/emacs
 
 $(infodir):
@@ -123,8 +130,6 @@ pdf: emacs.pdf
 # 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 @@ infoclean:
 
 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}

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 8489dbb4a154130b662863823800cd811d6e1826..95501d6ff705ca75acbd87887e4f4bf2bd68f5c2 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -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.

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index a01a9bb96055b9d744bf532b682460a73b2593cd..41f8f2a5c75d964e003cf382677553995f3d54a6 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -36,6 +36,8 @@ DVIPS = dvips
 
 .SUFFIXES: .dvi .ps .texi
 
+.PHONY: info dvi html pdf
+
 info: ${infodir}/eintr
 
 $(infodir):
@@ -80,6 +82,8 @@ infoclean:
 
 maintainer-clean: distclean infoclean
 
+.PHONY: dist
+
 dist:
        rm -rf emacs-lispintro-${version}
        mkdir emacs-lispintro-${version}

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8b93b2fb125d973fc50e5ce7de4b7fe2c85653f0..ca636af8dea1482513eb8456343474da207250d1 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -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.

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index b91b05dce2a76d1e5fee01bd6a220757d595c580..ae9aaa640890da6793081712a826adedbb7ac6eb 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -93,6 +93,8 @@ srcs = \
   $(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 @@ infoclean:
 
 maintainer-clean: distclean infoclean
 
+.PHONY: dist
+
 ## Note this excludes the two-volume stuff.
 dist:
        rm -rf emacs-lispref-${version}

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index aa1715551c846aa1818d138b0ee5fbabc1958479..93b129a2008410143a9399af9f0e1492261bbcc8 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 867d08e5711507cf76ec3155423be1f24097f904..6f32483af07d64fde0595189b204ebec9f0caa1d 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -199,6 +199,8 @@ TEXI2PDF = texi2pdf
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
 
+.PHONY: info dvi pdf
+
 info: $(INFO_TARGETS)
 
 $(infodir):
@@ -611,6 +613,8 @@ woman.pdf: woman.texi
        $(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