X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/ef4a1ab72d88f8790c367b513863d4f9a101a34d..fd68efa965e43c44523c4bc1e940a9461df60290:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9a2419db..11a35083 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.9 2003/11/29 23:49:32 mdw Exp $
+## $Id$
 ##
 ## Makefile for TrIPE
 ##
@@ -25,72 +25,10 @@
 ## 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.9  2003/11/29 23:49:32  mdw
-## Debianization.
-##
-## Revision 1.8  2003/10/15 09:31:24  mdw
-## Remove buf, and add Ethereal analysis.
-##
-## 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 @DIRS@
-configdir = @configdir@
-socketdir = @socketdir@
-logdir = @logdir@
-
-CATACOMB_LIBS = @CATACOMB_LIBS@
-tun = @tun@
-
-sbin_PROGRAMS = tripe
-bin_PROGRAMS = tripectl tripe-mitm pkstream
-noinst_SCRIPTS = tripe-init
-tripe_SOURCES = \
-	tripe.c tripe.h tripe-protocol.h \
-	admin.c peer.c tun-$(tun).c \
-	keymgmt.c keyexch.c keyset.c \
-	servutil.c util.c util.h
-EXTRA_tripe_SOURCES = \
-	tun-unet.c tun-bsd.c
-tripe_LDADD = $(CATACOMB_LIBS)
-tripectl_SOURCES = \
-	client.c util.c util.h
-	tun-unet.c tun-bsd.c
-tripe_mitm_SOURCES = \
-	mallory.c
-tripe_mitm_LDADD = $(CATACOMB_LIBS)
-pkstream_SOURCES = \
-	pkstream.c
-
-install-hook:
-	for i in "$(configdir)" "$(socketdir)"; do \
-	  case "$$i" in /*) $(mkinstalldirs) $(DESTDIR)$$i;; esac; \
-	done
+SUBDIRS = common client server proxy pkstream init doc @DIRS@
 
-EXTRA_DIST = tripe.conf \
+EXTRA_DIST = \
 	debian/rules debian/control debian/changelog debian/copyright \
 	debian/tripe.postinst debian/tripe.prerm debian/tripe.postrm