[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.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ed3a6d5..4e0ca66 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 @@
# 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 @@
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
diff --git a/solaris/Makefile.am b/solaris/Makefile.am
index 674f4eb..ecaf9b9 100644
--- a/solaris/Makefile.am
+++ b/solaris/Makefile.am
@@ -10,16 +10,16 @@
pkg_names = daemons dev doc libs smf
pkg_quagga_daemons = zebra bgpd ospfd ospf6d ripd ripngd
pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@target_os@-@target_cpu@
-pkg_depends := $(pkg_names:%=depend.%)
-pkg_packages := $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg)
-pkg_pkginfos := $(pkg_names:%=pkginfo.%.full)
-pkg_prototypes := $(pkg_names:%=prototype.%)
-pkg_manifests := quagga.xml
+pkg_depends = $(pkg_names:%=depend.%)
+pkg_packages = $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg)
+pkg_pkginfos = $(pkg_names:%=pkginfo.%.full)
+pkg_prototypes = $(pkg_names:%=prototype.%)
+pkg_manifests = quagga.xml
# pkgmk variable substitutions wont grok ${variable} in prototype
# file, so we cant let autoconf generate the file sadly
# wish automake would just provide a template for this
-edit := $(SED) \
+edit = $(SED) \
-e 's,@prefix\@,$(prefix),g' \
-e 's,@exec_prefix,$(exec_prefix),g' \
-e 's,@bindir\@,$(bindir),g' \
@@ -47,7 +47,7 @@
-e 's,[@]target_os[@],$(target_os),g'
# common options for pkgmk
-pkg_make_vars := exec_prefix=@exec_prefix@ prefix=@prefix@ \
+pkg_make_vars = exec_prefix=@exec_prefix@ prefix=@prefix@ \
builddir=@builddir@ srcdir=@srcdir@ \
top_builddir=@top_builddir@ top_srcdir=@top_srcdir@ \
abs_builddir=@abs_builddir@ abs_srcdir=@abs_srcdir@ \
@@ -110,9 +110,9 @@
BUILT_SOURCES = $(pkg_pkginfos) pkginfo.tmpl $(pkg_prototypes) \
$(pkg_manifests) $(pkg_depends) quagga.init
-CLEANFILES := $(BUILT_SOURCES) $(pkg_packages)
+CLEANFILES = $(BUILT_SOURCES) $(pkg_packages)
-EXTRA_DIST := $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \
+EXTRA_DIST = $(pkg_manifests:%=%.in) $(pkg_prototypes:%=%.in) \
$(pkg_names:%=pkginfo.%.tmpl.in) $(srcdir)/pkginfo.tmpl.in \
$(pkg_depends:%=%.in) quagga.init.in README.txt