server/admin.h: Consolidate address construction during resolution.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 504ca56b407dc209a157453837e3094c934b21cd..d8b5ac3d720194cc31e7ce9940f3f040a0315be1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,19 +9,18 @@
 ###
 ### This file is part of Trivial IP Encryption (TrIPE).
 ###
-### TrIPE is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### TrIPE is free software: you can redistribute it and/or modify it under
+### the terms of the GNU General Public License as published by the Free
+### Software Foundation; either version 3 of the License, or (at your
+### option) any later version.
 ###
-### TrIPE is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
+### TrIPE is distributed in the hope that it will be useful, but WITHOUT
+### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+### FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+### for more details.
 ###
 ### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 include $(top_srcdir)/vars.am
 
@@ -34,46 +33,70 @@ 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
 
 ###--------------------------------------------------------------------------
-### The pkg-config file.
+### Package-configuration file.
 
-pkgconfigdir            = $(libdir)/pkgconfig
+pkgconfigdir            = $(datadir)/pkgconfig
 pkgconfig_DATA          = tripe.pc
 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)' \
@@ -83,12 +106,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 +118,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 +142,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 --------------------------------------------------