These changes abolish M4 preprocessing for the GDB manual.

Formatting these files now depends on the recently designed
Texinfo conditionals:  to format successfully, you must use very
recent versions (not yet distributed by FSF) of texinfo.tex and makeinfo.c.

The new Texinfo commands are @set, @clear, @ifset, @ifclear, and @value.
Recent texinfo-2 Beta distributions contained partial implementations.

texi2roff does not yet support these commands.

There are miscellaneous clean-ups to Makefile.in as well.

1 files changed, 111 insertions, 130 deletions

diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index b2797fd..9ec56f8 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -21,24 +21,7 @@ srcdir = .
 
 prefix = /usr/local
 
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-
-datadir = $(prefix)/lib
-mandir = $(prefix)/man
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-man9dir = $(mandir)/man9
 infodir = $(prefix)/info
-includedir = $(prefix)/include
-docdir = $(datadir)/doc
 
 SHELL = /bin/sh
 
@@ -46,21 +29,11 @@ INSTALL = install -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
-AR = ar
-AR_FLAGS = qv
-BISON = bison
-RANLIB = ranlib
-
 # main GDB source directory
-gdbdir = ..
-
-# Documentation (gdb.dvi) needs either GNU m4 or SysV m4; 
-# Berkeley/Sun don't have quite enough. 
-#M4=/usr/5bin/m4
-M4=m4
+gdbdir = $(srcdir)/..
 
 # where to find texinfo; GDB dist should include a recent one
-TEXIDIR=$(srcdir)/${gdbdir}/../texinfo
+TEXIDIR=${gdbdir}/../texinfo
 
 # where to find makeinfo, preferably one designed for texinfo-2
 MAKEINFO=makeinfo
@@ -68,17 +41,25 @@ MAKEINFO=makeinfo
 # where to find texi2roff, ditto
 TEXI2ROFF=texi2roff
 
-# Where is the source dir for the READLINE library?  Traditionally in .. or .
-# (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
-READLINE_DIR = $(srcdir)/${gdbdir}/../readline
+# Where is the source dir for the READLINE library doc?  
+# Traditionally readline is in .. or .
+READLINE_DIR = ${gdbdir}/../readline/doc
+
+SET_TEXINPUTS = TEXINPUTS=${TEXIDIR}:.:$(srcdir):$(READLINE_DIR):$$TEXINPUTS
+
+# Don Knuth's TeX formatter
+TEX = tex
+
+# auxiliary program for sorting Texinfo indices
+TEXINDEX = texindex
 
 # Main GDB manual's source files
-SFILES_DOCDIR = \
-	$(srcdir)/gdb.texinfo $(srcdir)/pretex.m4 $(srcdir)/none.m4 \
-	$(srcdir)/all.m4 gdbinv-m.m4 gdbinv-s.m4 gdbVN.m4
+SFILES_INCLUDED = $(srcdir)/gdb-config.texi $(srcdir)/gdbinv-s.texi
+
+SFILES_LOCAL = $(srcdir)/gdb.texinfo GDBvn.texi $(SFILES_INCLUDED)
 
-# Which version of GDB manual? default includes everything
-CONFIG=all
+SFILES_DOC = $(SFILES_LOCAL) \
+                $(READLINE_DIR)/rluser.texinfo $(READLINE_DIR)/inc-hist.texi
 
 #### Host, target, and site specific Makefile fragments come in here.
 ###
@@ -87,8 +68,6 @@ all install:
 
 info: gdb.info gdbint.info stabs.info
 all-doc: gdb.info gdb.dvi refcard.dvi gdb-internals gdbint.dvi
-clean-info:
-	-rm -f *.info*
 
 install-info: info
 	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
@@ -98,7 +77,7 @@ install-info: info
 		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
 	done
 
-STAGESTUFF = *.info* gdb-all.texi gdbVN.m4
+STAGESTUFF = *.info* gdb-all.texi GDBvn.texi
 
 # Copy the object files from a particular stage into a subdirectory.
 stage1: force
@@ -130,82 +109,76 @@ de-stage3: force
 	-(cd stage3 ; mv -f * ..)
 	-rmdir stage3
 
-clean:
-	rm -f gdb.dvi rluser.texinfo inc-hist.texi gdb-all* gdb.info* gdbVN.m4
-	rm -f gdb-internals gdbint.?? gdbint.??? gdbint.info
-	rm -f refcard.ps refcard.dvi refcard.log *~
+clean-info:
+	rm -f gdb.info* gdbint.info* stabs.info*
+
+clean-dvi:
+	rm -f gdb.dvi refcard.dvi gdbint.dvi stabs.dvi psref.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 psref.* *~
+	rm -f gdbint.?? gdbint.??? stabs.?? stabs.???
+
+clean: mostlyclean
+	rm -f GDBvn.texi rluser.texinfo inc-hist.texi
+
+distclean: clean
+	rm -f Makefile config.status
+
+realclean: distclean
+
 
 # GDB QUICK REFERENCE (TeX dvi file, CM fonts)
 refcard.dvi : $(srcdir)/refcard.tex
-	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex refcard.tex; rm -f refcard.log 
+	$(SET_TEXINPUTS) $(TEX) refcard.tex; rm -f refcard.log 
 	rm -f rcfonts.tex
 
 # GDB QUICK REFERENCE (PostScript output, common PS fonts)
 refcard.ps : $(srcdir)/refcard.tex $(srcdir)/psrc.sed
 	sed -f $(srcdir)/psrc.sed $(srcdir)/refcard.tex >psref.tex
-	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex psref.tex
+	$(SET_TEXINPUTS) $(TEX) psref.tex
 	dvips -t landscape psref -o; mv psref.ps refcard.ps
 	rm -f psref.dvi psref.log
 
 # GDB QUICK REFERENCE (PostScript output, common PS fonts w/long names)
 lrefcard.ps : $(srcdir)/refcard.tex $(srcdir)/lpsrc.sed
 	sed -f $(srcdir)/lpsrc.sed $(srcdir)/refcard.tex >psref.tex
-	TEXINPUTS=$(srcdir):.:$$TEXINPUTS tex psref.tex
+	$(SET_TEXINPUTS) $(TEX) psref.tex
 	dvips -t landscape psref -o; mv psref.ps lrefcard.ps
 	rm -f psref.dvi psref.log
 
-#  "Readline" appendices.  Get them here so both TeX and texi2roff can find.
-rluser.texinfo: ${READLINE_DIR}/doc/rluser.texinfo
-	ln -s ${READLINE_DIR}/doc/rluser.texinfo . || \
-	ln ${READLINE_DIR}/doc/rluser.texinfo . || \
-	cp ${READLINE_DIR}/doc/rluser.texinfo .
-
-inc-hist.texi: ${READLINE_DIR}/doc/inc-hist.texi
-	ln -s ${READLINE_DIR}/doc/inc-hist.texi . || \
-	ln ${READLINE_DIR}/doc/inc-hist.texi . || \
-	cp ${READLINE_DIR}/doc/inc-hist.texi .
-
 # File to record current GDB version number (copied from main dir Makefile.in)
-gdbVN.m4 : $(srcdir)/${gdbdir}/Makefile.in
-	echo "_define__(<_GDB_VN__>,`sed <$(srcdir)/../Makefile.in -n 's/VERSION = //p'`)" > ./gdbVN.m4
-
-# GDB MANUAL: texinfo source, created by preprocessing w/m4
-# If you want other configs in the makefile, add or modify instructions for 
-# building source here, then change CONFIG (that way you get info, dvi, 
-# roff targets automatically for your config).
-# Be sure to not create a bad gdb-all.texi if ${M4} is missing or aborts...
-# The nonsense with gdbVN.m4 is to get this to run with both Sun and GNU make.
-#   Note that we can *generate* gdbVN.m4, but since we distribute one in the
+GDBvn.texi : ${gdbdir}/Makefile.in
+	echo "@set GDBVN `sed <$(srcdir)/../Makefile.in -n 's/VERSION = //p'`" > ./GDBvn.texi
+
+# GDB MANUAL: texinfo source, using @set/@clear/@value/@ifset/@ifclear
+# If your texinfo or makeinfo don't support these, get a new texinfo release
+#
+# The nonsense with GDBvn.texi gets this to run with both Sun and GNU make.
+#   Note that we can *generate* GDBvn.texi, but since we distribute one in the
 #   source directory for the benefit of people who *don't* use this makefile,
 #   VPATH will often tell make not to bother building it, because the one
 #   in the srcdir is up to date.  (if not, then make should build one here).
 
-gdb-all.texi: ${SFILES_DOCDIR}
-	if [ ! -f ./gdbVN.m4 ]; then \
-		ln -s $(srcdir)/gdbVN.m4 . || \
-		ln $(srcdir)/gdbVN.m4 . || \
-		cp $(srcdir)/gdbVN.m4 . ; else true; fi
-	rm -f foobus.texinfo
-	${M4} $(srcdir)/pretex.m4 $(srcdir)/none.m4 $(srcdir)/all.m4 \
-		gdbVN.m4 $(srcdir)/gdb.texinfo  >foobus.texinfo
-	rm -f gdb-all.texi
-	mv foobus.texinfo ./gdb-all.texi
-
 # GDB MANUAL: TeX dvi file
-gdb.dvi : gdb-${CONFIG}.texi rluser.texinfo inc-hist.texi
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex gdb-${CONFIG}.texi
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex gdb-${CONFIG}.texi
-	texindex gdb-${CONFIG}.??
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex gdb-${CONFIG}.texi
-	mv gdb-${CONFIG}.dvi ./gdb.dvi
-	rm -f gdb-${CONFIG}.?? gdb-${CONFIG}.???
+gdb.dvi: ${SFILES_DOC}
+	if [ ! -f ./GDBvn.texi ]; then \
+		ln -s $(srcdir)/GDBvn.texi . || \
+		ln $(srcdir)/GDBvn.texi . || \
+		cp $(srcdir)/GDBvn.texi . ; else true; fi
+	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
+	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
+	$(TEXINDEX) gdb.??
+	$(SET_TEXINPUTS) $(TEX) gdb.texinfo
+	rm -f gdb.?? gdb.log gdb.aux gdb.toc gdb.??s
 
 # GDB MANUAL: info file
 # We're using texinfo2, and older makeinfo's may not be able to
-# cope with all the markup.  In the meantime, we distribute the info
-# files 
-gdb.info: gdb-${CONFIG}.texi
-	$(MAKEINFO) -o ./gdb.info gdb-${CONFIG}.texi
+# cope with all the markup.  
+gdb.info: ${SFILES_DOC}
+	$(MAKEINFO) -I ${READLINE_DIR} -I $(srcdir) -o ./gdb.info gdb.texinfo
 
 # GDB MANUAL: roff translations
 # Try to use a recent texi2roff.  v2 was put on prep in jan91.
@@ -218,37 +191,48 @@ gdb.info: gdb-${CONFIG}.texi
 # + @   (that's at-BLANK) not recognized by texi2roff, turned into blank
 # + @alphaenumerate is ridiculously new, turned into @enumerate
 
-
-# gdb manual suitable for [tn]roff -mm
-# '@noindent's removed due to texi2roff-2 mm bug; if yours is newer, 
-#   try leaving them in
-# ditto special treatment of @ftable in rluser.texinfo
-gdb.mm: gdb-${CONFIG}.texi ${READLINE_DIR}/doc/rluser.texinfo inc-hist.texi
-	rm -f ./rluser.texinfo
-	sed -e 's/^@ftable/@table/g' \
+# texi2roff doesn't have a notion of include dirs, so we have to fake 
+# it out for gdb manual's include files---but only if not configured
+# in main sourcedir.
+links2roff: $(SFILES_INCLUDED)
+	if [ ! -f gdb-config.texi ]; then \
+		ln -s $(SFILES_INCLUDED) . || \
+		ln $(SFILES_INCLUDED)    . || \
+		cp $(SFILES_INCLUDED)    . ; \
+	fi
+	touch links2roff
+
+#  "Readline" appendices.  Get them also due to lack of includes, 
+# regardless of whether or not configuring in main sourcedir.
+# @ftable removed due to bug in texi2roff-2; if your texi2roff
+# is newer, try just ln or cp
+rluser.texinfo: ${READLINE_DIR}/rluser.texinfo
+		sed -e 's/^@ftable/@table/g' \
 		-e 's/^@end ftable/@end table/g' \
-		${READLINE_DIR}/doc/rluser.texinfo > ./rluser.texinfo
+		${READLINE_DIR}/rluser.texinfo > ./rluser.texinfo
+
+inc-hist.texi: ${READLINE_DIR}/inc-hist.texi
+	ln -s ${READLINE_DIR}/inc-hist.texi . || \
+	ln ${READLINE_DIR}/inc-hist.texi . || \
+	cp ${READLINE_DIR}/inc-hist.texi .
+
+# gdb manual suitable for [gtn]roff -me
+gdb.me: $(SFILES_LOCAL) links2roff rluser.texinfo inc-hist.texi
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
 		-e '/^@ifinfo/,/^@end ifinfo/d' \
 		-e '/^@c /d' \
 		-e 's/{.*,,/{/' \
-		-e '/@noindent/d' \
 		-e 's/@ / /g' \
 		-e 's/^@alphaenumerate/@enumerate/g' \
 		-e 's/^@end alphaenumerate/@end enumerate/g' \
-		gdb-${CONFIG}.texi | \
-	$(TEXI2ROFF) -mm | \
+		$(srcdir)/gdb.texinfo | \
+	$(TEXI2ROFF) -me | \
 	sed -e 's/---/\\(em/g' \
-	>gdb.mm 
-	rm ./rluser.texinfo
+	>gdb.me 
 
-# gdb manual suitable for [gtn]roff -me
-gdb.me: gdb-${CONFIG}.texi ${READLINE_DIR}/doc/rluser.texinfo inc-hist.texi
-	rm -f ./rluser.texinfo
-	sed -e 's/^@ftable/@table/g' \
-		-e 's/^@end ftable/@end table/g' \
-		${READLINE_DIR}/doc/rluser.texinfo > ./rluser.texinfo
+# gdb manual suitable for [gtn]roff -ms
+gdb.ms: $(SFILES_LOCAL) links2roff rluser.texinfo inc-hist.texi
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
 		-e '/^@ifinfo/,/^@end ifinfo/d' \
@@ -257,37 +241,34 @@ gdb.me: gdb-${CONFIG}.texi ${READLINE_DIR}/doc/rluser.texinfo inc-hist.texi
 		-e 's/@ / /g' \
 		-e 's/^@alphaenumerate/@enumerate/g' \
 		-e 's/^@end alphaenumerate/@end enumerate/g' \
-		gdb-${CONFIG}.texi | \
-	$(TEXI2ROFF) -me | \
+		$(srcdir)/gdb.texinfo | \
+	$(TEXI2ROFF) -ms | \
 	sed -e 's/---/\\(em/g' \
-	>gdb.me 
-	rm ./rluser.texinfo
+	>gdb.ms 
 
-# gdb manual suitable for [gtn]roff -ms
-gdb.ms: gdb-${CONFIG}.texi ${READLINE_DIR}/doc/rluser.texinfo inc-hist.texi
-	rm -f ./rluser.texinfo
-	sed -e 's/^@ftable/@table/g' \
-		-e 's/^@end ftable/@end table/g' \
-		${READLINE_DIR}/doc/rluser.texinfo > ./rluser.texinfo
+# gdb manual suitable for [tn]roff -mm
+# '@noindent's removed due to texi2roff-2 mm bug; if yours is newer, 
+#   try leaving them in
+gdb.mm: $(SFILES_LOCAL) links2roff rluser.texinfo inc-hist.texi
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
 		-e '/^@ifinfo/,/^@end ifinfo/d' \
 		-e '/^@c /d' \
 		-e 's/{.*,,/{/' \
+		-e '/@noindent/d' \
 		-e 's/@ / /g' \
 		-e 's/^@alphaenumerate/@enumerate/g' \
 		-e 's/^@end alphaenumerate/@end enumerate/g' \
-		gdb-${CONFIG}.texi | \
-	$(TEXI2ROFF) -ms | \
+		$(srcdir)/gdb.texinfo | \
+	$(TEXI2ROFF) -mm | \
 	sed -e 's/---/\\(em/g' \
-	>gdb.ms 
-	rm ./rluser.texinfo
+	>gdb.mm 
 
 # GDB INTERNALS MANUAL: TeX dvi file
 gdbint.dvi : gdbint.texinfo
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex gdbint.texinfo
-	texindex gdbint.??
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex 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
 
@@ -302,9 +283,9 @@ stabs.info: stabs.texinfo
 
 # STABS DOCUMENTATION: TeX dvi file
 stabs.dvi : stabs.texinfo
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex stabs.texinfo
-	texindex stabs.??
-	TEXINPUTS=${TEXIDIR}:.:$(srcdir):$$TEXINPUTS tex 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