server/tests.at (AWAIT_KXDONE): Ignore the correct server messages.

[tripe] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index f4fb936fabb8e3a584c1d018ecd28099d146fba3..3ca82d5f8d3484cac635bd1461f3f0f5b7bda0bc 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -28,13 +28,14 @@ include $(top_srcdir)/vars.am
 sbin_PROGRAMS           =
 man_MANS                =
 
 sbin_PROGRAMS           =
 man_MANS                =
 

+LDADD                   = $(libtripe) $(libpriv) $(catacomb_LIBS)
+

 ###--------------------------------------------------------------------------
 ### The main server.
 
 sbin_PROGRAMS          += tripe
 
 tripe_SOURCES           =
 ###--------------------------------------------------------------------------
 ### The main server.
 
 sbin_PROGRAMS          += tripe
 
 tripe_SOURCES           =

-tripe_LDADD             = $(libpriv) $(libtripe) $(catacomb_LIBS)

 
 ## Main header file.
 tripe_SOURCES          += tripe.h
 
 ## Main header file.
 tripe_SOURCES          += tripe.h


@@ -43,6 +44,7 @@ tripe_SOURCES         += tripe.h
 tripe_SOURCES          += servutil.c
 tripe_SOURCES          += addrmap.c
 tripe_SOURCES          += keymgmt.c
 tripe_SOURCES          += servutil.c
 tripe_SOURCES          += addrmap.c
 tripe_SOURCES          += keymgmt.c

+tripe_SOURCES          += bulkcrypto.c

 tripe_SOURCES          += keyset.c
 tripe_SOURCES          += keyexch.c
 tripe_SOURCES          += chal.c
 tripe_SOURCES          += keyset.c
 tripe_SOURCES          += keyexch.c
 tripe_SOURCES          += chal.c


@@ -52,25 +54,17 @@ tripe_SOURCES               += admin.c
 tripe_SOURCES          += tripe.c
 
 ## Tunnel drivers.
 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.
 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.
 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

 
 ###----- That's all, folks --------------------------------------------------
 
 ###----- That's all, folks --------------------------------------------------