Merge from gnulib

[gnu-emacs] / doc / misc / Makefile.in

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index e2de06d1636cf4842a2f1be7c8ce753ab3e89d26..aa35002e85e64420ab5fbbf4c5d6a5aedff11c86 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -20,7 +20,7 @@
 SHELL = @SHELL@
 
 # Where to find the source code.  $(srcdir) will be the doc/misc subdirectory
-# of the source tree.  This is set by configure's `--srcdir' option.
+# of the source tree.  This is set by configure's '--srcdir' option.
 srcdir=@srcdir@
 
 ## Where the output files go.
@@ -29,7 +29,7 @@ srcdir=@srcdir@
 ## In a tarfile of Emacs, the Info files should be up to date.
 buildinfodir = $(srcdir)/../../info
 
-## Directory with emacsver.texi.
+## Directory with docstyle.texi and emacsver.texi.
 emacsdir = $(srcdir)/../emacs
 
 prefix = @prefix@
@@ -108,6 +108,7 @@ ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
 gfdl = ${srcdir}/doclicense.texi
+style = ${emacsdir}/docstyle.texi
 
 .PHONY: info dvi html pdf ps echo-info $(INFO_TARGETS)
 ## Prevent implicit rule triggering for foo.info.
@@ -140,7 +141,7 @@ ${buildinfodir}:
 
 EXTRA_OPTS =
 
-${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} | ${buildinfodir}
+${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} ${style} | ${buildinfodir}
        $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) \
          -o $@ $<
 
@@ -155,13 +156,13 @@ info.info: $(buildinfodir)/info.info
 $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_template,$(ifile))))
 
 
-%.dvi: ${srcdir}/%.texi ${gfdl}
+%.dvi: ${srcdir}/%.texi ${gfdl} ${style}
        $(ENVADD) $(TEXI2DVI) $<
 
-%.pdf: ${srcdir}/%.texi ${gfdl}
+%.pdf: ${srcdir}/%.texi ${gfdl} ${style}
        $(ENVADD) $(TEXI2PDF) $<
 
-%.html: ${srcdir}/%.texi ${gfdl}
+%.html: ${srcdir}/%.texi ${gfdl} ${style}
        $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) \
          -o $@ $<
 
@@ -184,12 +185,13 @@ $(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir}
 
 
 ## Please can we just rename cc-mode.texi to ccmode.texi...
-${buildinfodir}/ccmode.info: ${srcdir}/cc-mode.texi ${gfdl} | ${buildinfodir}
+${buildinfodir}/ccmode.info: \
+  ${srcdir}/cc-mode.texi ${gfdl} ${style} | ${buildinfodir}
        $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 ## efaq, efaq_w32 do not depend on gfdl.
 ## Maybe we can use .SECONDEXPANSION for this.
-${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi | ${buildinfodir}
+${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi ${style} | ${buildinfodir}
        $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 efaq%.dvi: ${srcdir}/efaq%.texi
@@ -203,7 +205,7 @@ efaq%.html: ${srcdir}/efaq%.texi
 
 ${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding
 
-gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl}
+gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} ${style}
 gnus.dvi: $(gnus_deps)
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmpdvi.texi
        $(ENVADD) $(TEXI2DVI) gnustmpdvi.texi