X-Git-Url: https://git.distorted.org.uk/~mdw/misc/blobdiff_plain/b2ffb9b761c57c643a13316b7a15a715644a16ad..2379936b92ef1bf0ed0923a42ffd93846073c437:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index acb0788..36153b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ### -*-makefile-*-
 ###
-### Build script for nsict-utils
+### Build script for distorted-utils
 ###
 ### (c) 2008 Mark Wooding
 ###
@@ -40,20 +40,54 @@ bin_PROGRAMS		+= space
 space_SOURCES		 = space.c
 dist_man_MANS		+= space.1
 
-## not
-bin_PROGRAMS		+= not
-not_SOURCES		 = not.c
-dist_man_MANS		+= not.1
+## cdb tools
+if HAVE_LIBCDB
+bin_PROGRAMS		+= cdb-probe cdb-check-domain
+cdb_probe_SOURCES	 = cdb-probe.c
+cdb_probe_LDADD		 = -lcdb
+cdb_check_domain_SOURCES = cdb-check-domain.c
+cdb_check_domain_LDADD	 = -lcdb
+dist_man_MANS		+= cdb-probe.1 cdb-check-domain.1
+endif
+
+## getpass
+bin_PROGRAMS		+= getpass
+getpass_SOURCES		 = getpass.c
+dist_man_MANS		+= getpass.1
+
+## gorp
+if HAVE_CATACOMB
+bin_PROGRAMS		+= gorp
+gorp_SOURCES		 = gorp.c
+gorp_LDADD		 = $(catacomb_LIBS)
+dist_man_MANS		+= gorp.1
+endif
 
 ## if-mtu
 bin_PROGRAMS		+= if-mtu
 if_mtu_SOURCES		 = if-mtu.c
 dist_man_MANS		+= if-mtu.1
 
-## xtitle
-bin_PROGRAMS		+= xtitle
-xtitle_SOURCES		 = xtitle.c
-## !UNDOCUMENTED
+## locking
+if HAVE_MLIB
+bin_PROGRAMS		+= locking
+locking_SOURCES		 = locking.c
+locking_LDADD		 = $(mLib_LIBS)
+dist_man_MANS		+= locking.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
+
+## not
+bin_PROGRAMS		+= not
+not_SOURCES		 = not.c
+dist_man_MANS		+= not.1
 
 ## pause
 if HAVE_MLIB
@@ -63,6 +97,27 @@ pause_LDADD		 = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS		+= pause.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
+
+## sema
+if HAVE_MLIB
+bin_PROGRAMS		+= sema
+sema_SOURCES		 = sema.c
+sema_SOURCES		+= fence.c fence.h
+sema_SOURCES		+= timemax.cc timemax.h
+sema_LDADD		 = $(mLib_LIBS)
+sema_LINK		 = $(LINK) # don't need C++ libraries here
+dist_man_MANS		+= sema.1
+endif
+
 ## stamp
 if HAVE_MLIB
 bin_PROGRAMS		+= stamp
@@ -71,39 +126,20 @@ stamp_LDADD		 = $(mLib_LIBS)
 dist_man_MANS		+= stamp.1
 endif
 
-## locking
+## x86 model identification
+if X86
 if HAVE_MLIB
-bin_PROGRAMS		+= locking
-locking_SOURCES		 = locking.c
-locking_LDADD		 = $(mLib_LIBS)
-dist_man_MANS		+= locking.1
+bin_PROGRAMS		+= x86-model
+x86_model_SOURCES	 = x86-model.c
+x86_model_LDADD		 = $(mLib_LIBS)
+dist_man_MANS		+= x86-model.1
 endif
-
-## gorp
-if HAVE_CATACOMB
-bin_PROGRAMS		+= gorp
-gorp_SOURCES		 = gorp.c
-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
-cdb_probe_SOURCES	 = cdb-probe.c
-cdb_probe_LDADD		 = -lcdb
-cdb_check_domain_SOURCES = cdb-check-domain.c
-cdb_check_domain_LDADD	 = -lcdb
-dist_man_MANS		+= cdb-probe.1 cdb-check-domain.1
-endif
+## xtitle
+bin_PROGRAMS		+= xtitle
+xtitle_SOURCES		 = xtitle.c
+dist_man_MANS		+= xtitle.1
 
 ###--------------------------------------------------------------------------
 ### Tools in scripts.
@@ -115,24 +151,49 @@ 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) \
+	logdir=$(logdir)
 
 EXTRA_DIST		+= config/confsubst
 
 ## Shell scripts.
-dist_bin_SCRIPTS	+= check-sender
-dist_man_MANS		+= check-sender.1
-
 dist_bin_SCRIPTS	+= buf
 dist_man_MANS		+= buf.1
 
+dist_bin_SCRIPTS	+= check-sender
+dist_man_MANS		+= check-sender.1
+
 dist_bin_SCRIPTS	+= create
 dist_man_MANS		+= create.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	+= sshsvc-mkauthkeys
+dist_man_MANS		+= sshsvc-mkauthkeys.1
+
+dist_bin_SCRIPTS	+= with-umask
+dist_man_MANS		+= with-umask.1
+
 dist_bin_SCRIPTS	+= z
 dist_man_MANS		+= z.1
 
@@ -145,7 +206,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 +223,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 +235,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 +247,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 +260,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 +276,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 +295,31 @@ 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
+EXTRA_DIST		+= debian/compat
+EXTRA_DIST		+= debian/source/format
+
+## What to install where.
+EXTRA_DIST		+= debian/inst
+
 ###----- That's all, folks --------------------------------------------------