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

[tripe] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 1e6d71bc6225e61e7f779bbefb0c71ab12710754..96c78d3021443c79c476db5fd82722c577fa9195 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -25,38 +25,45 @@
 include $(top_srcdir)/vars.am
 
 sbin_PROGRAMS           =
+noinst_LIBRARIES        =
+noinst_PROGRAMS                 =
 man_MANS                =
 
-LDADD                   = $(libtripe) $(libpriv) \
+LDADD                   = $(libcommon) $(libpriv) \
                                $(catacomb_LIBS) $(ADNS_LIBS)
 
 ###--------------------------------------------------------------------------
 ### The main server.
 
-sbin_PROGRAMS          += tripe
-
-tripe_SOURCES           =
+## 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          += bulkcrypto.c
-tripe_SOURCES          += dh.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-std.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.8tripe
@@ -73,4 +80,11 @@ 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 --------------------------------------------------