X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/101acb51a8d63adc10e76027bc25503df8c55a1f..77781be832eea78e2942b3a9422e0f3b438045ac:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dbfa5121..e00e796b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,20 +50,30 @@ 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
@@ -72,7 +82,7 @@ SUBDIRS			+= contrib
 SUBDIRS			+= t
 
 ###--------------------------------------------------------------------------
-### The pkg-config file.
+### Package-configuration file.
 
 pkgconfigdir		 = $(libdir)/pkgconfig
 pkgconfig_DATA		 = tripe.pc
@@ -84,7 +94,7 @@ tripe.pc: tripe.pc.in Makefile
 		mv $@.new $@
 
 ###--------------------------------------------------------------------------
-### Release tweaking.
+### Distribution.
 
 ## Distcheck tweaks.
 DISTCHECK_TUNNELS	 = slip
@@ -110,6 +120,7 @@ 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