This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch/rfa] Overhaul doc/Makefile.in

Hello,

The attached overhaul's the doc's Makefile.in. It wasn't possible to build things like gdbint.pdf without first including gdb.info and this fixes it.

It also removes some really strange rules that were adding links from the build directory to the source directory for certain files (e.g., ruser.texinfo). I figure no one has used this in ages as it didn't add corresponding links for mi.texinfo.

ok?
Andrew
2002-07-19  Andrew Cagney  <ac131313@redhat.com>

	* Makefile.in (GDBINT_TEX_TMPS): Define.
	(gdbint.dvi, gdbint.pdf): Use
	(GDB_TEX_TMPS): Define.
	(gdb.dvi, gdb.pdf): Use.
	(GDB_DOC_SOURCE_INCLUDES): New macros.
	(GDB_DOC_BUILD_INCLUDES, GDB_DOC_FILES): New macros.
	(GDBINT_DOC_FILES_INCLUDES): New macros.
	(GDBINT_DOC_BUILD_INCLUDES): New macros.
	(GDBINT_DOC_FILES, STABS_DOC_SOURCE_INCLUDES): New macros.
	(STABS_DOC_BUILD_INCLUDES, STABS_DOC_FILES): New macros.
	(SFILES_DOC, SFILES_INCLUDED, SFILES_LOCAL): Delete macros.
	(links2roff): Replace SFILES_INCLUDED with
	GDB_DOC_SOURCE_INCLUDES.
	(gdb.dvi, gdb_toc.html, gdb.pdf, gdb.info): Update dependencies.
	(gdb.me, gdb.mm, gdb.ms): Update dependencies.
	(gdbint.dvi, gdbint_toc.html, gdbint.pdf, gdbint.info): Update
	dependencies.
	(stabs.info, stabs_toc.html, stabs.pdf, stabs.dvi): Update
	dependencies.
	(gdbmi.texinfo): Delete rule.
	(inc-hist.texinfo): Delete rule.
	(rluser.texinfo): Delete rule.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/doc/Makefile.in,v
retrieving revision 1.20
diff -u -r1.20 Makefile.in
--- Makefile.in	25 Feb 2002 04:32:58 -0000	1.20
+++ Makefile.in	30 Jul 2002 15:44:26 -0000
@@ -96,16 +96,40 @@
 # Program to generate Postscript files from DVI files.
 DVIPS = dvips
 
-# Main GDB manual's source files
-SFILES_INCLUDED = gdb-cfg.texi \
+# Main GDB manual
+GDB_DOC_SOURCE_INCLUDES = \
 	$(srcdir)/annotate.texi \
 	$(srcdir)/fdl.texi \
-	$(srcdir)/gpl.texi
-
-SFILES_LOCAL = $(srcdir)/gdb.texinfo GDBvn.texi $(SFILES_INCLUDED)
-
-SFILES_DOC = $(SFILES_LOCAL) $(GDBMI_DIR)/gdbmi.texinfo \
-                $(READLINE_DIR)/rluser.texinfo $(READLINE_DIR)/inc-hist.texinfo
+	$(srcdir)/gpl.texi \
+	$(GDBMI_DIR)/gdbmi.texinfo \
+	$(READLINE_DIR)/rluser.texinfo \
+	$(READLINE_DIR)/inc-hist.texinfo
+GDB_DOC_BUILD_INCLUDES = \
+	gdb-cfg.texi \
+	GDBvn.texi
+GDB_DOC_FILES = \
+	$(srcdir)/gdb.texinfo \
+	$(GDB_DOC_SOURCE_INCLUDES) \
+	$(GDB_DOC_BUILD_INCLUDES)
+
+# Internals Manual
+GDBINT_DOC_SOURCE_INCLUDES = \
+	$(srcdir)/fdl.texi
+GDBINT_DOC_BUILD_INCLUDES = \
+	gdb-cfg.texi \
+	GDBvn.texi
+GDBINT_DOC_FILES = \
+	$(srcdir)/gdbint.texinfo \
+	$(GDBINT_DOC_SOURCE_INCLUDES) \
+	$(GDBINT_DOC_BUILD_INCLUDES)
+
+# Stabs manual: All files
+STABS_DOC_SOURCE_INCLUDES =
+STABS_DOC_BUILD_INCLUDES =
+STABS_DOC_FILES = \
+	$(srcdir)/stabs.texinfo \
+	$(STABS_DOC_SOURCE_INCLUDES) \
+	$(STABS_DOC_BUILD_INCLUDES)
 
 #### Host, target, and site specific Makefile fragments come in here.
 ###
@@ -186,7 +210,7 @@
 	rm -f sedref.dvi sedref.tex tmp.sed
 
 clean: mostlyclean
-	rm -f rluser.texinfo inc-hist.texinfo gdb-cfg.texi
+	rm -f gdb-cfg.texi
 
 distclean: clean
 	rm -f Makefile config.status
@@ -240,30 +264,33 @@
 #   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_TEX_TMPS = gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \
+	gdb.tp* gdb.vr*
+
 # GDB MANUAL: TeX dvi file
-gdb.dvi: ${SFILES_DOC}
+gdb.dvi: ${GDB_DOC_FILES}
 	if [ ! -f ./GDBvn.texi ]; then \
 		(test "$$LN_S" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \
 		ln $(srcdir)/GDBvn.texi . || \
 		cp $(srcdir)/GDBvn.texi . ; else true; fi
+	rm -f $(GDB_TEX_TMPS)
 	$(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/gdb.texinfo
-	rm -f gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \
-		gdb.tp* gdb.vr*
+	rm -f $(GDB_TEX_TMPS)
 
 gdb.ps: gdb.dvi
 	$(DVIPS) -o $@ $?
 
-gdb.pdf: ${SFILES_DOC}
+gdb.pdf: ${GDB_DOC_FILES}
 	if [ ! -f ./GDBvn.texi ]; then \
 		(test "$$LN_S" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \
 		ln $(srcdir)/GDBvn.texi . || \
 		cp $(srcdir)/GDBvn.texi . ; else true; fi
+	rm -f $(GDB_TEX_TMPS)
 	$(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/gdb.texinfo
-	rm -f gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \
-		gdb.tp* gdb.vr*
+	rm -f $(GDB_TEX_TMPS)
 
 # GDB MANUAL: info file
-gdb.info: ${SFILES_DOC}
+gdb.info: ${GDB_DOC_FILES}
 	$(MAKEINFO) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) \
 		-o gdb.info $(srcdir)/gdb.texinfo
 
@@ -281,37 +308,16 @@
 # 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)
+links2roff: $(GDB_DOC_SOURCE_INCLUDES)
 	if [ ! -f gdb.texinfo ]; then \
-		(test "$$LN_S" = "ln -s" && ln -s $(SFILES_INCLUDED) .) || \
-		ln $(SFILES_INCLUDED)    . || \
-		cp $(SFILES_INCLUDED)    . ; \
+		(test "$$LN_S" = "ln -s" && ln -s $(GDB_DOC_SOURCE_INCLUDES) .) || \
+		ln $(GDB_DOC_SOURCE_INCLUDES)    . || \
+		cp $(GDB_DOC_SOURCE_INCLUDES)    . ; \
 	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}/rluser.texinfo > ./rluser.texinfo
-
-inc-hist.texinfo: ${READLINE_DIR}/inc-hist.texinfo
-	(test "$$LN_S" = "ln -s" && \
-	 ln -s ${READLINE_DIR}/inc-hist.texinfo .) || \
-	ln ${READLINE_DIR}/inc-hist.texinfo . || \
-	cp ${READLINE_DIR}/inc-hist.texinfo .
-
-gdbmi.texinfo: ${GDBMI_DIR}/gdbmi.texinfo
-	(test "$$LN_S" = "ln -s" && \
-	 ln -s ${GDBMI_DIR}/gdbmi.texinfo .) || \
-	ln ${GDBMI_DIR}/gdbmi.texinfo . || \
-	cp ${GDBMI_DIR}/gdbmi.texinfo .
-
 # gdb manual suitable for [gtn]roff -me
-gdb.me: $(SFILES_LOCAL) links2roff rluser.texinfo inc-hist.texinfo gdbmi.texinfo
+gdb.me: $(GDB_DOC_FILES) links2roff
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
 		-e '/^@ifinfo/,/^@end ifinfo/d' \
@@ -326,7 +332,7 @@
 	>gdb.me 
 
 # gdb manual suitable for [gtn]roff -ms
-gdb.ms: $(SFILES_LOCAL) links2roff rluser.texinfo inc-hist.texinfo gdbmi.texinfo
+gdb.ms: $(GDB_DOC_FILES) links2roff
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
 		-e '/^@ifinfo/,/^@end ifinfo/d' \
@@ -343,7 +349,7 @@
 # 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.texinfo gdbmi.texinfo
+gdb.mm: $(GDB_DOC_FILES) links2roff
 	sed -e '/\\input texinfo/d' \
 		-e '/@c TEXI2ROFF-KILL/,/@c END TEXI2ROFF-KILL/d' \
 		-e '/^@ifinfo/,/^@end ifinfo/d' \
@@ -360,43 +366,46 @@
 
 # GDB MANUAL: HTML file
 
-gdb_toc.html: ${SFILES_DOC}
+gdb_toc.html: ${GDB_DOC_FILES}
 	$(MAKEHTML) $(MAKEHTMLFLAGS) -I ${READLINE_DIR} -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo
 
+GDBINT_TEX_TMPS = gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \
+	gdbint.log gdbint.pg* gdbint.toc gdbint.tp* gdbint.vr*
+
 # GDB INTERNALS MANUAL: TeX dvi file
-gdbint.dvi: gdbint.texinfo gdb-cfg.texi fdl.texi
+gdbint.dvi: $(GDBINT_DOC_FILES)
+	rm -f $(GDBINT_TEX_TMPS)
 	$(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/gdbint.texinfo
-	rm -f gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \
-		gdbint.log gdbint.pg* gdbint.toc gdbint.tp* gdbint.vr*
+	rm -f $(GDBINT_TEX_TMPS)
 
 gdbint.ps : gdbint.dvi
 	$(DVIPS) -o $@ $?
 
-gdbint.pdf: gdbint.texinfo gdb-cfg.texi fdl.texi
+gdbint.pdf: $(GDBINT_DOC_FILES)
+	rm -f $(GDBINT_TEX_TMPS)
 	$(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/gdbint.texinfo
-	rm -f gdbint.aux gdbint.cp* gdbint.fn* gdbint.ky* \
-		gdbint.log gdbint.pg* gdbint.toc gdbint.tp* gdbint.vr*
+	rm -f $(GDBINT_TEX_TMPS)
 
 # GDB INTERNALS MANUAL: info file
 
-gdbint.info: gdbint.texinfo fdl.texi
+gdbint.info: $(GDBINT_DOC_FILES)
 	$(MAKEINFO) -I $(srcdir) -o gdbint.info $(srcdir)/gdbint.texinfo
 
 # GDB INTERNALS MANUAL: HTML file
 
-gdbint_toc.html: gdbint.texinfo gdb-cfg.texi fdl.texi
+gdbint_toc.html: $(GDBINT_DOC_FILES)
 	$(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/gdbint.texinfo
 
-stabs.info: stabs.texinfo
+stabs.info: $(STABS_DOC_FILES)
 	$(MAKEINFO) -o stabs.info $(srcdir)/stabs.texinfo
 
 # STABS DOCUMENTATION: HTML file
 
-stabs_toc.html: stabs.texinfo
+stabs_toc.html: $(STABS_DOC_FILES)
 	$(MAKEHTML) $(MAKEHTMLFLAGS) $(srcdir)/stabs.texinfo
 
 # STABS DOCUMENTATION: TeX dvi file
-stabs.dvi : stabs.texinfo
+stabs.dvi : $(STABS_DOC_FILES)
 	$(SET_TEXINPUTS) $(TEXI2DVI) $(srcdir)/stabs.texinfo
 	rm -f stabs.aux stabs.cp* stabs.fn* stabs.ky* \
 		stabs.log stabs.pg* stabs.toc stabs.tp* stabs.vr*
@@ -404,7 +413,7 @@
 stabs.ps: stabs.dvi
 	$(DVIPS) -o $@ $?
 
-stabs.pdf: stabs.dvi
+stabs.pdf: $(STABS_DOC_FILES)
 	$(SET_TEXINPUTS) $(TEXI2DVI) --pdf $(srcdir)/stabs.texinfo
 	rm -f stabs.aux stabs.cp* stabs.fn* stabs.ky* \
 		stabs.log stabs.pg* stabs.toc stabs.tp* stabs.vr*
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]