diff options
| author | Jeremy Jackson <jerj@coplanar.net> | 2009-01-21 14:15:44 -0500 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2009-06-19 15:03:30 +0100 |
| commit | 4bf6461e0f6cc6dcb8ca54314bc6c1865a366e70 (patch) | |
| tree | 209afa18250f7e02949bfcad503556818ca0aae3 /doc | |
| parent | 25f45887abf320401745dd433c4e82bfd6db5d4d (diff) | |
[build] cleanup low-hanging autoreconf warnings
Some uses of GNU make extensions were not necessary. There are still some,
but they might exist as workarounds for older versions of autoconf that have
since been solved.
Lesson learned: implicit target rules have opposite order to pattern target
rules.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index ed3a6d52..4e0ca661 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,6 +12,7 @@ # TeX implementation, which we depend on already anyway. # # dia -> (dia) -> png -> (convert) -> eps -> (epstopdf) -> pdf +SUFFIXES = .png .eps .dia .pdf DIATOPNG = dia -t png -e DIATOEPS = dia -t eps -e PNGTOEPS = convert -dither -antialias -contrast -despeckle @@ -21,11 +22,11 @@ EPSTOPDF = epstopdf # The figure sources figures_names_parts = -normal-processing -rs-processing \ _topologies_full _topologies_rs -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_txt := $(figures_names_parts:%=fig%.txt) +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_txt = $(figures_names_parts:%=fig%.txt) # 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 @@ -51,13 +52,13 @@ quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi filter.texi install.texi \ vtysh.texi routeserver.texi defines.texi $(figures_png) snmptrap.texi \ $(figures_txt) -%.eps: %.png +.png.eps: $(PNGTOEPS) $< "$@" -%.pdf: %.png +.png.pdf: $(PNGTOPDF) $< "$@" -%.png: %.dia +.dia.png: $(DIATOPNG) "$@" $< man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 isisd.8 |