[Emacs-diffs] /srv/bzr/emacs/trunk r101905: Add ps rules for some doc/ Makefiles.

[Glenn Morris]

------------------------------------------------------------
revno: 101905
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-10 17:30:34 -0700
message:
  Add ps rules for some doc/ Makefiles.
  
  * doc/misc/Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
  
  * dos/lispref/Makefile.in (DVIPS): New variable.
  (.PHONY): Add ps.
  (ps, elisp.ps): New targets.
  (clean): Delete ps file.
  
  * doc/lispintro/Makefile.in (.dvi.ps): Remove unnecessary suffix rule.
  (.PHONY): Add ps.
  (ps, emacs-lisp-intro.ps): New targets.
  (clean): Delete ps file.
  
  * doc/emacs/Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
  (DVIPS): New variable.
  (.PHONY): Add ps.
  (ps, emacs.ps, emacs-xtra.ps): New targets.
  (clean): Delete ps files.
modified:
  doc/emacs/ChangeLog
  doc/emacs/Makefile.in
  doc/lispintro/ChangeLog
  doc/lispintro/Makefile.in
  doc/lispref/ChangeLog
  doc/lispref/Makefile.in
  doc/misc/ChangeLog
  doc/misc/Makefile.in

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-10-09 21:38:04 +0000
+++ b/doc/emacs/ChangeLog       2010-10-11 00:30:34 +0000
@@ -1,3 +1,11 @@
+2010-10-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
+       (DVIPS): New variable.
+       (.PHONY): Add ps.
+       (ps, emacs.ps, emacs-xtra.ps): New targets.
+       (clean): Delete ps files.
+
 2010-10-09  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (EMACSSOURCES): Add emacsver.texi.

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2010-10-09 21:19:09 +0000
+++ b/doc/emacs/Makefile.in     2010-10-11 00:30:34 +0000
@@ -43,11 +43,8 @@
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
+DVIPS = dvips
 
-# The following rule does not work with all versions of `make'.
-.SUFFIXES: .texi .dvi
-.texi.dvi:
-       $(TEXI2DVI) $<
 
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" 
MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
@@ -118,11 +115,12 @@
 ## solution anyway.  The second test -d is for parallel builds.
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-.PHONY: info dvi pdf
+.PHONY: info dvi pdf ps
 
 info: $(infodir)/emacs
 dvi: emacs.dvi
 pdf: emacs.pdf
+ps: emacs.ps
 
 # 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.
@@ -135,6 +133,9 @@
 emacs.dvi: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2DVI) $<
 
+emacs.ps: emacs.dvi
+       $(DVIPS) -o $@ $<
+
 emacs.pdf: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2PDF) $<
 
@@ -142,6 +143,9 @@
 emacs-xtra.dvi: $(EMACS_XTRA)
        $(ENVADD) $(TEXI2DVI) $<
 
+emacs-xtra.ps: emacs-xtra.dvi
+       $(DVIPS) -o $@ $<
+
 emacs-xtra.pdf: $(EMACS_XTRA)
        $(ENVADD) $(TEXI2PDF) $<
 
@@ -154,7 +158,8 @@
 
 ## Products not in the release tarfiles.
 clean: mostlyclean
-       rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf
+       rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \
+         emacs.ps emacs-xtra.ps
        rm -f emacs-manual-${version}.tar*
 
 distclean: clean

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2010-10-09 21:19:09 +0000
+++ b/doc/lispintro/ChangeLog   2010-10-11 00:30:34 +0000
@@ -1,3 +1,10 @@
+2010-10-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (.dvi.ps): Remove unnecessary suffix rule.
+       (.PHONY): Add ps.
+       (ps, emacs-lisp-intro.ps): New targets.
+       (clean): Delete ps file.
+
 2010-10-09  Glenn Morris  <address@hidden>
 
        * Makefile.in (VPATH): Remove.

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2010-10-09 21:19:09 +0000
+++ b/doc/lispintro/Makefile.in 2010-10-11 00:30:34 +0000
@@ -35,15 +35,14 @@
 
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-.SUFFIXES: .dvi .ps .texi
-
-.PHONY: info dvi html pdf
+.PHONY: info dvi html pdf ps
 
 info: ${infodir}/eintr
 
 dvi: emacs-lisp-intro.dvi
 html: emacs-lisp-intro.html
 pdf: emacs-lisp-intro.pdf
+ps: emacs-lisp-intro.ps
 
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing.
@@ -54,15 +53,15 @@
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
+emacs-lisp-intro.ps: emacs-lisp-intro.dvi
+       $(DVIPS) -o $@ $<
+
 emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
 emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
        $(MAKEINFO) --html -o $@ $<
 
-.dvi.ps:
-       $(DVIPS) $< -o $@
-
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
 mostlyclean:
@@ -70,7 +69,7 @@
          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
 
 clean: mostlyclean
-       rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf
+       rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf emacs-lisp-intro.ps
        rm -rf emacs-lisp-intro.html/
        rm -f emacs-lispintro-${version}.tar*
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-10-09 21:38:04 +0000
+++ b/doc/lispref/ChangeLog     2010-10-11 00:30:34 +0000
@@ -1,3 +1,10 @@
+2010-10-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (DVIPS): New variable.
+       (.PHONY): Add ps.
+       (ps, elisp.ps): New targets.
+       (clean): Delete ps file.
+
 2010-10-09  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (emacsdir): New variable.

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2010-10-09 21:19:09 +0000
+++ b/doc/lispref/Makefile.in   2010-10-11 00:30:34 +0000
@@ -35,6 +35,7 @@
 MAKEINFO = makeinfo --force -I $(emacsdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
+DVIPS = dvips
 
 # List of all the texinfo files in the manual:
 
@@ -95,12 +96,12 @@
 
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
-.PHONY: info dvi pdf
+.PHONY: info dvi pdf ps
 
-# The info file is named `elisp'.
 info: $(infodir)/elisp
 dvi: elisp.dvi
 pdf: elisp.pdf
+ps: elisp.ps
 
 $(infodir)/elisp: $(srcs)
        $(mkinfodir)
@@ -109,6 +110,9 @@
 elisp.dvi: $(srcs)
        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
+elisp.ps: elisp.dvi
+       $(DVIPS) -o $@ $<
+
 elisp.pdf: $(srcs)
        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
@@ -121,7 +125,7 @@
        rm -f elisp[12]*
 
 clean: mostlyclean
-       rm -f elisp.dvi elisp.pdf vol[12].pdf
+       rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf
        rm -f emacs-lispref-${version}.tar*
 
 distclean: clean

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-10 00:15:21 +0000
+++ b/doc/misc/ChangeLog        2010-10-11 00:30:34 +0000
@@ -1,3 +1,7 @@
+2010-10-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
+
 2010-10-09  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.texi (Spam Package Introduction): Mention `$'.

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2010-10-09 22:40:30 +0000
+++ b/doc/misc/Makefile.in      2010-10-11 00:30:34 +0000
@@ -198,11 +198,6 @@
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 
-# The following rule does not work with all versions of `make'.
-.SUFFIXES: .texi .dvi
-.texi.dvi:
-       $(TEXI2DVI) $<
-
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
 mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d 
${infodir}