Makefile.am: Tweak `silent-rules' machinery.

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 36153b0..c908472 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,13 +97,13 @@ pause_LDADD          = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += pause.1
 endif
 
-## prlimit
+## mprlimit
 if HAVE_PRLIMIT
 if HAVE_MLIB
-bin_PROGRAMS           += prlimit
-prlimit_SOURCES                 = prlimit.c
-prlimit_LDADD           = $(mLib_LIBS)
-dist_man_MANS          += prlimit.1
+bin_PROGRAMS           += mprlimit
+mprlimit_SOURCES        = mprlimit.c
+mprlimit_LDADD          = $(mLib_LIBS)
+dist_man_MANS          += mprlimit.1
 endif
 endif
 
@@ -151,9 +151,9 @@ 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  $@";
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_ = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @echo "  SUBST    $@";
 SUBST = $(V_SUBST)$(confsubst)
 SUBSTITUTIONS = \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
@@ -270,15 +270,9 @@ shadowfix.8: shadowfix.in
        $(AM_V_GEN)pod2man --section 8 $(srcdir)/shadowfix.in >$@.new && \
                mv $@.new $@
 
-bin_SCRIPTS            += unfwd
-CLEANFILES             += unfwd
-EXTRA_DIST             += unfwd.in
+dist_bin_SCRIPTS       += unfwd
 dist_man_MANS          += unfwd.1
 
-unfwd: unfwd.in Makefile
-       $(SUBST) $(srcdir)/unfwd.in >$@.new $(SUBSTITUTIONS) && \
-               chmod +x $@.new && mv $@.new $@
-
 endif
 
 ## Perl modules.