Use $< in some doc/*/Makefile rules.

* doc/lispref/Makefile.in (srcs): Put elisp.texi first.
($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.

* doc/lispintro/Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
(emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.

* doc/emacs/Makefile.in (EMACSSOURCES): Put emacs.texi first.
($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
(emacs-xtra.pdf): Use $<.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2082fda3a486534db77e6d43902033d2e6405808..bac01f7d1ce96fc8bf997908e5d26815a0405b1d 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (EMACSSOURCES): Put emacs.texi first.
+       ($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
+       (emacs-xtra.pdf): Use $<.
+
        * Makefile.in (infoclean): Remove harmless, long-standing error.
 
        * Makefile.in ($(infodir)): Delete rule.

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 8f23099f668a1ae5fe7543bdf449d8458256ed8c..7a029482161fade015caec421dd9b4e986b85306 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -70,8 +70,8 @@ EMACS_XTRA= \
        $(srcdir)/msdog-xtra.texi
 
 EMACSSOURCES= \
-       ${srcdir}/emacsver.texi \
        ${srcdir}/emacs.texi \
+       ${srcdir}/emacsver.texi \
        ${srcdir}/doclicense.texi \
        ${srcdir}/gpl.texi \
        ${srcdir}/screen.texi \
@@ -135,20 +135,20 @@ pdf: emacs.pdf
 
 $(infodir)/emacs: ${EMACSSOURCES}
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) emacs.texi -o $@
+       cd $(srcdir); $(MAKEINFO) $< -o $@
 
 emacs.dvi: ${EMACSSOURCES}
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+       $(ENVADD) $(TEXI2DVI) $<
 
 emacs.pdf: ${EMACSSOURCES}
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
+       $(ENVADD) $(TEXI2PDF) $<
 
 
 emacs-xtra.dvi: $(EMACS_XTRA)
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
+       $(ENVADD) $(TEXI2DVI) $<
 
 emacs-xtra.pdf: $(EMACS_XTRA)
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi
+       $(ENVADD) $(TEXI2PDF) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index b8d8f1e29b0ec6e7e43a4916067bee72d5294549..a2e5e1a44c34f0d3dc7b330ac57e2fad4fa3344a 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
+       (emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
+
        * Makefile.in (infoclean): Remove harmless, long-standing error.
 
        * Makefile.in ($(infodir)): Delete rule.

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d50bc8bf8ac15192de546df299997b59afc67e3f..7a33190273c9ea25cb9d07fe452b3e00f2f2e1ec 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -50,16 +50,16 @@ pdf: emacs-lisp-intro.pdf
 # -NN extensions to fit into DOS 8+3 limits without clashing.
 ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $@
+       cd $(srcdir); $(MAKEINFO) $< -o $@
 
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
-       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $^
+       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
 emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
-       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $^
+       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
 emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
-       $(MAKEINFO) --html -o $@ $^
+       $(MAKEINFO) --html -o $@ $<
 
 .dvi.ps:
        $(DVIPS) $< -o $@

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 187567c67a2177260114429088bc951d8181d85b..ee8d7502bc5a4ba631c9c71c6757015af0813b3f 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (srcs): Put elisp.texi first.
+       ($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.
+
        * Makefile.in (infoclean): Remove harmless, long-standing error.
 
        * Makefile.in ($(infodir)): Delete rule.

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index ec570e8000bb0e607343312fc12690ec126a1001..8a21fa9c08b43976bf89d99693b77033d9c7bc12 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -42,6 +42,7 @@ TEXI2PDF = texi2pdf
 # List of all the texinfo files in the manual:
 
 srcs = \
+  $(srcdir)/elisp.texi \
   $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
@@ -56,7 +57,6 @@ srcs = \
   $(srcdir)/debugging.texi \
   $(srcdir)/display.texi \
   $(srcdir)/edebug.texi \
-  $(srcdir)/elisp.texi \
   $(srcdir)/errors.texi \
   $(srcdir)/eval.texi \
   $(srcdir)/files.texi \
@@ -107,13 +107,13 @@ pdf: elisp.pdf
 
 $(infodir)/elisp: $(srcs)
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@
+       cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) $< -o $@
 
 elisp.dvi: $(srcs)
-       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
 elisp.pdf: $(srcs)
-       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean