server/tun-slip.c: Treat ESC END as an error, and junk the packet.

[tripe] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 3c050a109a566ac1b22c06f332836200f0287bb4..4bebcd9e68517ad7f531cb1559a9d4d52916cef6 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -28,7 +28,7 @@ include $(top_srcdir)/vars.am
 sbin_PROGRAMS           =
 man_MANS                =
 
-LDADD                   = $(libtripe) $(catacomb_LIBS)
+LDADD                   = $(libtripe) $(libpriv) $(catacomb_LIBS)
 
 ###--------------------------------------------------------------------------
 ### The main server.
@@ -48,6 +48,7 @@ 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
 
@@ -65,12 +66,6 @@ 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 $@
+EXTRA_DIST             += tripe-admin.5.in
 
 ###----- That's all, folks --------------------------------------------------