X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/3cbd2d89482ab48adea16aef781b191b793d9a26..03e37cbca5023308bbe7da3f4e4e8a66890e51aa:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89262790..046247a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,51 +34,70 @@ SUBDIRS			 =
 SUBDIRS			+= common
 SUBDIRS			+= uslip
 SUBDIRS			+= client
+SUBDIRS			+= priv
 SUBDIRS			+= server
 SUBDIRS			+= proxy
 SUBDIRS			+= pkstream
 SUBDIRS			+= init
 
 ## Path MTU discovery.
-if PATHMTU
 SUBDIRS			+= pathmtu
-endif
 
 ## Wireshark.
 if HAVE_WIRESHARK
 SUBDIRS			+= wireshark
 endif
 
+## Services.
+if HAVE_PYTHON
+if HAVE_PYMLIB
+SUBDIRS			+= py
+if HAVE_PYCDB
+SUBDIRS			+= peerdb
+SUBDIRS			+= svc
+endif
+endif
+endif
+
 ## Key-management.
+if HAVE_PYTHON
 if HAVE_PYCATACOMB
 SUBDIRS			+= keys
 endif
+endif
 
 ## Graphical monitor.
+if HAVE_PYTHON
+if HAVE_PYMLIB
 if HAVE_PYGTK
 SUBDIRS			+= mon
 endif
+endif
+endif
+
+## Contributed stuff.
+SUBDIRS			+= contrib
 
 ## Testing.
 SUBDIRS			+= t
 
 ###--------------------------------------------------------------------------
-### The pkg-config file.
+### Package-configuration file.
 
-pkgconfigdir		 = $(libdir)/pkgconfig
+pkgconfigdir		 = $(datadir)/pkgconfig
 pkgconfig_DATA		 = tripe.pc
 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.
+### Distribution.
 
 ## Distcheck tweaks.
-DISTCHECK_TUNNELS	 = linux bsd unet slip
+DISTCHECK_TUNNELS	 = slip
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-tunnel='$(DISTCHECK_TUNNELS)' \
@@ -88,10 +107,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
@@ -104,6 +119,8 @@ EXTRA_DIST		+= debian/rules
 EXTRA_DIST		+= debian/control
 EXTRA_DIST		+= debian/changelog
 EXTRA_DIST		+= debian/copyright
+EXTRA_DIST		+= debian/compat
+EXTRA_DIST		+= debian/source/format
 
 ## pkstream
 EXTRA_DIST		+= debian/pkstream.copyright
@@ -126,6 +143,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.install
+EXTRA_DIST		+= debian/tripe-peer-services.postinst
+
 ## monitor
 EXTRA_DIST		+= debian/tripemon.install