server/tests.at: Add a retry loop in `COMMS_EPING'.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8926279034a1a5ec9cb35d7c13bd36fc6db15faa..c3d5bf6726453f92a9d2af64f3318aed0c4496a5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ SUBDIRS                        =
 SUBDIRS                        += common
 SUBDIRS                        += uslip
 SUBDIRS                        += client
+SUBDIRS                        += priv
 SUBDIRS                        += server
 SUBDIRS                        += proxy
 SUBDIRS                        += pkstream
@@ -49,6 +50,13 @@ if HAVE_WIRESHARK
 SUBDIRS                        += wireshark
 endif
 
+## Services.
+if HAVE_PYTHON
+SUBDIRS                        += svc
+SUBDIRS                        += py
+SUBDIRS                        += peerdb
+endif
+
 ## Key-management.
 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
@@ -59,6 +67,9 @@ if HAVE_PYGTK
 SUBDIRS                        += mon
 endif
 
+## Contributed stuff.
+SUBDIRS                        += contrib
+
 ## Testing.
 SUBDIRS                        += t
 
@@ -71,14 +82,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)' \
@@ -88,10 +99,6 @@ 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
@@ -126,6 +133,13 @@ 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.dirs
+EXTRA_DIST             += debian/tripe-peer-services.install
+
 ## monitor
 EXTRA_DIST             += debian/tripemon.install