X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/fc916a0942e6ef8f63aefb96119d0e4fd7c7efbb..a9279e37b649abd11bbc416398cfaf787cd8d865:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 53779bcc..e04377f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,17 +32,31 @@ SUBDIRS			 =
 
 ## Core components.
 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
+SUBDIRS			+= svc
+SUBDIRS			+= py
+SUBDIRS			+= peerdb
+endif
+
 ## Key-management.
 if HAVE_PYCATACOMB
 SUBDIRS			+= keys
@@ -53,6 +67,9 @@ if HAVE_PYGTK
 SUBDIRS			+= mon
 endif
 
+## Testing.
+SUBDIRS			+= t
+
 ###--------------------------------------------------------------------------
 ### The pkg-config file.
 
@@ -62,14 +79,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)' \
@@ -79,12 +96,9 @@ 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
 
 ###--------------------------------------------------------------------------
 ### Debian.
@@ -99,6 +113,10 @@ EXTRA_DIST		+= debian/copyright
 EXTRA_DIST		+= debian/pkstream.copyright
 EXTRA_DIST		+= debian/pkstream.install
 
+## pathmtu
+EXTRA_DIST		+= debian/pathmtu.copyright
+EXTRA_DIST		+= debian/pathmtu.install
+
 ## server and client
 EXTRA_DIST		+= debian/tripe.README
 EXTRA_DIST		+= debian/tripe.dirs
@@ -106,14 +124,23 @@ EXTRA_DIST		+= debian/tripe.install
 EXTRA_DIST		+= debian/tripe.postinst
 EXTRA_DIST		+= debian/tripe.logrotate
 
+## uslip
+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
 
 ## wireshark
 EXTRA_DIST		+= debian/tripe-wireshark.install
 
-
 ###----- That's all, folks --------------------------------------------------