Makefile, debian/{control,inst}: Sort the various lists of things.

[misc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2521b3d..36153b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,32 +40,40 @@ 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
-
-## if-mtu
-bin_PROGRAMS           += if-mtu
-if_mtu_SOURCES          = if-mtu.c
-dist_man_MANS          += if-mtu.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
 
-## xtitle
-bin_PROGRAMS           += xtitle
-xtitle_SOURCES          = xtitle.c
-dist_man_MANS          += xtitle.1
+## gorp
+if HAVE_CATACOMB
+bin_PROGRAMS           += gorp
+gorp_SOURCES            = gorp.c
+gorp_LDADD              = $(catacomb_LIBS)
+dist_man_MANS          += gorp.1
+endif
 
-## pause
+## if-mtu
+bin_PROGRAMS           += if-mtu
+if_mtu_SOURCES          = if-mtu.c
+dist_man_MANS          += if-mtu.1
+
+## locking
 if HAVE_MLIB
-bin_PROGRAMS           += pause
-pause_SOURCES           = pause.c
-pause_LDADD             = $(mLib_LIBS) $(MATH_LIBS)
-dist_man_MANS          += pause.1
+bin_PROGRAMS           += locking
+locking_SOURCES                 = locking.c
+locking_LDADD           = $(mLib_LIBS)
+dist_man_MANS          += locking.1
 endif
 
 ## mtimeout
@@ -76,20 +84,17 @@ mtimeout_LDADD               = $(mLib_LIBS) $(MATH_LIBS)
 dist_man_MANS          += mtimeout.1
 endif
 
-## stamp
-if HAVE_MLIB
-bin_PROGRAMS           += stamp
-stamp_SOURCES           = stamp.c
-stamp_LDADD             = $(mLib_LIBS)
-dist_man_MANS          += stamp.1
-endif
+## not
+bin_PROGRAMS           += not
+not_SOURCES             = not.c
+dist_man_MANS          += not.1
 
-## locking
+## pause
 if HAVE_MLIB
-bin_PROGRAMS           += locking
-locking_SOURCES                 = locking.c
-locking_LDADD           = $(mLib_LIBS)
-dist_man_MANS          += locking.1
+bin_PROGRAMS           += pause
+pause_SOURCES           = pause.c
+pause_LDADD             = $(mLib_LIBS) $(MATH_LIBS)
+dist_man_MANS          += pause.1
 endif
 
 ## prlimit
@@ -102,14 +107,6 @@ dist_man_MANS              += prlimit.1
 endif
 endif
 
-## gorp
-if HAVE_CATACOMB
-bin_PROGRAMS           += gorp
-gorp_SOURCES            = gorp.c
-gorp_LDADD              = $(catacomb_LIBS)
-dist_man_MANS          += gorp.1
-endif
-
 ## sema
 if HAVE_MLIB
 bin_PROGRAMS           += sema
@@ -121,14 +118,12 @@ sema_LINK          = $(LINK) # don't need C++ libraries here
 dist_man_MANS          += sema.1
 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
+## stamp
+if HAVE_MLIB
+bin_PROGRAMS           += stamp
+stamp_SOURCES           = stamp.c
+stamp_LDADD             = $(mLib_LIBS)
+dist_man_MANS          += stamp.1
 endif
 
 ## x86 model identification
@@ -141,6 +136,11 @@ dist_man_MANS              += x86-model.1
 endif
 endif
 
+## xtitle
+bin_PROGRAMS           += xtitle
+xtitle_SOURCES          = xtitle.c
+dist_man_MANS          += xtitle.1
+
 ###--------------------------------------------------------------------------
 ### Tools in scripts.
 
@@ -166,18 +166,15 @@ SUBSTITUTIONS = \
 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
 
-dist_bin_SCRIPTS       += z
-dist_man_MANS          += z.1
-
 bin_SCRIPTS            += hush
 man_MANS               += hush.1
 CLEANFILES             += hush hush.1
@@ -191,11 +188,14 @@ 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       += sshsvc-mkauthkeys
-dist_man_MANS          += sshsvc-mkauthkeys.1
+dist_bin_SCRIPTS       += z
+dist_man_MANS          += z.1
 
 ## bash scripts.
 if HAVE_BASH