X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/c64d8cd5d52eeff47dfaab62c3da19ad7b1c9234..9e930d39de569d0aa24eeb7e0603408e89a35c95:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89262790..c3d5bf67 100644
--- 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