* Makefile.in (DVIPS): New define, set to dvips.

	(dvi): Add stabs.dvi.
	(ps): New target.
	(all-doc): Depend on info, dvi, and ps targets.
	(STAGESTUFF): Add *.ps and *.dvi files.
	(clean-info, clean-dvi): Remove.
	(mostlyclean): Does not depend upon clean-info or clean-dvi,
	rules completely rewritten.
	(maintainer-clean): Remove clean-info and clean-dvi
	dependencies and put their actions in the rules.
	(gdb.ps): New target
	(gdb.dvi, gdbgui.dvi, gdbint.dvi, stabs.dvi): Remove
	intermediate TeX files, whether they have 2 or 3 character
	extensions.
	(gdbint.ps): Add target and rules.
	(gdb-internals): Delete unused target.
	(Makefile): Depends upon config.status also.

1 files changed, 37 insertions, 29 deletions

diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index efafb53..4efd191 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -74,6 +74,9 @@ TEX = tex
 # auxiliary program for sorting Texinfo indices
 TEXINDEX = texindex
 
+# Program to generate Postscript files from DVI files.
+DVIPS = dvips
+
 # Main GDB manual's source files
 SFILES_INCLUDED = gdb-cfg.texi $(srcdir)/remote.texi
 
@@ -88,15 +91,16 @@ SFILES_DOC = $(SFILES_LOCAL) \
 all install:
 
 info: gdb.info gdbint.info stabs.info
-dvi: gdb.dvi refcard.dvi gdbint.dvi
-all-doc: gdb.info gdb.dvi refcard.dvi gdb-internals gdbint.dvi
+dvi: gdb.dvi gdbint.dvi stabs.dvi refcard.dvi
+ps: gdb.ps gdbint.ps stabs.ps refcard.ps
+all-doc: info dvi ps
 
 install-info: info
 	for i in *.info* ; do \
 		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
 	done
 
-STAGESTUFF = *.info* gdb-all.texi GDBvn.texi
+STAGESTUFF = *.info* gdb-all.texi GDBvn.texi *.ps *.dvi
 
 # Copy the object files from a particular stage into a subdirectory.
 stage1: force
@@ -128,17 +132,13 @@ de-stage3: force
 	-(cd stage3 ; mv -f * ..)
 	-rmdir stage3
 
-clean-info:
-	rm -f gdb.info* gdbint.info* stabs.info*
-
-clean-dvi:
-	rm -f gdb.dvi gdbint.dvi stabs.dvi sedref.dvi
-
-mostlyclean: clean-info clean-dvi
-	rm -f gdb.?? gdb.??? gdb.mm gdb.ms gdb.me
-	rm -f links2roff
-	rm -f refcard.ps lrefcard.ps refcard.log sedref.* *~
-	rm -f gdbint.?? gdbint.??? stabs.?? stabs.???
+# The "least clean" level of cleaning.  Get rid of files which are
+# automatically generated files that are just intermediate files,
+# 
+mostlyclean:
+	rm -f gdb.mm gdb.ms gdb.me links2roff
+	rm -f *.aux *.cp* *.fn* *.ky* *.log *.pg* *.toc *.tp* *.vr*
+	rm -f sedref.dvi sedref.tex tmp.sed
 
 clean: mostlyclean
 	rm -f rluser.texinfo inc-hist.texi gdb-cfg.texi
@@ -146,10 +146,12 @@ clean: mostlyclean
 distclean: clean
 	rm -f Makefile config.status
 
-# GDBvn.texi and refcard.dvi are distributed, so they should not be
-# removed by "clean" or "distclean".
-maintainer-clean realclean: distclean clean-dvi clean-info
-	rm -f GDBvn.texi refcard.dvi
+# GDBvn.texi, the dvi files, the info files, and the postscript files, 
+# are all part of the distribution, so it should not be removed by
+# "clean" or "distclean".  Use maintainer-clean to remove them.
+
+maintainer-clean realclean: distclean
+	rm -f GDBvn.texi *.info* *.dvi *.ps
 
 # GDB QUICK REFERENCE (dvi output)
 refcard.dvi : refcard.tex $(REFEDITS)
@@ -166,7 +168,7 @@ refcard.dvi : refcard.tex $(REFEDITS)
 	rm -f sedref.log sedref.tex tmp.sed
 
 refcard.ps : refcard.dvi
-	dvips -t landscape refcard.dvi -o
+	$(DVIPS) -t landscape -o $@ $?
 
 # File to record current GDB version number (copied from main dir Makefile.in)
 GDBvn.texi : ${gdbdir}/Makefile.in
@@ -204,7 +206,11 @@ gdb.dvi: ${SFILES_DOC}
 	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
 	$(TEXINDEX) gdb.??
 	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
-	rm -f gdb.?? gdb.log gdb.aux gdb.toc gdb.??s
+	rm -f gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \
+		gdb.tp* gdb.vr*
+
+gdb.ps: gdb.dvi
+	$(DVIPS) -o $@ $?
 
 # GDB MANUAL: info file
 # We're using texinfo2, and older makeinfo's may not be able to
@@ -302,8 +308,8 @@ gdbgui.dvi : gdbgui.texinfo ${SFILES_DOC}
 	$(SET_TEXINPUTS) $(TEX) gdbgui.texinfo
 	$(TEXINDEX) gdbgui.??
 	$(SET_TEXINPUTS) $(TEX) gdbgui.texinfo
-	rm -f gdbgui.?? gdbgui.aux gdbgui.cps gdbgui.fns gdbgui.kys \
-		gdbgui.log gdbgui.pgs gdbgui.toc gdbgui.tps gdbgui.vrs
+	rm -f gdbgui.aux gdbgui.cp* gdbgui.fn* gdbgui.ky* \
+		gdbgui.log gdbgui.pg* gdbgui.toc gdbgui.tp* gdbgui.vr*
 
 # GDB GUI MANUAL: info file
 gdb-gui: gdbgui.info
@@ -317,11 +323,13 @@ gdbint.dvi : gdbint.texinfo
 	$(SET_TEXINPUTS) $(TEX) gdbint.texinfo
 	$(TEXINDEX) gdbint.??
 	$(SET_TEXINPUTS) $(TEX) gdbint.texinfo
-	rm -f gdbint.?? gdbint.aux gdbint.cps gdbint.fns gdbint.kys \
-		gdbint.log gdbint.pgs gdbint.toc gdbint.tps gdbint.vrs
+	rm -f gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \
+		gdbint.log gdbint.pg* gdbint.toc gdbint.tp* gdbint.vr*
+
+gdbint.ps : gdbint.dvi
+	$(DVIPS) -o $@ $?
 
 # GDB INTERNALS MANUAL: info file
-gdb-internals: gdbint.info
 
 gdbint.info: gdbint.texinfo
 	$(MAKEINFO) -o gdbint.info $(srcdir)/gdbint.texinfo
@@ -334,13 +342,13 @@ stabs.dvi : stabs.texinfo
 	$(SET_TEXINPUTS) $(TEX) stabs.texinfo
 	$(TEXINDEX) stabs.??
 	$(SET_TEXINPUTS) $(TEX) stabs.texinfo
-	rm -f stabs.?? stabs.aux stabs.cps stabs.fns stabs.kys \
-		stabs.log stabs.pgs stabs.toc stabs.tps stabs.vrs
+	rm -f stabs.aux stabs.cp* stabs.fn* stabs.ky* \
+		stabs.log stabs.pg* stabs.toc stabs.tp* stabs.vr*
 
 stabs.ps: stabs.dvi
-	dvips -o stabs.ps stabs
+	$(DVIPS) -o $@ $?
 
 force:
 
-Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
+Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag) config.status
 	$(SHELL) ./config.status