svc/conntrack.in (straddr): Handle `None' as a packed address.

[tripe] / vars.am

diff --git a/vars.am b/vars.am
index 245b98e72bdba033936c1605e13e84b2a3f5d66c..251a20589d2920c2f40c8dbd67550446164e1a44 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -38,11 +38,10 @@ SUFFIXES             =
 ### Include path.
 
 TRIPE_INCLUDES = \
-       -I$(top_builddir)/config.h \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/priv
 
-CPPFLAGS += $(TRIPE_INCLUDES)
+AM_CPPFLAGS += $(TRIPE_INCLUDES)
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
@@ -51,9 +50,6 @@ CPPFLAGS += $(TRIPE_INCLUDES)
 libtripe = $(top_builddir)/common/libtripe.a
 libpriv = $(top_builddir)/priv/libpriv.a
 
-## Create a directory if it doesn't exist.
-mkdir_p = $(top_srcdir)/config/install-sh -d
-
 ## Substitute tags in files.
 confsubst = $(top_srcdir)/config/confsubst
 
@@ -70,6 +66,11 @@ SUBSTITUTIONS = \
                PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
                PYTHON=$(PYTHON)
 
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo "  SUBST  $@";
+SUBST = $(V_SUBST)$(confsubst)
+
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
@@ -81,11 +82,17 @@ SUFFIXES            += .8 .8.in
 mandefs = $(top_srcdir)/common/defs.man
 makesummary = $(top_srcdir)/common/make-summary
 
+V_MAN = $(V_MAN_$(V))
+V_MAN_ = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
+V_MAN_0 = @echo "  MAN    $@";
+
 .1.in.1 .5.in.5 .7.in.7 .8.in.8:
-       sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
-       sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' $< >$@.merge
-       $(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
-       awk -f $(makesummary) $@.subst >$@.new
-       rm -f $@.defs $@.merge $@.subst && mv $@.new $@
+       $(V_MAN)
+       $(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
+       $(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \
+               $< >$@.merge
+       $(AM_V_at)$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
+       $(AM_V_at)awk -f $(makesummary) $@.subst >$@.new
+       $(AM_V_at)rm -f $@.defs $@.merge $@.subst && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------