server/admin.c: Remove spurious `ping' in usage message.

[tripe] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index f4fb936fabb8e3a584c1d018ecd28099d146fba3..96c78d3021443c79c476db5fd82722c577fa9195 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -9,68 +9,82 @@
 ###
 ### 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
 
 sbin_PROGRAMS           =
+noinst_LIBRARIES        =
+noinst_PROGRAMS                 =
 man_MANS                =
 
+LDADD                   = $(libcommon) $(libpriv) \
+                               $(catacomb_LIBS) $(ADNS_LIBS)
+
 ###--------------------------------------------------------------------------
 ### The main server.
 
-sbin_PROGRAMS          += tripe
-
-tripe_SOURCES           =
-tripe_LDADD             = $(libpriv) $(libtripe) $(catacomb_LIBS)
+## Build a library, for special effects.
+noinst_LIBRARIES       += libtripe.a
+libtripe_a_SOURCES      =
 
 ## Main header file.
-tripe_SOURCES          += tripe.h
+libtripe_a_SOURCES     += tripe.h
 
 ## Main sources.
-tripe_SOURCES          += servutil.c
-tripe_SOURCES          += addrmap.c
-tripe_SOURCES          += keymgmt.c
-tripe_SOURCES          += keyset.c
-tripe_SOURCES          += keyexch.c
-tripe_SOURCES          += chal.c
-tripe_SOURCES          += peer.c
-tripe_SOURCES          += privsep.c
-tripe_SOURCES          += admin.c
-tripe_SOURCES          += tripe.c
+libtripe_a_SOURCES     += servutil.c
+libtripe_a_SOURCES     += addrmap.c
+libtripe_a_SOURCES     += keymgmt.c
+libtripe_a_SOURCES     += bulkcrypto.c
+libtripe_a_SOURCES     += dh.c
+libtripe_a_SOURCES     += keyset.c
+libtripe_a_SOURCES     += keyexch.c
+libtripe_a_SOURCES     += chal.c
+libtripe_a_SOURCES     += peer.c
+libtripe_a_SOURCES     += privsep.c
+libtripe_a_SOURCES     += admin.c
+libtripe_a_SOURCES     += tripe.c
 
 ## Tunnel drivers.
-tripe_SOURCES          += tun-unet.c
-tripe_SOURCES          += tun-bsd.c
-tripe_SOURCES          += tun-linux.c
-tripe_SOURCES          += tun-slip.c
+libtripe_a_SOURCES     += tun-std.c
+libtripe_a_SOURCES     += tun-slip.c
+
+## The main server.
+sbin_PROGRAMS          += tripe
+tripe_SOURCES           = standalone.c
+tripe_LDADD             = libtripe.a $(LDADD)
 
 ## Server manual page.
-man_MANS               += tripe.8
-CLEANFILES             += tripe.8
+man_MANS               += tripe.8tripe
+CLEANFILES             += tripe.8tripe
 EXTRA_DIST             += tripe.8.in
 
 ## The admin protocol manual page.
-man_MANS               += tripe-admin.5
-CLEANFILES             += tripe-admin.5
-EXTRA_DIST             += tripe-admin.5.in make-summary
-
-tripe-admin.5: tripe-admin.5.in make-summary $(mandefs)
-       awk -f $(srcdir)/make-summary <$(srcdir)/tripe-admin.5.in >$@.tmp
-       $(mansubst) $@.tmp >$@.new
-       rm -f $@.tmp
-       mv $@.new $@
+man_MANS               += tripe-admin.5tripe
+CLEANFILES             += tripe-admin.5tripe
+EXTRA_DIST             += tripe-admin.5.in
+
+## Services manual page.
+man_MANS               += tripe-service.7tripe
+CLEANFILES             += tripe-service.7tripe
+EXTRA_DIST             += tripe-service.7.in
+
+###--------------------------------------------------------------------------
+### Unit-test program.
+
+noinst_PROGRAMS                += tripe-test
+tripe_test_SOURCES      = test.c
+tripe_test_LDADD        = libtripe.a $(LDADD)
 
 ###----- That's all, folks --------------------------------------------------