Makefile.am: Don't build `x86-model' if we don't have mLib.

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 66f70a1..4ec1502 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,14 +110,6 @@ gorp_LDADD          = $(catacomb_LIBS)
 dist_man_MANS          += gorp.1
 endif
 
-## qmail-checkspam
-if HAVE_LIBSPAMC
-sbin_PROGRAMS          += qmail-checkspam
-qmail_checkspam_SOURCES         = qmail-checkspam.c
-qmail_checkspam_LDADD   = -lspamc
-dist_man_MANS          += qmail-checkspam.8
-endif
-
 ## cdb tools
 if HAVE_LIBCDB
 bin_PROGRAMS           += cdb-probe cdb-check-domain
@@ -130,11 +122,13 @@ endif
 
 ## x86 model identification
 if X86
+if HAVE_MLIB
 bin_PROGRAMS           += x86-model
 x86_model_SOURCES       = x86-model.c
 x86_model_LDADD                 = $(mLib_LIBS)
 dist_man_MANS          += x86-model.1
 endif
+endif
 
 ###--------------------------------------------------------------------------
 ### Tools in scripts.
@@ -155,7 +149,8 @@ SUBSTITUTIONS = \
        PYTHON=$(PYTHON) \
        PERL=$(PERL) \
        TCLSH=$(TCLSH) \
-       BASH=$(BASH)
+       BASH=$(BASH) \
+       logdir=$(logdir)
 
 EXTRA_DIST             += config/confsubst
 
@@ -172,6 +167,25 @@ 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 $@
+
+dist_bin_SCRIPTS       += with-umask
+dist_man_MANS          += with-umask.1
+
+dist_bin_SCRIPTS       += sshsvc-mkauthkeys
+dist_man_MANS          += sshsvc-mkauthkeys.1
+
 ## bash scripts.
 if HAVE_BASH
 
@@ -291,6 +305,7 @@ EXTRA_DIST          += debian/rules
 EXTRA_DIST             += debian/copyright
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/control
+EXTRA_DIST             += debian/compat
 
 ## What to install where.
 EXTRA_DIST             += debian/inst