Documentation restructuring: provide a useful overview.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8926279..cdcc3a3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@
 include $(top_srcdir)/vars.am
 
 SUBDIRS                         =
+man_MANS                =
 
 ###--------------------------------------------------------------------------
 ### Subdirectories.
@@ -34,6 +35,7 @@ SUBDIRS                        =
 SUBDIRS                        += common
 SUBDIRS                        += uslip
 SUBDIRS                        += client
+SUBDIRS                        += priv
 SUBDIRS                        += server
 SUBDIRS                        += proxy
 SUBDIRS                        += pkstream
@@ -49,6 +51,13 @@ if HAVE_WIRESHARK
 SUBDIRS                        += wireshark
 endif
 
+## Services.
+if HAVE_PYTHON
+SUBDIRS                        += svc
+SUBDIRS                        += py
+SUBDIRS                        += peerdb
+endif
+
 ## Key-management.
 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
@@ -62,6 +71,16 @@ endif
 ## Testing.
 SUBDIRS                        += t
 
+## Manual.
+SUBDIRS                        += manual
+
+###--------------------------------------------------------------------------
+### Main manual page.
+
+man_MANS               += tripe.7
+EXTRA_DIST             += tripe.7.in
+CLEANFILES             += tripe.7
+
 ###--------------------------------------------------------------------------
 ### The pkg-config file.
 
@@ -71,7 +90,7 @@ 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 $@
 
 ###--------------------------------------------------------------------------
@@ -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
@@ -117,6 +132,8 @@ EXTRA_DIST          += debian/pathmtu.install
 EXTRA_DIST             += debian/tripe.README
 EXTRA_DIST             += debian/tripe.dirs
 EXTRA_DIST             += debian/tripe.install
+EXTRA_DIST             += debian/tripe.docs
+EXTRA_DIST             += debian/tripe.info
 EXTRA_DIST             += debian/tripe.postinst
 EXTRA_DIST             += debian/tripe.logrotate
 
@@ -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.dirs
+EXTRA_DIST             += debian/tripe-peer-services.install
+
 ## monitor
 EXTRA_DIST             += debian/tripemon.install