[Emacs-diffs] trunk r117381: Misc small doc/ Makefile cleanup

[Glenn Morris]

------------------------------------------------------------
revno: 117381
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-22 23:43:20 -0700
message:
  Misc small doc/ Makefile cleanup
  
  * emacs/Makefile.in (mkinfodir): Remove.
  (.dvi.ps): Replace with pattern rule.
  (${buildinfodir}): New rule.
  ($(buildinfodir)/emacs.info): Use order-only prereq for output dir.  Use $<.
  (emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf): Use $<.
  (%.ps): New rule.
  
  * lispintro/Makefile.in (mkinfodir): Remove.
  (.dvi.ps): Replace with explicit rule.
  (${buildinfodir}): New rule.
  (${buildinfodir}/eintr.info): Use order-only prereq for output dir.  Use $<.
  (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
  (emacs-lisp-intro.ps): New rule.
  
  * lispref/Makefile.in (mkinfodir): Remove.
  (.dvi.ps): Replace with explicit rule.
  (html): Declare as PHONY.
  (${buildinfodir}): New rule.
  ($(buildinfodir)/elisp.info): Use order-only prereq for output dir.  Use $<.
  (elisp.dvi, elisp.html, elisp.pdf): Use $<.
  (elisp.ps): New rule.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/Makefile.in          
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
  doc/lispintro/ChangeLog        changelog-20091113204419-o5vbwnq5f7feedwu-6128
  doc/lispintro/Makefile.in      
makefile.in-20091113204419-o5vbwnq5f7feedwu-6130
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/Makefile.in        
makefile.in-20091113204419-o5vbwnq5f7feedwu-6156

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-06-23 06:25:47 +0000
+++ b/doc/emacs/ChangeLog       2014-06-23 06:43:20 +0000
@@ -1,6 +1,14 @@
 2014-06-23  Glenn Morris  <address@hidden>
 
        * Makefile.in (%.texi): Disable implicit rules.
+       (mkinfodir): Remove.
+       (.dvi.ps): Replace with pattern rule.
+       (${buildinfodir}): New rule.
+       ($(buildinfodir)/emacs.info): Use order-only prereq for output dir.
+       Use $<.
+       (emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf):
+       Use $<.
+       (%.ps): New rule.
 
 2014-06-15  Glenn Morris  <address@hidden>
 

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2014-06-23 06:25:47 +0000
+++ b/doc/emacs/Makefile.in     2014-06-23 06:43:20 +0000
@@ -142,47 +142,44 @@
        ${srcdir}/kmacro.texi \
        $(EMACS_XTRA)
 
-## The info/ directory exists in release tarfiles but not the repository.
-mkinfodir = @${MKDIR_P} ${buildinfodir}
-
 ## Disable implicit rules.
 %.texi: ;
 
 .PHONY: info dvi html pdf ps
 
-.SUFFIXES: .ps .dvi
-
-.dvi.ps:
-       $(DVIPS) -o $@ $<
-
 info: $(buildinfodir)/emacs.info
 dvi: $(DVI_TARGETS)
 html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
+## The info/ directory exists in release tarfiles but not the repository.
+${buildinfodir}:
+       ${MKDIR_P} $@
+
 # Note that all the Info targets build the Info files in srcdir.
 # 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.
-# Note: "<" is not portable in ordinary make rules.
-$(buildinfodir)/emacs.info: ${EMACSSOURCES}
-       $(mkinfodir)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi
+$(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir}
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 emacs.dvi: ${EMACSSOURCES}
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+       $(ENVADD) $(TEXI2DVI) $<
 
 emacs.pdf: ${EMACSSOURCES}
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
+       $(ENVADD) $(TEXI2PDF) $<
 
 emacs.html: ${EMACSSOURCES}
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs.texi
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
 
 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) $<
+
+%.ps: %.dvi
+       $(DVIPS) -o $@ $<
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
 

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2014-06-23 06:25:47 +0000
+++ b/doc/lispintro/ChangeLog   2014-06-23 06:43:20 +0000
@@ -1,6 +1,14 @@
 2014-06-23  Glenn Morris  <address@hidden>
 
        * Makefile.in (%.texi): Disable implicit rules.
+       (mkinfodir): Remove.
+       (.dvi.ps): Replace with explicit rule.
+       (${buildinfodir}): New rule.
+       (${buildinfodir}/eintr.info): Use order-only prereq for output dir.
+       Use $<.
+       (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html):
+       Use $<.
+       (emacs-lisp-intro.ps): New rule.
 
 2014-06-15  Glenn Morris  <address@hidden>
 

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2014-06-23 06:25:47 +0000
+++ b/doc/lispintro/Makefile.in 2014-06-23 06:43:20 +0000
@@ -66,8 +66,6 @@
 PDF_TARGETS = emacs-lisp-intro.pdf
 PS_TARGETS = emacs-lisp-intro.ps
 
-mkinfodir = @${MKDIR_P} ${buildinfodir}
-
 srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
   ${emacsdir}/emacsver.texi
 
@@ -76,33 +74,31 @@
 
 .PHONY: info dvi html pdf ps
 
-.SUFFIXES: .ps .dvi
-
-.dvi.ps:
-       $(DVIPS) -o $@ $<
-
 info: ${buildinfodir}/eintr.info
-
 dvi: $(DVI_TARGETS)
 html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
+${buildinfodir}:
+       ${MKDIR_P} $@
+
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing.
-# Note: "<" is not portable in ordinary make rules.
-${buildinfodir}/eintr.info: ${srcs}
-       $(mkinfodir)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ 
${srcdir}/emacs-lisp-intro.texi
+${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir}
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 emacs-lisp-intro.dvi: ${srcs}
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
+       $(ENVADD) $(TEXI2DVI) $<
 
 emacs-lisp-intro.pdf: ${srcs}
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
+       $(ENVADD) $(TEXI2PDF) $<
 
 emacs-lisp-intro.html: ${srcs}
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ 
${srcdir}/emacs-lisp-intro.texi
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
+
+emacs-lisp-intro.ps: emacs-lisp-intro.dvi
+       $(DVIPS) -o $@ $<
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2014-06-23 06:25:47 +0000
+++ b/doc/lispref/ChangeLog     2014-06-23 06:43:20 +0000
@@ -1,6 +1,14 @@
 2014-06-23  Glenn Morris  <address@hidden>
 
        * Makefile.in (%.texi): Disable implicit rules.
+       (mkinfodir): Remove.
+       (.dvi.ps): Replace with explicit rule.
+       (html): Declare as PHONY.
+       (${buildinfodir}): New rule.
+       ($(buildinfodir)/elisp.info): Use order-only prereq for output dir.
+       Use $<.
+       (elisp.dvi, elisp.html, elisp.pdf): Use $<.
+       (elisp.ps): New rule.
 
 2014-06-21  Eli Zaretskii  <address@hidden>
 

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2014-06-23 06:25:47 +0000
+++ b/doc/lispref/Makefile.in   2014-06-23 06:43:20 +0000
@@ -124,17 +124,10 @@
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @${MKDIR_P} ${buildinfodir}
-
 ## Disable implicit rules.
 %.texi: ;
 
-.PHONY: info dvi pdf ps
-
-.SUFFIXES: .ps .dvi
-
-.dvi.ps:
-       $(DVIPS) -o $@ $<
+.PHONY: info dvi html pdf ps
 
 info: $(buildinfodir)/elisp.info
 dvi: $(DVI_TARGETS)
@@ -142,19 +135,23 @@
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
-## Note: "<" is not portable in ordinary make rules.
-$(buildinfodir)/elisp.info: $(srcs)
-       $(mkinfodir)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
+${buildinfodir}:
+       ${MKDIR_P} $@
+
+$(buildinfodir)/elisp.info: $(srcs) | ${buildinfodir}
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 elisp.dvi: $(srcs)
-       $(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi
+       $(ENVADD) $(TEXI2DVI) $<
 
 elisp.html: $(srcs)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $(srcdir)/elisp.texi
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
 
 elisp.pdf: $(srcs)
-       $(ENVADD) $(TEXI2PDF) $(srcdir)/elisp.texi
+       $(ENVADD) $(TEXI2PDF) $<
+
+elisp.ps: elisp.dvi
+       $(DVIPS) -o $@ $<
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean