X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/a62f8e8a94bf56194539f7140a1215bc74309b36..0d9974ba1c7a707352f9d50f592b39b095de534d:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7cbef362..e00e796b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,7 @@ SUBDIRS			+= pkstream
 SUBDIRS			+= init
 
 ## Path MTU discovery.
-if PATHMTU
 SUBDIRS			+= pathmtu
-endif
 
 ## Wireshark.
 if HAVE_WIRESHARK
@@ -52,26 +50,39 @@ endif
 
 ## Services.
 if HAVE_PYTHON
-SUBDIRS			+= svc
+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
 pkgconfig_DATA		 = tripe.pc
@@ -79,14 +90,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.
+### Distribution.
 
 ## Distcheck tweaks.
-DISTCHECK_TUNNELS	 = linux bsd unet slip
+DISTCHECK_TUNNELS	 = slip
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-tunnel='$(DISTCHECK_TUNNELS)' \
@@ -108,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
@@ -134,8 +147,8 @@ EXTRA_DIST		+= debian/tripe-keys.install
 EXTRA_DIST		+= debian/python-tripe.install
 
 ## peer services
-EXTRA_DIST		+= debian/tripe-peer-services.dirs
 EXTRA_DIST		+= debian/tripe-peer-services.install
+EXTRA_DIST		+= debian/tripe-peer-services.postinst
 
 ## monitor
 EXTRA_DIST		+= debian/tripemon.install