Rename `timeout' to `mtimeout' to prevent conflict with GNU Coreutils.

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index acb078815331e8165b831ed61cc5b56d6e17a349..57162e8224e9ae0937f5771793f28e66f00f8923 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,11 @@ bin_PROGRAMS         += if-mtu
 if_mtu_SOURCES          = if-mtu.c
 dist_man_MANS          += if-mtu.1
 
+## getpass
+bin_PROGRAMS           += getpass
+getpass_SOURCES                 = getpass.c
+dist_man_MANS          += getpass.1
+
 ## xtitle
 bin_PROGRAMS           += xtitle
 xtitle_SOURCES          = xtitle.c
@@ -63,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
@@ -105,6 +118,14 @@ cdb_check_domain_LDADD      = -lcdb
 dist_man_MANS          += cdb-probe.1 cdb-check-domain.1
 endif
 
+## x86 model identification
+if X86
+bin_PROGRAMS           += x86-model
+x86_model_SOURCES       = x86-model.c
+x86_model_LDADD                 = $(mLib_LIBS)
+dist_man_MANS          += x86-model.1
+endif
+
 ###--------------------------------------------------------------------------
 ### Tools in scripts.
 
@@ -115,11 +136,16 @@ 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) \
        PERL=$(PERL) \
-       TCLSH=$(TCLSH)
+       TCLSH=$(TCLSH) \
+       BASH=$(BASH)
 
 EXTRA_DIST             += config/confsubst
 
@@ -145,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
@@ -162,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
@@ -174,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
@@ -186,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
@@ -199,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
@@ -214,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
@@ -233,9 +260,29 @@ 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
 
+###--------------------------------------------------------------------------
+### Other administrivia.
+
+dist-hook:
+       echo $(VERSION) >$(distdir)/RELEASE
+
+EXTRA_DIST             += config/auto-version
+
+###--------------------------------------------------------------------------
+### Debian.
+
+## Standard files.
+EXTRA_DIST             += debian/rules
+EXTRA_DIST             += debian/copyright
+EXTRA_DIST             += debian/changelog
+EXTRA_DIST             += debian/control
+
+## What to install where.
+EXTRA_DIST             += debian/inst
+
 ###----- That's all, folks --------------------------------------------------