debian/source/format: Apparently you're meant to have one of these now.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 504ca56b407dc209a157453837e3094c934b21cd..3c2c7f6f354a0bc222e74012219acc4cf4da9a1a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,25 +34,49 @@ SUBDIRS                      =
 SUBDIRS                        += common
 SUBDIRS                        += uslip
 SUBDIRS                        += client
+SUBDIRS                        += priv
 SUBDIRS                        += server
 SUBDIRS                        += proxy
 SUBDIRS                        += pkstream
 SUBDIRS                        += init
 
+## Path MTU discovery.
+SUBDIRS                        += pathmtu
+
 ## 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
@@ -66,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.
 
 ## Distcheck tweaks.
-DISTCHECK_TUNNELS       = linux bsd unet slip
+DISTCHECK_TUNNELS       = slip
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-tunnel='$(DISTCHECK_TUNNELS)' \
@@ -83,12 +107,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.
@@ -98,11 +119,17 @@ 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
 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
@@ -116,11 +143,17 @@ 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
 
 ## wireshark
 EXTRA_DIST             += debian/tripe-wireshark.install
 
-
 ###----- That's all, folks --------------------------------------------------