Merge branch 'master' of git.distorted.org.uk:public-git/misc

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 064924628f114819eb0040269977ad7f9d126a31..64eeabfb69dad364fd546647eab3de63257ea255 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,14 @@ pause_LDADD           = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += pause.1
 endif
 
+## mtimeout
+if HAVE_MLIB
+bin_PROGRAMS           += mtimeout
+mtimeout_SOURCES        = mtimeout.c
+mtimeout_LDADD          = $(mLib_LIBS) $(MATH_LIBS)
+dist_man_MANS          += mtimeout.1
+endif
+
 ## stamp
 if HAVE_MLIB
 bin_PROGRAMS           += stamp
@@ -84,6 +92,16 @@ locking_LDADD                 = $(mLib_LIBS)
 dist_man_MANS          += locking.1
 endif
 
+## prlimit
+if HAVE_PRLIMIT
+if HAVE_MLIB
+bin_PROGRAMS           += prlimit
+prlimit_SOURCES                 = prlimit.c
+prlimit_LDADD           = $(mLib_LIBS)
+dist_man_MANS          += prlimit.1
+endif
+endif
+
 ## gorp
 if HAVE_CATACOMB
 bin_PROGRAMS           += gorp
@@ -128,13 +146,17 @@ dist_sbin_SCRIPTS  =
 
 ## Making substitutions.
 confsubst = $(top_srcdir)/config/confsubst
-SUBST = $(AM_V_GEN)$(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) \
        PERL=$(PERL) \
        TCLSH=$(TCLSH) \
-       BASH=$(BASH)
+       BASH=$(BASH) \
+       logdir=$(logdir)
 
 EXTRA_DIST             += config/confsubst
 
@@ -151,6 +173,19 @@ dist_man_MANS              += create.1
 dist_bin_SCRIPTS       += z
 dist_man_MANS          += z.1
 
+bin_SCRIPTS            += hush
+man_MANS               += hush.1
+CLEANFILES             += hush hush.1
+EXTRA_DIST             += hush.in hush.1.in
+
+hush: hush.in Makefile
+       $(SUBST) $(srcdir)/hush.in >$@.new $(SUBSTITUTIONS) && \
+               chmod +x $@.new && mv $@.new $@
+
+hush.1: hush.1.in Makefile
+       $(SUBST) $(srcdir)/hush.1.in >$@.new $(SUBSTITUTIONS) && \
+               mv $@.new $@
+
 ## bash scripts.
 if HAVE_BASH
 
@@ -221,8 +256,8 @@ man_MANS            += shadowfix.8
 CLEANFILES             += shadowfix.8
 
 shadowfix.8: shadowfix.in
-       $(AM_V_GEN)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