server/admin.c: Fix `=' vs `==' error in assertion.

[tripe] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index e033ab0..a5cfdc4 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -28,13 +28,14 @@ include $(top_srcdir)/vars.am
 sbin_PROGRAMS           =
 man_MANS                =
 
+LDADD                   = $(libtripe) $(libpriv) $(catacomb_LIBS)
+
 ###--------------------------------------------------------------------------
 ### The main server.
 
 sbin_PROGRAMS          += tripe
 
 tripe_SOURCES           =
-tripe_LDADD             = $(libtripe) $(catacomb_LIBS)
 
 ## Main header file.
 tripe_SOURCES          += tripe.h
@@ -43,33 +44,33 @@ tripe_SOURCES               += tripe.h
 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
 
 ## Tunnel drivers.
-tripe_SOURCES          += tun-unet.c
-tripe_SOURCES          += tun-bsd.c
-tripe_SOURCES          += tun-linux.c
+tripe_SOURCES          += tun-std.c
 tripe_SOURCES          += tun-slip.c
 
 ## 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
+man_MANS               += tripe-admin.5tripe
+CLEANFILES             += tripe-admin.5tripe
+EXTRA_DIST             += tripe-admin.5.in
 
-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 $@
+## Services manual page.
+man_MANS               += tripe-service.7tripe
+CLEANFILES             += tripe-service.7tripe
+EXTRA_DIST             += tripe-service.7.in
 
 ###----- That's all, folks --------------------------------------------------