Commit 65455962 by Kelley Cook Committed by R. Kelley Cook

Makefile.in: Define a vpath for %.texi.

2003-10-24  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in: Define a vpath for %.texi.  Remove explicit $(docdir)
	and $(docdir)/include from any *.texi dependencies.
	($(docobjdir)/%.dvi): Depend on stmp-docobjdir.
	($(docobjdir)/%.1): Depend on .pod instead of .texi.
	($(docobjdir)/%.7): Likewise.
	(%.pod): New implicit rule.
	(cpp.pod): New dependency only rule.
	(gcc.pod): New intermediate rule with dependencies and commands.
	(gfdl.pod): Likewise.
	(fsf-funding.pod): Likewise.

From-SVN: r72905
parent e9b3872d
2003-10-24 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in: Define a vpath for %.texi. Remove explicit $(docdir)
and $(docdir)/include from any *.texi dependencies.
($(docobjdir)/%.dvi): Depend on stmp-docobjdir.
($(docobjdir)/%.1): Depend on .pod instead of .texi.
($(docobjdir)/%.7): Likewise.
(%.pod): New implicit rule.
(cpp.pod): New dependency only rule.
(gcc.pod): New intermediate rule with dependencies and commands.
(gfdl.pod): Likewise.
(fsf-funding.pod): Likewise.
2003-10-24 Nathanael Nerode <neroden@gcc.gnu.org> 2003-10-24 Nathanael Nerode <neroden@gcc.gnu.org>
* fixinc/mkfixinc.sh: Remove special cases for svr4 and ptx, and * fixinc/mkfixinc.sh: Remove special cases for svr4 and ptx, and
......
...@@ -56,9 +56,6 @@ MAKEOVERRIDES = ...@@ -56,9 +56,6 @@ MAKEOVERRIDES =
# Standard autoconf-set variables # Standard autoconf-set variables
# ------------------------------- # -------------------------------
# Directory where sources are, from where we are.
VPATH = @srcdir@
build=@build@ build=@build@
host=@host@ host=@host@
target=@target@ target=@target@
...@@ -89,6 +86,20 @@ top_builddir = .. ...@@ -89,6 +86,20 @@ top_builddir = ..
objdir = @objdir@ objdir = @objdir@
# -------- # --------
# Defined vpaths
# --------
# Directory where sources are, from where we are.
VPATH = @srcdir@
# We define a vpath for the sources of the .texi files here because they
# are split between multiple directories and we would rather use one implicit
# pattern rule for everything.
# This vpath could be extended within the Make-lang fragments.
vpath %.texi $(docdir):$(docdir)/include
# --------
# UNSORTED # UNSORTED
# -------- # --------
...@@ -2617,39 +2628,30 @@ stmp-docobjdir: ...@@ -2617,39 +2628,30 @@ stmp-docobjdir:
$(STAMP) stmp-docobjdir $(STAMP) stmp-docobjdir
doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
info:: $(docobjdir)/cpp.info $(docobjdir)/gcc.info $(docobjdir)/gccint.info $(docobjdir)/gccinstall.info $(docobjdir)/cppinternals.info info:: $(docobjdir)/cpp.info $(docobjdir)/gcc.info $(docobjdir)/gccint.info \
$(docobjdir)/gccinstall.info $(docobjdir)/cppinternals.info
TEXI_CPP_FILES = $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
$(docdir)/cppenv.texi $(docdir)/cppopts.texi TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi
TEXI_GCC_FILES = $(docdir)/gcc.texi $(docdir)/include/gcc-common.texi \ TEXI_GCC_FILES = gcc.texi gcc-common.texi frontends.texi standards.texi \
$(docdir)/frontends.texi $(docdir)/standards.texi \ invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \
$(docdir)/invoke.texi $(docdir)/extend.texi $(docdir)/md.texi \ bugreport.texi service.texi contribute.texi compat.texi funding.texi \
$(docdir)/objc.texi $(docdir)/gcov.texi $(docdir)/trouble.texi \ gnu.texi gpl.texi fdl.texi contrib.texi cppenv.texi cppopts.texi
$(docdir)/bugreport.texi $(docdir)/service.texi \
$(docdir)/contribute.texi $(docdir)/compat.texi \ TEXI_GCCINT_FILES = gccint.texi gcc-common.texi contribute.texi makefile.texi \
$(docdir)/include/funding.texi $(docdir)/gnu.texi \ configterms.texi portability.texi interface.texi passes.texi \
$(docdir)/include/gpl.texi $(docdir)/include/fdl.texi \ c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi fragments.texi \
$(docdir)/contrib.texi $(docdir)/cppenv.texi $(docdir)/cppopts.texi configfiles.texi collect2.texi headerdirs.texi funding.texi gnu.texi \
gpl.texi fdl.texi contrib.texi languages.texi sourcebuild.texi \
TEXI_GCCINT_FILES = $(docdir)/gccint.texi \ gty.texi libgcc.texi
$(docdir)/include/gcc-common.texi $(docdir)/contribute.texi \
$(docdir)/makefile.texi $(docdir)/configterms.texi \ TEXI_GCCINSTALL_FILES = install.texi install-old.texi fdl.texi
$(docdir)/portability.texi $(docdir)/interface.texi \
$(docdir)/passes.texi $(docdir)/c-tree.texi \ TEXI_CPPINT_FILES = cppinternals.texi
$(docdir)/rtl.texi $(docdir)/md.texi $(docdir)/tm.texi \
$(docdir)/hostconfig.texi $(docdir)/fragments.texi \ # The *.1, *.7, *.info, and *.dvi files are being generated from implicit
$(docdir)/configfiles.texi $(docdir)/collect2.texi \ # patterns. To use them, put each of the specific target with with their
$(docdir)/headerdirs.texi $(docdir)/include/funding.texi \ # specific dependencies but no build commands.
$(docdir)/gnu.texi $(docdir)/include/gpl.texi \
$(docdir)/include/fdl.texi $(docdir)/contrib.texi \
$(docdir)/languages.texi $(docdir)/sourcebuild.texi \
$(docdir)/gty.texi $(docdir)/libgcc.texi
TEXI_GCCINSTALL_FILES = $(docdir)/install.texi $(docdir)/install-old.texi \
$(docdir)/include/fdl.texi
TEXI_CPPINT_FILES = $(docdir)/cppinternals.texi
$(docobjdir)/cpp.info cpp.dvi: $(TEXI_CPP_FILES) $(docobjdir)/cpp.info cpp.dvi: $(TEXI_CPP_FILES)
$(docobjdir)/gcc.info gcc.dvi: $(TEXI_GCC_FILES) $(docobjdir)/gcc.info gcc.dvi: $(TEXI_GCC_FILES)
...@@ -2657,7 +2659,7 @@ $(docobjdir)/gccint.info gccint.dvi: $(TEXI_GCCINT_FILES) ...@@ -2657,7 +2659,7 @@ $(docobjdir)/gccint.info gccint.dvi: $(TEXI_GCCINT_FILES)
$(docobjdir)/gccinstall.info gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) $(docobjdir)/gccinstall.info gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
$(docobjdir)/cppinternals.info cppinternals.dvi: $(TEXI_CPPINT_FILES) $(docobjdir)/cppinternals.info cppinternals.dvi: $(TEXI_CPPINT_FILES)
$(docobjdir)/%.info: $(docdir)/%.texi stmp-docobjdir $(docobjdir)/%.info: %.texi stmp-docobjdir
if [ x$(BUILD_INFO) = xinfo ]; then \ if [ x$(BUILD_INFO) = xinfo ]; then \
$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \ $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \
-I $(docdir)/include -o $@ $<; \ -I $(docdir)/include -o $@ $<; \
...@@ -2665,7 +2667,7 @@ $(docobjdir)/%.info: $(docdir)/%.texi stmp-docobjdir ...@@ -2665,7 +2667,7 @@ $(docobjdir)/%.info: $(docdir)/%.texi stmp-docobjdir
dvi:: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi cppinternals.dvi dvi:: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi cppinternals.dvi
%.dvi: $(docdir)/%.texi %.dvi: %.texi stmp-docobjdir
$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $< $(TEXI2DVI) -I $(docdir) -I $(docdir)/include $<
gccinstall.dvi: gccinstall.dvi:
...@@ -2676,32 +2678,37 @@ generated-manpages:: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 \ ...@@ -2676,32 +2678,37 @@ generated-manpages:: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 \
$(docobjdir)/gcc.1 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 \ $(docobjdir)/gcc.1 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 \
$(docobjdir)/fsf-funding.7 $(docobjdir)/fsf-funding.7
$(docobjdir)/gcov.1: $(docdir)/gcov.texi $(docobjdir)/%.1: %.pod stmp-docobjdir
$(docobjdir)/cpp.1: $(docdir)/cpp.texi $(docdir)/cppenv.texi \
$(docdir)/cppopts.texi
$(docobjdir)/gcc.1: $(docdir)/invoke.texi $(docdir)/cppenv.texi \
$(docdir)/cppopts.texi
$(docobjdir)/gfdl.7: $(docdir)/include/fdl.texi
$(docobjdir)/gpl.7: $(docdir)/include/gpl.texi
$(docobjdir)/fsf-funding.7: $(docdir)/include/funding.texi
$(docobjdir)/%.1: $(docdir)/%.texi stmp-docobjdir
$(STAMP) $@ $(STAMP) $@
-$(TEXI2POD) $< > $(basename $(notdir $@)).pod -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
-($(POD2MAN) --section=1 \
$(basename $(notdir $@)).pod > $(@).T$$$$ && \
mv -f $(@).T$$$$ $@) || \ mv -f $(@).T$$$$ $@) || \
(rm -f $(@).T$$$$ && exit 1) (rm -f $(@).T$$$$ && exit 1)
-rm -f $(basename $(notdir $@)).pod
$(docobjdir)/%.7: $(docdir)/%.texi stmp-docobjdir $(docobjdir)/%.7: %.pod stmp-docobjdir
$(STAMP) $@ $(STAMP) $@
-$(TEXI2POD) $< > $(basename $(notdir $@)).pod -($(POD2MAN) --section=7 $< > $(@).T$$$$ && \
-($(POD2MAN) --section=7 \
$(basename $(notdir $@)).pod > $(@).T$$$$ && \
mv -f $(@).T$$$$ $@) || \ mv -f $(@).T$$$$ $@) || \
(rm -f $(@).T$$$$ && exit 1) (rm -f $(@).T$$$$ && exit 1)
-rm -f $(basename $(notdir $@)).pod
%.pod: %.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
.INTERMEDIATE: cpp.pod gcc.pod gfdl.pod fsf-funding.pod
cpp.pod: cpp.texi cppenv.texi cppopts.texi
# These next rules exist because the output name is not the same as
# the input name, so our implict %.pod rule will not work.
gcc.pod: invoke.texi cppenv.texi cppopts.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
gfdl.pod: fdl.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
fsf-funding.pod: funding.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
# #
# Deletion of files made during compilation. # Deletion of files made during compilation.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment