X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/6b6ad6702f305891ced3b9a7cf3061c75eabda86..add23883a6378567be6b7866bc2ff2c32400a346:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 1f4a3722..3ca82d5f 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -28,49 +28,43 @@ 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
 
 ## Main sources.
 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		+= 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
 
-tripe.8: tripe.8.in Makefile
-	$(confsubst) $(srcdir)/tripe.8.in >$@.new $(SUBSTITUTIONS) && \
-		mv $@.new $@
-
 ## The admin protocol manual page.
-man_MANS		+= tripe-admin.5
-EXTRA_DIST		+= tripe-admin.5.in make-summary
-CLEANFILES		+= tripe-admin.5
-
-tripe-admin.5: tripe-admin.5.in make-summary
-	awk -f $(srcdir)/make-summary <$(srcdir)/tripe-admin.5.in >$@.new
-	mv $@.new $@
+man_MANS		+= tripe-admin.5tripe
+CLEANFILES		+= tripe-admin.5tripe
+EXTRA_DIST		+= tripe-admin.5.in
 
 ###----- That's all, folks --------------------------------------------------