Merge branch 'master' of /home/mdw/public-git/misc

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 656ee8f..dce864a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,14 @@ pause_LDADD           = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += pause.1
 endif
 
+## timeout
+if HAVE_MLIB
+bin_PROGRAMS           += timeout
+timeout_SOURCES                 = timeout.c
+timeout_LDADD           = $(mLib_LIBS) $(MATH_LIBS)
+dist_man_MANS          += timeout.1
+endif
+
 ## stamp
 if HAVE_MLIB
 bin_PROGRAMS           += stamp
@@ -128,6 +136,10 @@ dist_sbin_SCRIPTS   =
 
 ## Making substitutions.
 confsubst = $(top_srcdir)/config/confsubst
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo "  SUBST  $@";
+SUBST = $(V_SUBST)$(confsubst)
 SUBSTITUTIONS = \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
        PYTHON=$(PYTHON) \
@@ -159,7 +171,7 @@ EXTRA_DIST          += inplace.in
 dist_man_MANS          += inplace.1
 
 inplace: inplace.in Makefile
-       $(confsubst) $(srcdir)/inplace.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/inplace.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif
@@ -176,7 +188,7 @@ CLEANFILES          += cdb-assign
 EXTRA_DIST             += cdb-assign.in
 
 cdb-assign: cdb-assign.in Makefile
-       $(confsubst) $(srcdir)/cdb-assign.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/cdb-assign.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 if HAVE_PYMOD_CDB
@@ -188,7 +200,7 @@ CLEANFILES          += cdb-list
 EXTRA_DIST             += cdb-list.in
 
 cdb-list: cdb-list.in Makefile
-       $(confsubst) $(srcdir)/cdb-list.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/cdb-list.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 if HAVE_PYMOD_CDB
@@ -200,7 +212,7 @@ CLEANFILES          += cdb-map
 EXTRA_DIST             += cdb-map.in
 
 cdb-map: cdb-map.in Makefile
-       $(confsubst) $(srcdir)/cdb-map.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/cdb-map.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif
@@ -213,14 +225,15 @@ CLEANFILES                += shadowfix
 EXTRA_DIST             += shadowfix.in
 
 shadowfix: shadowfix.in Makefile
-       $(confsubst) $(srcdir)/shadowfix.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/shadowfix.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 man_MANS               += shadowfix.8
 CLEANFILES             += shadowfix.8
 
 shadowfix.8: shadowfix.in
-       pod2man --section 8 $(srcdir)/shadowfix.in >$@.new && mv $@.new $@
+       $(AM_V_GEN)pod2man --section 8 $(srcdir)/shadowfix.in >$@.new && \
+               mv $@.new $@
 
 bin_SCRIPTS            += unfwd
 CLEANFILES             += unfwd
@@ -228,7 +241,7 @@ EXTRA_DIST          += unfwd.in
 dist_man_MANS          += unfwd.1
 
 unfwd: unfwd.in Makefile
-       $(confsubst) $(srcdir)/unfwd.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/unfwd.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif
@@ -247,7 +260,7 @@ EXTRA_DIST          += splitconf.in
 dist_man_MANS          += splitconf.1
 
 splitconf: splitconf.in Makefile
-       $(confsubst) $(srcdir)/splitconf.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/splitconf.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif