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.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5d6f2a48aa5e4060429ecfde041fb796a39a3188..746e5ec7caf449daf90cf427475e7d11e6ca76c1 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <eliz@gnu.org>
 
        * makefile.w32-in (EMACSSOURCES): Add emacsver.texi.

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index d550a10b66a1be21dd52b946bbbccb935c1747ed..d101b12e4ed8a6e2521602a98fcc9239bf0568d2 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -43,11 +43,8 @@ MAKEINFO = makeinfo --force
 
 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 @@ EMACSSOURCES= \
 ## 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 @@ $(infodir)/emacs: ${EMACSSOURCES}
 emacs.dvi: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2DVI) $<
 
+emacs.ps: emacs.dvi
+       $(DVIPS) -o $@ $<
+
 emacs.pdf: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2PDF) $<
 
@@ -142,6 +143,9 @@ emacs.pdf: ${EMACSSOURCES}
 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 @@ mostlyclean:
 
 ## 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

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index b3ae80095aefc1261a7a6af0e747cecff3d959d9..87ce4dc7f63a333b48c55260ab235a664b1a1ec6 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <rgm@gnu.org>
 
        * Makefile.in (VPATH): Remove.

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 622b1236bca77ca1ad088c5baa563b2606c6de74..5fc7eb1723669d7e13167410faddfb14c87cdb48 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -35,15 +35,14 @@ DVIPS = dvips
 
 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 @@ ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
 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 @@ mostlyclean:
          *.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*
 

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ed15a7e1640d4d08ce6af36bdb1fd7bef345abf1..3e3038ac60ec83f7e12cf5750b9631e1c54595d9 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (DVIPS): New variable.
+       (.PHONY): Add ps.
+       (ps, elisp.ps): New targets.
+       (clean): Delete ps file.
+
 2010-10-09  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (emacsdir): New variable.

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index d79bec5e4a227839c459a8a0fbffb1b3f028e6b2..71ff3ec7a3f71687125e713027b5567320463d80 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -35,6 +35,7 @@ emacsdir =  $(srcdir)/../emacs
 MAKEINFO = makeinfo --force -I $(emacsdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
+DVIPS = dvips
 
 # List of all the texinfo files in the manual:
 
@@ -95,12 +96,12 @@ srcs = \
 
 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 @@ $(infodir)/elisp: $(srcs)
 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 @@ mostlyclean:
        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

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d54b3875edf90ef8ee0aa80a331f4228676fdefb..b82e523a35526d6ad76392da3c3bc4ddff78fec1 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-11  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
+
 2010-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Spam Package Introduction): Mention `$'.

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index e297c649195dc922c7b996d6f25b1ecc15e6e6ac..d5afabd03746ad5edf10ac7143c17cf415e98efc 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -198,11 +198,6 @@ PDF_TARGETS = \
 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}