admin: Initialize reference counter for client blocks.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index af46114155063aebbd8bd6133fb9c73126afa0ea..144671da21e38b9c406c8fa504cc9a6fe5c210c4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.7 2003/05/17 11:04:38 mdw Exp $
+## $Id$
 ##
 ## Makefile for TrIPE
 ##
@@ -25,33 +25,11 @@
 ## along with TrIPE; if not, write to the Free Software Foundation,
 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-##----- Revision history ----------------------------------------------------
-##
-## $Log: Makefile.am,v $
-## Revision 1.7  2003/05/17 11:04:38  mdw
-## Ship new configuration and startup kit.
-##
-## Revision 1.6  2003/04/23 12:53:28  mdw
-## New pkstream program.
-##
-## Revision 1.5  2001/06/19 22:12:57  mdw
-## Build new proxy program.
-##
-## Revision 1.4  2001/02/22 09:07:28  mdw
-## Build documents now.
-##
-## Revision 1.3  2001/02/16 21:42:02  mdw
-## Only link the server against Catacomb.
-##
-## Revision 1.2  2001/02/05 19:48:18  mdw
-## Initial support for BSD tunnel devices.
-##
-## Revision 1.1  2001/02/03 20:26:37  mdw
-## Initial checkin.
-##
-
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = doc
+SUBDIRS = doc @DIRS@
+configdir = @configdir@
+socketdir = @socketdir@
+logdir = @logdir@
 
 CATACOMB_LIBS = @CATACOMB_LIBS@
 tun = @tun@
@@ -59,23 +37,33 @@ tun = @tun@
 sbin_PROGRAMS = tripe
 bin_PROGRAMS = tripectl tripe-mitm pkstream
 noinst_SCRIPTS = tripe-init
+bin_SCRIPTS = @pyscripts@ @pygtkscripts@
+PYTHONSCRIPTS = tripe-keys
+PYGTKSCRIPTS = tripemon
+EXTRA_SCRIPTS = ${PYTHONSCRIPTS} ${PYGTKSCRIPTS}
 tripe_SOURCES = \
-       tripe.c tripe.h \
-       admin.c peer.c tun-$(tun).c \
-       keymgmt.c keyexch.c keyset.c \
-       buf.c buf.h servutil.c util.c util.h
-EXTRA_tripe_SOURCES = \
-       tun-unet.c tun-bsd.c
+       tripe.c tripe.h tripe-protocol.h \
+       admin.c peer.c \
+       keymgmt.c keyexch.c keyset.c chal.c \
+       servutil.c util.c util.h \
+       tun-unet.c tun-bsd.c tun-linux.c tun-slip.c
 tripe_LDADD = $(CATACOMB_LIBS)
 tripectl_SOURCES = \
        client.c util.c util.h
-       tun-unet.c tun-bsd.c
 tripe_mitm_SOURCES = \
-       mallory.c buf.c buf.h
+       mallory.c
 tripe_mitm_LDADD = $(CATACOMB_LIBS)
 pkstream_SOURCES = \
        pkstream.c
 
-EXTRA_DIST = tripe.conf
+install-hook:
+       for i in "$(configdir)" "$(socketdir)"; do \
+         case "$$i" in /*) $(mkinstalldirs) $(DESTDIR)$$i;; esac; \
+       done
+
+EXTRA_DIST = tripe.conf \
+       debian/rules debian/control debian/changelog debian/copyright \
+       debian/tripe.postinst debian/tripe.prerm debian/tripe.postrm \
+       tripe-keys.in
 
 ##----- That's all, folks ---------------------------------------------------