2005-04-02 Paul Jakma <paul@dishone.st>
* Makefile.am: Urg, dont use automake _SOURCES, _BUILT_SOURCES
for figures, automake doesnt know anything about them.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5d1da7a..769fcb4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -14,6 +14,8 @@
dependency on dia :) (amongst other things) for dist users.
quagga_TEXINFOS should depend on figures_BUILT_SOURCES.
* .cvsignore: ignore eps files, built from sources
+ * Makefile.am: Urg, dont use automake _SOURCES, _BUILT_SOURCES
+ for figures, automake doesnt know anything about them.
2005-03-25 Jean-Mickael Guerin <jean-mickael.guerin@6wind.com>
* ipv6.texi: Add new commands for neighbor discovery
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 46365b9..701ce23 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,10 +20,11 @@
# The figure sources
figures_names_parts = -normal-processing -rs-processing \
_topologies_full _topologies_rs
-figures_SOURCES := $(figures_names_parts:%=fig%.dia)
-figures_BUILT_SOURCES := $(figures_names_parts:%=fig%.png) \
- $(figures_names_parts:%=fig%.eps) \
- $(figures_names_parts:%=fig%.pdf)
+figures_sources := $(figures_names_parts:%=fig%.dia)
+figures_png := $(figures_names_parts:%=fig%.png)
+figures_pdf := $(figures_names_parts:%=fig%.pdf)
+figures_eps := $(figures_names_parts:%=fig%.eps)
+figures_built_sources := $(figures_png) $(figures_pdf) $(figures_eps)
# rather twisted logic because we have to build PDFs of the EPS figures for
# PDFTex and yet build one PDF, quagga.pdf, from texi source. Which means we
@@ -32,7 +33,7 @@
# compact it somehow.
# Built from defines.texi.in
-BUILT_SOURCES = defines.texi
+BUILT_SOURCES = defines.texi $(figures_built_sources)
info_TEXINFOS = quagga.texi
@@ -42,15 +43,13 @@
# Have to manually specify the quagga.pdf rule in order to allow
# us to have a generic automatic .pdf rule to build the figure sources
-quagga.pdf: quagga.texi \
- fig-normal-processing.pdf fig_topologies_full.pdf \
- fig-rs-processing.pdf fig_topologies_rs.pdf
+quagga.pdf: quagga.texi $(figures_pdf)
$(TEXI2PDF) -o "$@" $(info_TEXINFOS)
quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi filter.texi install.texi \
ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi overview.texi \
protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi \
- vtysh.texi routeserver.texi defines.texi $(figures_BUILT_SOURCES)
+ vtysh.texi routeserver.texi defines.texi $(figures_png)
%.eps: %.png
$(PNGTOEPS) $< "$@"
@@ -65,7 +64,8 @@
EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) \
mpls/ChangeLog.opaque.txt mpls/cli_summary.txt \
- mpls/opaque_lsa.txt mpls/ospfd.conf $(figures_BUILT_SOURCES)
+ mpls/opaque_lsa.txt mpls/ospfd.conf \
+ $(figures_sources) $(figures_built_sources)
draft-zebra-00.txt:
groff -T ascii -ms draft-zebra-00.ms > draft-zebra-00.txt