server/tests.at (WITH_STRACE): Factor out the strace(1) machinery.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21412150477ecf211c44b8a054e666fe26579f12..dbfa5121d93191feadc7d4b2f66128e07c1fc6a4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,17 +32,29 @@ SUBDIRS                      =
 
 ## Core components.
 SUBDIRS                        += common
+SUBDIRS                        += uslip
 SUBDIRS                        += client
+SUBDIRS                        += priv
 SUBDIRS                        += server
 SUBDIRS                        += proxy
 SUBDIRS                        += pkstream
 SUBDIRS                        += init
 
+## Path MTU discovery.
+SUBDIRS                        += pathmtu
+
 ## Wireshark.
 if HAVE_WIRESHARK
 SUBDIRS                        += wireshark
 endif
 
+## Services.
+if HAVE_PYTHON
+SUBDIRS                        += svc
+SUBDIRS                        += py
+SUBDIRS                        += peerdb
+endif
+
 ## Key-management.
 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
@@ -53,6 +65,9 @@ if HAVE_PYGTK
 SUBDIRS                        += mon
 endif
 
+## Contributed stuff.
+SUBDIRS                        += contrib
+
 ## Testing.
 SUBDIRS                        += t
 
@@ -65,14 +80,14 @@ EXTRA_DIST          += tripe.pc.in
 CLEANFILES             += tripe.pc
 
 tripe.pc: tripe.pc.in Makefile
-       $(confsubst) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
                mv $@.new $@
 
 ###--------------------------------------------------------------------------
 ### Release tweaking.
 
 ## Distcheck tweaks.
-DISTCHECK_TUNNELS       = linux bsd unet slip
+DISTCHECK_TUNNELS       = slip
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-tunnel='$(DISTCHECK_TUNNELS)' \
@@ -82,12 +97,9 @@ DISTCHECK_CONFIGURE_FLAGS = \
 dist-hook::
        echo $(VERSION) >$(distdir)/RELEASE
 
-## Manual page preamble.
-EXTRA_DIST             += defs.man.in
-CLEANFILES             += defs.man
-
 ## Additional build tools.
 EXTRA_DIST             += config/confsubst
+EXTRA_DIST             += config/auto-version
 
 ###--------------------------------------------------------------------------
 ### Debian.
@@ -97,11 +109,16 @@ EXTRA_DIST         += debian/rules
 EXTRA_DIST             += debian/control
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/copyright
+EXTRA_DIST             += debian/compat
 
 ## pkstream
 EXTRA_DIST             += debian/pkstream.copyright
 EXTRA_DIST             += debian/pkstream.install
 
+## pathmtu
+EXTRA_DIST             += debian/pathmtu.copyright
+EXTRA_DIST             += debian/pathmtu.install
+
 ## server and client
 EXTRA_DIST             += debian/tripe.README
 EXTRA_DIST             += debian/tripe.dirs
@@ -109,14 +126,23 @@ EXTRA_DIST                += debian/tripe.install
 EXTRA_DIST             += debian/tripe.postinst
 EXTRA_DIST             += debian/tripe.logrotate
 
+## uslip
+EXTRA_DIST             += debian/tripe-uslip.install
+
 ## keys
 EXTRA_DIST             += debian/tripe-keys.install
 
+## modules
+EXTRA_DIST             += debian/python-tripe.install
+
+## peer services
+EXTRA_DIST             += debian/tripe-peer-services.install
+EXTRA_DIST             += debian/tripe-peer-services.postinst
+
 ## monitor
 EXTRA_DIST             += debian/tripemon.install
 
 ## wireshark
 EXTRA_DIST             += debian/tripe-wireshark.install
 
-
 ###----- That's all, folks --------------------------------------------------