diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..e69de29bb
diff --git a/LICENSE b/LICENSE
index 1dc0f01f0..0b84bc0d5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,22 +5,22 @@ see the file COPYING.
 See the file CREDITS for details on origins of more of the code. 
 
 The DES library is under a BSD style license, see
-	linux/crypto/ciphers/des/COPYRIGHT.
+	src/libcrypto/libdes/COPYRIGHT.
 Note that this software has a advertising clause in it. 
 
 The MD2 implementation is from RSA Data Security Inc., so this package must
 include the following phrase: "RSA Data Security, Inc. MD2 Message Digest
-Algorithm"  It is not under the GPL; see details in programs/pluto/md2.c.
+Algorithm"  It is not under the GPL; see details in src/pluto/md2.c.
 
 The MD5 implementation is from RSA Data Security Inc., so this package must
 include the following phrase: "derived from the RSA Data Security, Inc.
 MD5 Message-Digest Algorithm".  It is not under the GPL; see details in
-linux/net/ipsec/ipsec_md5c.c. 
+src/libfreeswan/ipsec_md5c.c. 
 
 The PKCS#11 header files in programs/pluto/rsaref/ are from RSA Security Inc.,
 so they must include the following phrase: "RSA Security Inc. PKCS#11
 Cryptographic Token Interface (Cryptoki)". The headers are not under the GPL;
-see details in programs/pluto/rsaref/pkcs11.h.
+see details in src/pluto/rsaref/pkcs11.h.
 
 The linux/net/ipsec/radij.c code is derived from BSD 4.4lite code
 from sys/net/radix.c. 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2dc927572..000000000
--- a/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# FreeS/WAN master makefile
-# Copyright (C) 1998-2002  Henry Spencer.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.4 2004/11/14 21:50:59 as Exp $
-
-
-FREESWANSRCDIR=$(shell pwd)
-export FREESWANSRCDIR
-
-include Makefile.inc
-
-# directories visited by all recursion
-SUBDIRS=lib src linux
-
-# declaration for make's benefit
-.PHONY:	programs install clean distclean \
-	uninstall install_file_list
-
-# programs
-
-all:	programs
-
-programs install install_file_list clean::
-	@for d in $(SUBDIRS) ; \
-	do \
-		(cd $$d && $(MAKE) FREESWANSRCDIR=.. $@ ) || exit 1; \
-	done; \
-
-# uninstall, as much as possible
-uninstall:
-	$(MAKE) --no-print-directory install_file_list | egrep -v '(/ipsec.conf$$|/ipsec.d/)' | xargs rm -f
-
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000000000..af437a64d
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src
diff --git a/Makefile.inc b/Makefile.inc
deleted file mode 100644
index d4d38f0f9..000000000
--- a/Makefile.inc
+++ /dev/null
@@ -1,235 +0,0 @@
-# FreeS/WAN pathnames and other master configuration
-# Copyright (C) 2001, 2002  Henry Spencer.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile.inc,v 1.12 2006/01/25 17:23:15 as Exp $
-
-
-# Variables in this file with names starting with INC_ are not for use
-# by Makefiles which include it; they are subject to change without warning.
-#
-# "Final" and "finally" refer to where the files will end up on the
-# running IPsec system, as opposed to where they get installed by our
-# Makefiles.  (The two are different for cross-compiles and the like,
-# where our Makefiles are not the end of the installation process.)
-# Paths with FINAL in their names are the only ones that the installed
-# software itself depends on.  (Very few things should know about the
-# FINAL paths; think twice and consult Henry before making something new
-# depend on them.)  All other paths are install targets.
-# See also DESTDIR, below.
-
-
-### boilerplate, do not change
-SHELL=/bin/sh
-
-### paths within the source tree
-
-KLIPSINC=${FREESWANSRCDIR}/linux/include
-KLIPSSRC=${FREESWANSRCDIR}/linux/net/ipsec
-
-LIBFREESWANDIR=${FREESWANSRCDIR}/linux/lib/libfreeswan
-FREESWANLIB=${FREESWANSRCDIR}/lib/libfreeswan/libfreeswan.a
-
-LWRESDIR=${FREESWANSRCDIR}/lib/liblwres
-LWRESLIB=${LWRESDIR}/liblwres.a
-
-LIBDESSRCDIR=${FREESWANSRCDIR}/linux/crypto/ciphers/des
-LIBDESLITE=${FREESWANSRCDIR}/lib/libdes/libdes.a
-
-LIBPOLICYDIR=${FREESWANSRCDIR}/linux/lib/libipsecpolicy
-POLICYLIB=${FREESWANSRCDIR}/lib/libipsecpolicy/libipsecpolicy.a
-
-.PHONY:	programs checkprograms clean
-
-### install pathnames
-
-# DESTDIR can be used to supply a prefix to all install targets.
-# (Note that "final" pathnames, signifying where files will eventually
-# reside rather than where install puts them, are exempt from this.)
-# The prefixing is done in this file, so as to have central control over
-# it; DESTDIR itself should never appear in any other Makefile.
-DESTDIR?=
-
-# "local" part of tree, used in building other pathnames
-INC_USRLOCAL=/usr/local
-
-# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
-# settings which are assumed to include it (or at least, to include *some*
-# copy of the "ipsec" command).
-PUBDIR=$(DESTDIR)$(INC_USRLOCAL)/sbin
-
-# BINDIR is where sub-commands get put, FINALBINDIR is where the "ipsec"
-# command will look for them when it is run. Also called LIBEXECDIR.
-FINALLIBEXECDIR=$(INC_USRLOCAL)/libexec/ipsec
-LIBEXECDIR=$(DESTDIR)$(FINALBINDIR)
-
-FINALBINDIR=${FINALLIBEXECDIR}
-BINDIR=${LIBEXECDIR}
-
-
-# SBINDIR is where the user interface command goes.
-FINALSBINDIR=$(INC_USRLOCAL)/sbin
-SBINDIR=$(DESTDIR)$(FINALSBINDIR)
-
-# libdir is where utility files go
-FINALLIBDIR=$(INC_USRLOCAL)/lib/ipsec
-LIBDIR=$(DESTDIR)$(FINALLIBDIR)
-
-# sharedlibdir is where shared libraries go
-SHAREDLIBDIR=$(DESTDIR)$(INC_USRLOCAL)/lib
-
-# where the appropriate manpage tree is located
-# location within INC_USRLOCAL
-INC_MANDIR=man
-# the full pathname
-MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
-# all relevant subdirectories of MANTREE
-MANPLACES=man3 man5 man8
-
-# where configuration files go
-FINALCONFFILE?=/etc/ipsec.conf
-CONFFILE=$(DESTDIR)$(FINALCONFFILE)
-
-FINALCONFDIR?=/etc
-CONFDIR=$(DESTDIR)$(FINALCONFDIR)
-
-FINALCONFDDIR?=${FINALCONFDIR}/ipsec.d
-CONFDDIR=$(DESTDIR)$(FINALCONFDDIR)
-
-# sample configuration files go into
-INC_DOCDIR?=share/doc
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan
-EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
-
-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan
-DOCDIR=${DESTDIR}${FINALDOCDIR}
-
-# where per-conn pluto logs go
-VARDIR?=/var
-LOGDIR?=${VARDIR}/log
-FINALLOGDIR?=${DESTDIR}${LOGDIR}
-
-
-# An attempt is made to automatically figure out where boot/shutdown scripts 
-# will finally go:  the first directory in INC_RCDIRS which exists gets them.
-# If none of those exists (or INC_RCDIRS is empty), INC_RCDEFAULT gets them.
-# With a non-null DESTDIR, INC_RCDEFAULT will be used unless one of the
-# INC_RCDIRS directories has been pre-created under DESTDIR.
-INC_RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
-INC_RCDEFAULT=/etc/rc.d/init.d
-
-# RCDIR is where boot/shutdown scripts go; FINALRCDIR is where they think
-# will finally be (so utils/Makefile can create a symlink in BINDIR to the
-# place where the boot/shutdown script will finally be, rather than the
-# place where it is installed).
-FINALRCDIR=$(shell for d in $(INC_RCDIRS) ; \
-		do if test -d $(DESTDIR)/$$d ; \
-		then echo $$d ; exit 0 ; \
-		fi ; done ; echo $(INC_RCDEFAULT) )
-RCDIR=$(DESTDIR)$(FINALRCDIR)
-
-
-
-### misc installation stuff
-
-# what program to use when installing things
-INSTALL=install
-
-# flags to the install program, for programs, manpages, and config files
-# -b has install make backups (n.b., unlinks original), --suffix controls
-# how backup names are composed.
-# Note that the install procedures will never overwrite an existing config
-# file, which is why -b is not specified for them.
-INSTBINFLAGS=-b --suffix=.old
-INSTMANFLAGS=
-INSTCONFFLAGS=
-
-
-### misc configuration, included here in hopes that other files will not
-### have to be changed for common customizations.
-
-# extra compile flags, for userland and kernel stuff, e.g. -g for debug info
-# (caution, this stuff is still being sorted out, will change in future)
-USERCOMPILE?=-g -O3
-
-# FreeSWAN 3.x will require bind9. 
-USE_LWRES?=false
-
-# whether or not to use iproute2 based commands.
-#
-USE_IPROUTE2?=true
-
-# what kind of firewalling to use:
-#  2.0 	- ipfwadm
-#  2.2  - ipchains
-#  2.4  - iptables
-IPSEC_FIREWALLTYPE=iptables
-
-# whether or not to include ipsec policy code into pluto.
-# false for now, since it is still experimental.
-USE_IPSECPOLICY?=false
-
-# include support for KEY RR 
-# this will become false in late 2003.
-USE_KEYRR?=true
-
-# include support for KERNEL 2.5/2.6 IPsec in pluto
-USE_KERNEL26?=true
-
-# whether or not pluto sends its strongSwan Vendor ID
-USE_VENDORID?=true
-
-# whether or not pluto sends an XAUTH VID (Cisco Mode Config Interoperability)
-USE_XAUTH_VID?=false
-
-# whether to support NAT Traversal (aka NAT-T)
-USE_NAT_TRAVERSAL?=true
-
-# whether to support NAT-T in transport mode (needed for Win2K NAT-T Interop)
-USE_NAT_TRAVERSAL_TRANSPORT_MODE?=false
-
-# include libcurl support (currently used for fetching CRLs, OCSP and SCEP)
-USE_LIBCURL?=false
-
-# include LDAP support (currently used for fetching CRLs)
-USE_LDAP?=false
-
-# uncomment this line if using the LDAPv3 protocol
-LDAP_VERSION=3
-# uncomment this line if using the LDAPv2 protocol
-#LDAP_VERSION=2
-
-# include PKCS11-based smartcard support
-USE_SMARTCARD?=false
-
-# Default PKCS11 library
-# Uncomment this line if using OpenSC <= 0.9.6
-#PKCS11_DEFAULT_LIB=\"/usr/lib/pkcs11/opensc-pkcs11.so\"
-# Uncomment this line if using OpenSC >= 0.10.0
-PKCS11_DEFAULT_LIB=\"/usr/lib/opensc-pkcs11.so\"
-# Uncomment and complete this line if using another default library
-#PKCS11_DEFAULT_LIB=\"/usr/lib/...\"
-
-# Enable the leak detective to find memory leaks
-USE_LEAK_DETECTIVE?=false
-
-# export everything so that scripts can use them.
-export LIBFREESWANDIR FREESWANSRCDIR FREESWANLIB
-
--include ${FREESWANSRCDIR}/Makefile.ver
-
-# for emacs
-#
-# Local Variables: ;;;
-# mode: makefile ;;;
-# End Variables: ;;;
-#
diff --git a/Makefile.ver b/Makefile.ver
deleted file mode 100644
index 48f2cacda..000000000
--- a/Makefile.ver
+++ /dev/null
@@ -1 +0,0 @@
-IPSECVERSION=4.0.0
diff --git a/CHANGES b/NEWS
similarity index 99%
rename from CHANGES
rename to NEWS
index 00aa01872..8595682d9 100644
--- a/CHANGES
+++ b/NEWS
@@ -1,3 +1,9 @@
+
+- new build environment featuring autotools. Features such
+  as HTTP, LDAP and smartcard support may be enabled using
+  the ./configure script. Changing install directories 
+  is possible, too. See ./configure --help for more details.
+
 strongswan-4.0.0
 ----------------
 
diff --git a/README.pluto b/README
similarity index 100%
rename from README.pluto
rename to README
diff --git a/configure.in b/configure.in
new file mode 100644
index 000000000..21a5e6edf
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,139 @@
+dnl  configure.in for linux strongSwan
+dnl  Copyright (C) 2006 Martin Willi
+dnl  Hochschule fuer Technik Rapperswil
+dnl 
+dnl  This program is free software; you can redistribute it and/or modify it
+dnl  under the terms of the GNU General Public License as published by the
+dnl  Free Software Foundation; either version 2 of the License, or (at your
+dnl  option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+dnl 
+dnl  This program is distributed in the hope that it will be useful, but
+dnl  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+dnl  or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+dnl  for more details.
+
+dnl ===========================
+dnl  initialize & set some vars
+dnl ===========================
+
+AC_INIT(strongSwan,4.0.0)
+AM_INIT_AUTOMAKE
+AC_C_BIGENDIAN
+AC_SUBST(ipsecdir, '${libexecdir}/ipsec')
+AC_SUBST(confdir, '${sysconfdir}')
+AC_SUBST(piddir, '/var/run')
+
+dnl ===========================
+dnl  check --enable-xxx params
+dnl ===========================
+
+AC_ARG_ENABLE(
+    [http],
+    AS_HELP_STRING([--enable-http],[enable OCSP and fetching of Certificates and CRLs over HTTP (default is NO). Requires libcurl.]),
+    http=true
+    AC_DEFINE(LIBCURL)
+)
+AM_CONDITIONAL(USE_LIBCURL, test x$http = xtrue)
+
+AC_ARG_ENABLE(
+    [ldap],
+    AS_HELP_STRING([--enable-ldap],[enable fetching of CRLs from LDAP (default is NO). Requires openldap. \
+                                    Protocol version 2 or 3 are supported, use --with-ldap=version to specify \
+                                    explicitly.]),
+    ldap=true
+    [case "${enableval}" in
+        2) AC_DEFINE(LDAP_VER, 2) ;;
+        3) AC_DEFINE(LDAP_VER, 3) ;;
+        *) AC_MSG_ERROR([Invalid LDAP protocol version specified!]) ;;
+        esac
+    ]
+)
+AM_CONDITIONAL(USE_LDAP, test x$ldap = xtrue)
+
+AC_ARG_ENABLE(
+    [pkcs11],
+    AS_HELP_STRING([--enable-pkcs11],[enable PKCS11 smartcard support (default is NO). \
+                                      Set the default PKCS11 library using \
+                                      --enable-pkcs11=/path/to/default-pkcs11.so]),
+    smartcard=true
+    AC_DEFINE(SMARTCARD)
+    AC_DEFINE(PKCS11_DEFAULT_LIB, ${enableval})
+)
+AM_CONDITIONAL(USE_SMARTCARD, test x$smartcard = xtrue)
+
+AC_ARG_ENABLE(
+    [leak-detective],
+    AS_HELP_STRING([--enable-leak-detective],[enable malloc hooks to find memory leaks (default is NO).]),
+    leak_detective=true
+    AC_DEFINE(USE_LEAK_DETECTIVE)
+)
+AM_CONDITIONAL(USE_LEAK_DETECTIVE, test x$leak_detective = xtrue)
+
+dnl =========================
+dnl  check required programs
+dnl =========================
+
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_PROG_LEX
+AC_PROG_YACC
+AC_PROG_CC(intel)
+
+dnl ==========================
+dnl  check required libraries
+dnl ==========================
+
+AC_HAVE_LIBRARY([gmp],,[AC_MSG_ERROR([GNU Multi Precision library gmp not found])])	
+if test "$ldap" = "true"; then
+    AC_HAVE_LIBRARY([ldap],,[AC_MSG_ERROR([LDAP enabled, but library ldap not found])])
+    AC_HAVE_LIBRARY([lber],,[AC_MSG_ERROR([LDAP enabled, but library lber not found])])
+fi
+if test "$http" = "true"; then
+    AC_HAVE_LIBRARY([curl],,[AC_MSG_ERROR([HTTP enabled, but library curl not found])])
+fi
+
+
+dnl =============================
+dnl  check required header files
+dnl =============================
+
+
+AC_MSG_CHECKING([gmp.h version >= 4.1.4])
+AC_TRY_COMPILE(
+    [#include "gmp.h"],
+    [
+        #if (__GNU_MP_VERSION*100 +  __GNU_MP_VERSION_MINOR*10 + __GNU_MP_VERSION_PATCHLEVEL) < 414
+            #error bad gmp
+        #endif
+    ], 
+    [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); AC_MSG_ERROR([No usable gmp.h found!])]
+)
+if test "$ldap" = "true"; then
+    AC_CHECK_HEADER([ldap.h],,[AC_MSG_ERROR([LDAP enabled, but ldap.h not found!])])
+fi
+if test "$http" = "true"; then
+    AC_CHECK_HEADER([curl/curl.h],,[AC_MSG_ERROR([HTTP enabled, but curl.h not found!])])
+fi
+
+dnl ==============================
+dnl  build Makefiles
+dnl ==============================
+
+AC_OUTPUT(
+	Makefile
+	src/Makefile
+	src/libstrongswan/Makefile
+	src/libcrypto/Makefile
+	src/libfreeswan/Makefile
+	src/pluto/Makefile
+	src/whack/Makefile
+	src/charon/Makefile
+	src/stroke/Makefile
+	src/ipsec/Makefile
+	src/starter/Makefile
+	src/_updown/Makefile
+	src/_updown_espmark/Makefile
+	src/_copyright/Makefile
+	src/openac/Makefile
+	src/scepclient/Makefile
+)
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 790756b29..000000000
--- a/src/Makefile
+++ /dev/null
@@ -1,465 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# src/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/strongSwan
-pkglibdir = $(libdir)/strongSwan
-pkgincludedir = $(includedir)/strongSwan
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/mwilli/strongswan/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/mwilli/strongswan/trunk/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/mwilli/strongswan/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/mwilli/strongswan/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/mwilli/strongswan/trunk/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"strongSwan\" -DVERSION=\"4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/mwilli/strongswan/trunk/missing --run makeinfo
-OBJEXT = o
-PACKAGE = strongSwan
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/mwilli/strongswan/trunk/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-SUBDIRS = libstrongswan stroke charon whack
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 000000000..a3f90f39e
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libfreeswan libcrypto libstrongswan pluto whack charon stroke starter openac scepclient ipsec _updown _updown_espmark _copyright 
diff --git a/src/Makefile.program b/src/Makefile.program
deleted file mode 100644
index bfb01e544..000000000
--- a/src/Makefile.program
+++ /dev/null
@@ -1,144 +0,0 @@
-
-include ${FREESWANSRCDIR}/Makefile.ver
-
-CFLAGS+=$(USERCOMPILE) -I${KLIPSINC}
-
-CFLAGS+= -Wall
-CFLAGS+= -Wpointer-arith
-CFLAGS+= -Wcast-qual
-CFLAGS+= -Wstrict-prototypes
-CFLAGS+= -Wbad-function-cast 
-
-# die if there are any warnings
-ifndef WERROR
-WERROR:= -Werror
-endif
-
-#CFLAGS+= ${WERROR}
-
-ifneq ($(LD_LIBRARY_PATH),)
-LDFLAGS=-L$(LD_LIBRARY_PATH)
-endif
-
-MANDIR8=$(MANTREE)/man8
-MANDIR5=$(MANTREE)/man5
-
-ifndef PROGRAMDIR
-PROGRAMDIR=${LIBEXECDIR}
-endif
-
-ifndef MANPROGPREFIX
-MANPROGPREFIX=ipsec_
-endif
-
-ifndef CONFDSUBDIR
-CONFDSUBDIR=.
-endif
-
-all: $(PROGRAM)
-
-programs: all
-
-ifneq ($(PROGRAM),check)
-check: $(PROGRAM)
-endif
-
-
-ifneq ($(NOINSTALL),true)
-
-install:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
-	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
-	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
-	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-		$(INSTALL) $(INSTMANFLAGS) $f $(MANDIR8)/$(MANPROGPREFIX)$f || exit 1; \
-	)
-	@$(foreach f, $(EXTRA8MAN), \
-		$(INSTALL) $(INSTMANFLAGS) $f $(MANDIR8)/ipsec_$f || exit 1; \
-	)
-	@$(foreach f, $(EXTRA5MAN), \
-		$(INSTALL) $(INSTMANFLAGS) $f $(MANDIR5)/$f || exit 1 ;\
-	)
-	@$(foreach f, $(EXTRA5PROC), \
-		$(INSTALL) $(INSTMANFLAGS) $f $(MANDIR5)/ipsec_$f || exit 1 ;\
-	)
-	@$(foreach f, $(LIBFILES), \
-		$(INSTALL) $(INSTCONFFLAGS) $f $(LIBDIR)/$f || exit 1 ;\
-	)
-	@$(foreach f, $(CONFFILES), \
-		if [ ! -f $(CONFDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $f $(CONFDIR)/$f || exit 1; fi;\
-		$(INSTALL) $(INSTCONFFLAGS) $f $(EXAMPLECONFDIR)/$f-sample || exit 1; \
-	)
-	@$(foreach f, $(CONFDFILES), \
-		if [ ! -f $(CONFDDIR)/$(CONFDSUBDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $f $(CONFDDIR)/$(CONFDSUBDIR)/$f || exit 1; fi;\
-	)
-
-install_file_list::
-	@if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi
-	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
-		echo $(MANDIR8)/${MANPROGPREFIX}$f; \
-	)
-	@$(foreach f, $(EXTRA8MAN), \
-		echo $(MANDIR8)/ipsec_$f; \
-	)
-	@$(foreach f, $(EXTRA5MAN), \
-		echo $(MANDIR5)/$f;\
-	)
-	@$(foreach f, $(EXTRA5PROC), \
-		echo $(MANDIR5)/ipsec_$f; \
-	)
-	@$(foreach f, $(LIBFILES), \
-		echo $(LIBDIR)/$f;\
-	)
-	@$(foreach f, $(CONFFILES), \
-		echo $(CONFDIR)/$f;\
-		echo $(EXAMPLECONFDIR)/$f-sample;\
-	)
-	@$(foreach f, $(CONFDFILES), \
-		echo $(CONFDDIR)/${CONFDSUBDIR}/$f;\
-	)
-
-endif
-
-# cancel the rule that compiles directly
-%: %.c 
-
-%: %.o $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $@.o ${OBJS} $(LDFLAGS) $(LIBS)
-
-%: %.in ${FREESWANSRCDIR}/Makefile.inc ${FREESWANSRCDIR}/Makefile.ver
-	cat $< | sed -e "s/xxx/$(IPSECVERSION)/" \
-			-e "s:@IPSEC_DIR@:$(FINALBINDIR):" \
-			-e "s:@IPSEC_EXECDIR@:$(FINALLIBEXECDIR):" \
-			-e "s:@IPSEC_SBINDIR@:$(FINALSBINDIR):" \
-			-e "s:@IPSEC_LIBDIR@:$(FINALLIBDIR):" \
-			-e "s:@FINALCONFDIR@:$(FINALCONFDIR):" \
-			-e "s:@EXAMPLECONFDIR@:$(EXAMPLECONFDIR):" \
-			-e "s:@FINALDOCDIR@:$(FINALDOCDIR):" \
-			-e "s:@FINALEXAMPLECONFDIR@:$(FINALEXAMPLECONFDIR):" \
-			-e "s:@MODULE_GOO_LIST@:$(MODULE_GOO_LIST):" \
-			-e "s:@IPSEC_CONFS@:$(FINALCONFDIR):" \
-			-e "s:@IPSEC_CONFDDIR@:$(FINALCONFDDIR):" \
-			-e "s:@USE_IPROUTE2@:$(USE_IPROUTE2):" \
-			-e "s:@IPSEC_FIREWALLTYPE@:$(IPSEC_FIREWALLTYPE):" \
-	| cat >$@
-	if [ -x $< ]; then chmod +x $@; fi
-	if [ "${PROGRAM}.in" = $< ]; then chmod +x $@; fi
-
-cleanall: clean
-
-distclean: clean
-
-mostlyclean: clean
-
-realclean: clean
-
-clean::
-ifneq ($(strip $(PROGRAM)),)
-	@if [ -r $(PROGRAM).in ]; then rm -f $(PROGRAM); fi
-	@if [ -r $(PROGRAM).c ];  then rm -f $(PROGRAM); fi
-	@if [ -n "$(OBJS)" ];     then rm -f $(PROGRAM); fi
-endif
-	@rm -f *.o
-
-checkprograms:
-
diff --git a/src/_copyright/Makefile b/src/_copyright/Makefile
deleted file mode 100644
index 52c594b68..000000000
--- a/src/_copyright/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Makefile for miscelaneous programs
-# Copyright (C) 2002  Michael Richardson	<mcr@freeswan.org>
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.1 2004/03/15 20:35:27 as Exp $
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-PROGRAM=_copyright
-PROGRAMDIR=${LIBDIR}
-LIBS=${FREESWANLIB}
-
-include ../Makefile.program
-
-#
-# $Log: Makefile,v $
-# Revision 1.1  2004/03/15 20:35:27  as
-# added files from freeswan-2.04-x509-1.5.3
-#
-# Revision 1.3  2002/08/02 16:01:07  mcr
-# 	moved user visible programs to $PREFIX/libexec, while moving
-# 	private files to $PREFIX/lib.
-#
-# Revision 1.2  2002/06/02 22:02:14  mcr
-# 	changed TOPDIR->FREESWANSRCDIR in all Makefiles.
-# 	(note that linux/net/ipsec/Makefile uses TOPDIR because this is the
-# 	kernel sense.)
-#
-# Revision 1.1  2002/04/24 07:55:32  mcr
-# 	#include patches and Makefiles for post-reorg compilation.
-#
-#
-#
-
diff --git a/src/_copyright/Makefile.am b/src/_copyright/Makefile.am
new file mode 100644
index 000000000..d8dcfb3f1
--- /dev/null
+++ b/src/_copyright/Makefile.am
@@ -0,0 +1,6 @@
+ipsec_PROGRAMS = _copyright
+_copyright_SOURCES = _copyright.c
+dist_man8_MANS = _copyright.8
+
+INCLUDES = -I$(top_srcdir)/src/libfreeswan
+_copyright_LDADD = $(top_srcdir)/src/libfreeswan/libfreeswan.a
diff --git a/src/_updown/Makefile b/src/_updown/Makefile
deleted file mode 100644
index e0aaab488..000000000
--- a/src/_updown/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for miscelaneous programs
-# Copyright (C) 2002  Michael Richardson	<mcr@freeswan.org>
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.3 2006/04/17 06:48:49 as Exp $
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-PROGRAM=_updown
-PROGRAMDIR=${LIBDIR}
-
-include ../Makefile.program
diff --git a/src/_updown/Makefile.am b/src/_updown/Makefile.am
new file mode 100644
index 000000000..27a467c4f
--- /dev/null
+++ b/src/_updown/Makefile.am
@@ -0,0 +1,3 @@
+dist_ipsec_SCRIPTS = _updown
+dist_man8_MANS = _updown.8
+
diff --git a/src/_updown/_updown.in b/src/_updown/_updown
similarity index 100%
rename from src/_updown/_updown.in
rename to src/_updown/_updown
diff --git a/src/_updown_espmark/Makefile b/src/_updown_espmark/Makefile
deleted file mode 100644
index bd9cd38cb..000000000
--- a/src/_updown_espmark/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Makefile for miscelaneous programs
-# Copyright (C) 2002  Michael Richardson	<mcr@freeswan.org>
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.1 2005/04/07 21:34:19 as Exp $
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-PROGRAM=_updown_espmark
-PROGRAMDIR=${LIBDIR}
-
-include ../Makefile.program
diff --git a/src/_updown_espmark/Makefile.am b/src/_updown_espmark/Makefile.am
new file mode 100644
index 000000000..456702690
--- /dev/null
+++ b/src/_updown_espmark/Makefile.am
@@ -0,0 +1,2 @@
+dist_ipsec_SCRIPTS = _updown_espmark
+dist_man8_MANS = _updown_espmark.8
diff --git a/src/_updown_espmark/_updown_espmark.in b/src/_updown_espmark/_updown_espmark
similarity index 100%
rename from src/_updown_espmark/_updown_espmark.in
rename to src/_updown_espmark/_updown_espmark
diff --git a/src/charon/Makefile b/src/charon/Makefile
deleted file mode 100644
index eddb91b34..000000000
--- a/src/charon/Makefile
+++ /dev/null
@@ -1,1487 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# src/charon/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ../..
-
-pkgdatadir = $(datadir)/strongSwan
-pkglibdir = $(libdir)/strongSwan
-pkgincludedir = $(includedir)/strongSwan
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-bin_PROGRAMS = charon$(EXEEXT)
-subdir = src/charon
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_charon_OBJECTS = connection.$(OBJEXT) \
-	local_connection_store.$(OBJEXT) policy.$(OBJEXT) \
-	local_policy_store.$(OBJEXT) local_credential_store.$(OBJEXT) \
-	traffic_selector.$(OBJEXT) proposal.$(OBJEXT) \
-	configuration.$(OBJEXT) ike_sa_init_requested.$(OBJEXT) \
-	state.$(OBJEXT) ike_sa_init_responded.$(OBJEXT) \
-	ike_sa_established.$(OBJEXT) responder_init.$(OBJEXT) \
-	initiator_init.$(OBJEXT) ike_auth_requested.$(OBJEXT) \
-	child_sa.$(OBJEXT) ike_sa_manager.$(OBJEXT) \
-	ike_sa_id.$(OBJEXT) authenticator.$(OBJEXT) ike_sa.$(OBJEXT) \
-	encryption_payload.$(OBJEXT) cert_payload.$(OBJEXT) \
-	traffic_selector_substructure.$(OBJEXT) \
-	transform_attribute.$(OBJEXT) \
-	configuration_attribute.$(OBJEXT) \
-	transform_substructure.$(OBJEXT) auth_payload.$(OBJEXT) \
-	ike_header.$(OBJEXT) nonce_payload.$(OBJEXT) \
-	eap_payload.$(OBJEXT) ts_payload.$(OBJEXT) \
-	notify_payload.$(OBJEXT) id_payload.$(OBJEXT) \
-	ke_payload.$(OBJEXT) unknown_payload.$(OBJEXT) \
-	encodings.$(OBJEXT) cp_payload.$(OBJEXT) \
-	delete_payload.$(OBJEXT) sa_payload.$(OBJEXT) \
-	certreq_payload.$(OBJEXT) vendor_id_payload.$(OBJEXT) \
-	proposal_substructure.$(OBJEXT) payload.$(OBJEXT) \
-	message.$(OBJEXT) generator.$(OBJEXT) parser.$(OBJEXT) \
-	daemon.$(OBJEXT) packet.$(OBJEXT) socket.$(OBJEXT) \
-	job.$(OBJEXT) delete_established_ike_sa_job.$(OBJEXT) \
-	incoming_packet_job.$(OBJEXT) \
-	delete_half_open_ike_sa_job.$(OBJEXT) \
-	retransmit_request_job.$(OBJEXT) initiate_ike_sa_job.$(OBJEXT) \
-	job_queue.$(OBJEXT) event_queue.$(OBJEXT) send_queue.$(OBJEXT) \
-	kernel_interface.$(OBJEXT) thread_pool.$(OBJEXT) \
-	scheduler.$(OBJEXT) sender.$(OBJEXT) receiver.$(OBJEXT) \
-	stroke_interface.$(OBJEXT)
-charon_OBJECTS = $(am_charon_OBJECTS)
-charon_LDADD = $(LDADD)
-charon_DEPENDENCIES =  \
-	$(top_builddir)/src/libstrongswan/libstrongswan.la
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(charon_SOURCES)
-DIST_SOURCES = $(charon_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/mwilli/strongswan/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/mwilli/strongswan/trunk/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/mwilli/strongswan/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/mwilli/strongswan/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/mwilli/strongswan/trunk/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"strongSwan\" -DVERSION=\"4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/mwilli/strongswan/trunk/missing --run makeinfo
-OBJEXT = o
-PACKAGE = strongSwan
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/mwilli/strongswan/trunk/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-charon_SOURCES = \
-config/connections/connection.c \
-config/connections/local_connection_store.c \
-config/policies/policy.c \
-config/policies/local_policy_store.c \
-config/credentials/local_credential_store.c \
-config/traffic_selector.c \
-config/proposal.c \
-config/configuration.c \
-sa/states/ike_sa_init_requested.c \
-sa/states/state.c \
-sa/states/ike_sa_init_responded.c \
-sa/states/ike_sa_established.c \
-sa/states/responder_init.c \
-sa/states/initiator_init.c \
-sa/states/ike_auth_requested.c \
-sa/child_sa.c \
-sa/ike_sa_manager.c \
-sa/ike_sa_id.c \
-sa/authenticator.c \
-sa/ike_sa.c \
-encoding/payloads/encryption_payload.c \
-encoding/payloads/cert_payload.c \
-encoding/payloads/traffic_selector_substructure.c \
-encoding/payloads/transform_attribute.c \
-encoding/payloads/configuration_attribute.c \
-encoding/payloads/transform_substructure.c \
-encoding/payloads/auth_payload.c \
-encoding/payloads/ike_header.c \
-encoding/payloads/nonce_payload.c \
-encoding/payloads/eap_payload.c \
-encoding/payloads/ts_payload.c \
-encoding/payloads/notify_payload.c \
-encoding/payloads/id_payload.c \
-encoding/payloads/ke_payload.c \
-encoding/payloads/unknown_payload.c \
-encoding/payloads/encodings.c \
-encoding/payloads/cp_payload.c \
-encoding/payloads/delete_payload.c \
-encoding/payloads/sa_payload.c \
-encoding/payloads/certreq_payload.c \
-encoding/payloads/vendor_id_payload.c \
-encoding/payloads/proposal_substructure.c \
-encoding/payloads/payload.c \
-encoding/message.c \
-encoding/generator.c \
-encoding/parser.c \
-daemon.c \
-network/packet.c \
-network/socket.c \
-queues/jobs/job.c \
-queues/jobs/delete_established_ike_sa_job.c \
-queues/jobs/incoming_packet_job.c \
-queues/jobs/delete_half_open_ike_sa_job.c \
-queues/jobs/retransmit_request_job.c \
-queues/jobs/initiate_ike_sa_job.c \
-queues/job_queue.c \
-queues/event_queue.c \
-queues/send_queue.c \
-threads/kernel_interface.c \
-threads/thread_pool.c \
-threads/scheduler.c \
-threads/sender.c \
-threads/receiver.c \
-threads/stroke_interface.c
-
-INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon -I$(top_srcdir)/src/stroke
-LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp -lpthread
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/charon/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/charon/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-charon$(EXEEXT): $(charon_OBJECTS) $(charon_DEPENDENCIES) 
-	@rm -f charon$(EXEEXT)
-	$(LINK) $(charon_LDFLAGS) $(charon_OBJECTS) $(charon_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/auth_payload.Po
-include ./$(DEPDIR)/authenticator.Po
-include ./$(DEPDIR)/cert_payload.Po
-include ./$(DEPDIR)/certreq_payload.Po
-include ./$(DEPDIR)/child_sa.Po
-include ./$(DEPDIR)/configuration.Po
-include ./$(DEPDIR)/configuration_attribute.Po
-include ./$(DEPDIR)/connection.Po
-include ./$(DEPDIR)/cp_payload.Po
-include ./$(DEPDIR)/daemon.Po
-include ./$(DEPDIR)/delete_established_ike_sa_job.Po
-include ./$(DEPDIR)/delete_half_open_ike_sa_job.Po
-include ./$(DEPDIR)/delete_payload.Po
-include ./$(DEPDIR)/eap_payload.Po
-include ./$(DEPDIR)/encodings.Po
-include ./$(DEPDIR)/encryption_payload.Po
-include ./$(DEPDIR)/event_queue.Po
-include ./$(DEPDIR)/generator.Po
-include ./$(DEPDIR)/id_payload.Po
-include ./$(DEPDIR)/ike_auth_requested.Po
-include ./$(DEPDIR)/ike_header.Po
-include ./$(DEPDIR)/ike_sa.Po
-include ./$(DEPDIR)/ike_sa_established.Po
-include ./$(DEPDIR)/ike_sa_id.Po
-include ./$(DEPDIR)/ike_sa_init_requested.Po
-include ./$(DEPDIR)/ike_sa_init_responded.Po
-include ./$(DEPDIR)/ike_sa_manager.Po
-include ./$(DEPDIR)/incoming_packet_job.Po
-include ./$(DEPDIR)/initiate_ike_sa_job.Po
-include ./$(DEPDIR)/initiator_init.Po
-include ./$(DEPDIR)/job.Po
-include ./$(DEPDIR)/job_queue.Po
-include ./$(DEPDIR)/ke_payload.Po
-include ./$(DEPDIR)/kernel_interface.Po
-include ./$(DEPDIR)/local_connection_store.Po
-include ./$(DEPDIR)/local_credential_store.Po
-include ./$(DEPDIR)/local_policy_store.Po
-include ./$(DEPDIR)/message.Po
-include ./$(DEPDIR)/nonce_payload.Po
-include ./$(DEPDIR)/notify_payload.Po
-include ./$(DEPDIR)/packet.Po
-include ./$(DEPDIR)/parser.Po
-include ./$(DEPDIR)/payload.Po
-include ./$(DEPDIR)/policy.Po
-include ./$(DEPDIR)/proposal.Po
-include ./$(DEPDIR)/proposal_substructure.Po
-include ./$(DEPDIR)/receiver.Po
-include ./$(DEPDIR)/responder_init.Po
-include ./$(DEPDIR)/retransmit_request_job.Po
-include ./$(DEPDIR)/sa_payload.Po
-include ./$(DEPDIR)/scheduler.Po
-include ./$(DEPDIR)/send_queue.Po
-include ./$(DEPDIR)/sender.Po
-include ./$(DEPDIR)/socket.Po
-include ./$(DEPDIR)/state.Po
-include ./$(DEPDIR)/stroke_interface.Po
-include ./$(DEPDIR)/thread_pool.Po
-include ./$(DEPDIR)/traffic_selector.Po
-include ./$(DEPDIR)/traffic_selector_substructure.Po
-include ./$(DEPDIR)/transform_attribute.Po
-include ./$(DEPDIR)/transform_substructure.Po
-include ./$(DEPDIR)/ts_payload.Po
-include ./$(DEPDIR)/unknown_payload.Po
-include ./$(DEPDIR)/vendor_id_payload.Po
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-connection.o: config/connections/connection.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT connection.o -MD -MP -MF "$(DEPDIR)/connection.Tpo" -c -o connection.o `test -f 'config/connections/connection.c' || echo '$(srcdir)/'`config/connections/connection.c; \
-	then mv -f "$(DEPDIR)/connection.Tpo" "$(DEPDIR)/connection.Po"; else rm -f "$(DEPDIR)/connection.Tpo"; exit 1; fi
-#	source='config/connections/connection.c' object='connection.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o connection.o `test -f 'config/connections/connection.c' || echo '$(srcdir)/'`config/connections/connection.c
-
-connection.obj: config/connections/connection.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT connection.obj -MD -MP -MF "$(DEPDIR)/connection.Tpo" -c -o connection.obj `if test -f 'config/connections/connection.c'; then $(CYGPATH_W) 'config/connections/connection.c'; else $(CYGPATH_W) '$(srcdir)/config/connections/connection.c'; fi`; \
-	then mv -f "$(DEPDIR)/connection.Tpo" "$(DEPDIR)/connection.Po"; else rm -f "$(DEPDIR)/connection.Tpo"; exit 1; fi
-#	source='config/connections/connection.c' object='connection.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o connection.obj `if test -f 'config/connections/connection.c'; then $(CYGPATH_W) 'config/connections/connection.c'; else $(CYGPATH_W) '$(srcdir)/config/connections/connection.c'; fi`
-
-local_connection_store.o: config/connections/local_connection_store.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT local_connection_store.o -MD -MP -MF "$(DEPDIR)/local_connection_store.Tpo" -c -o local_connection_store.o `test -f 'config/connections/local_connection_store.c' || echo '$(srcdir)/'`config/connections/local_connection_store.c; \
-	then mv -f "$(DEPDIR)/local_connection_store.Tpo" "$(DEPDIR)/local_connection_store.Po"; else rm -f "$(DEPDIR)/local_connection_store.Tpo"; exit 1; fi
-#	source='config/connections/local_connection_store.c' object='local_connection_store.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o local_connection_store.o `test -f 'config/connections/local_connection_store.c' || echo '$(srcdir)/'`config/connections/local_connection_store.c
-
-local_connection_store.obj: config/connections/local_connection_store.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT local_connection_store.obj -MD -MP -MF "$(DEPDIR)/local_connection_store.Tpo" -c -o local_connection_store.obj `if test -f 'config/connections/local_connection_store.c'; then $(CYGPATH_W) 'config/connections/local_connection_store.c'; else $(CYGPATH_W) '$(srcdir)/config/connections/local_connection_store.c'; fi`; \
-	then mv -f "$(DEPDIR)/local_connection_store.Tpo" "$(DEPDIR)/local_connection_store.Po"; else rm -f "$(DEPDIR)/local_connection_store.Tpo"; exit 1; fi
-#	source='config/connections/local_connection_store.c' object='local_connection_store.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o local_connection_store.obj `if test -f 'config/connections/local_connection_store.c'; then $(CYGPATH_W) 'config/connections/local_connection_store.c'; else $(CYGPATH_W) '$(srcdir)/config/connections/local_connection_store.c'; fi`
-
-policy.o: config/policies/policy.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT policy.o -MD -MP -MF "$(DEPDIR)/policy.Tpo" -c -o policy.o `test -f 'config/policies/policy.c' || echo '$(srcdir)/'`config/policies/policy.c; \
-	then mv -f "$(DEPDIR)/policy.Tpo" "$(DEPDIR)/policy.Po"; else rm -f "$(DEPDIR)/policy.Tpo"; exit 1; fi
-#	source='config/policies/policy.c' object='policy.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o policy.o `test -f 'config/policies/policy.c' || echo '$(srcdir)/'`config/policies/policy.c
-
-policy.obj: config/policies/policy.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT policy.obj -MD -MP -MF "$(DEPDIR)/policy.Tpo" -c -o policy.obj `if test -f 'config/policies/policy.c'; then $(CYGPATH_W) 'config/policies/policy.c'; else $(CYGPATH_W) '$(srcdir)/config/policies/policy.c'; fi`; \
-	then mv -f "$(DEPDIR)/policy.Tpo" "$(DEPDIR)/policy.Po"; else rm -f "$(DEPDIR)/policy.Tpo"; exit 1; fi
-#	source='config/policies/policy.c' object='policy.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o policy.obj `if test -f 'config/policies/policy.c'; then $(CYGPATH_W) 'config/policies/policy.c'; else $(CYGPATH_W) '$(srcdir)/config/policies/policy.c'; fi`
-
-local_policy_store.o: config/policies/local_policy_store.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT local_policy_store.o -MD -MP -MF "$(DEPDIR)/local_policy_store.Tpo" -c -o local_policy_store.o `test -f 'config/policies/local_policy_store.c' || echo '$(srcdir)/'`config/policies/local_policy_store.c; \
-	then mv -f "$(DEPDIR)/local_policy_store.Tpo" "$(DEPDIR)/local_policy_store.Po"; else rm -f "$(DEPDIR)/local_policy_store.Tpo"; exit 1; fi
-#	source='config/policies/local_policy_store.c' object='local_policy_store.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o local_policy_store.o `test -f 'config/policies/local_policy_store.c' || echo '$(srcdir)/'`config/policies/local_policy_store.c
-
-local_policy_store.obj: config/policies/local_policy_store.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT local_policy_store.obj -MD -MP -MF "$(DEPDIR)/local_policy_store.Tpo" -c -o local_policy_store.obj `if test -f 'config/policies/local_policy_store.c'; then $(CYGPATH_W) 'config/policies/local_policy_store.c'; else $(CYGPATH_W) '$(srcdir)/config/policies/local_policy_store.c'; fi`; \
-	then mv -f "$(DEPDIR)/local_policy_store.Tpo" "$(DEPDIR)/local_policy_store.Po"; else rm -f "$(DEPDIR)/local_policy_store.Tpo"; exit 1; fi
-#	source='config/policies/local_policy_store.c' object='local_policy_store.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o local_policy_store.obj `if test -f 'config/policies/local_policy_store.c'; then $(CYGPATH_W) 'config/policies/local_policy_store.c'; else $(CYGPATH_W) '$(srcdir)/config/policies/local_policy_store.c'; fi`
-
-local_credential_store.o: config/credentials/local_credential_store.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT local_credential_store.o -MD -MP -MF "$(DEPDIR)/local_credential_store.Tpo" -c -o local_credential_store.o `test -f 'config/credentials/local_credential_store.c' || echo '$(srcdir)/'`config/credentials/local_credential_store.c; \
-	then mv -f "$(DEPDIR)/local_credential_store.Tpo" "$(DEPDIR)/local_credential_store.Po"; else rm -f "$(DEPDIR)/local_credential_store.Tpo"; exit 1; fi
-#	source='config/credentials/local_credential_store.c' object='local_credential_store.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o local_credential_store.o `test -f 'config/credentials/local_credential_store.c' || echo '$(srcdir)/'`config/credentials/local_credential_store.c
-
-local_credential_store.obj: config/credentials/local_credential_store.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT local_credential_store.obj -MD -MP -MF "$(DEPDIR)/local_credential_store.Tpo" -c -o local_credential_store.obj `if test -f 'config/credentials/local_credential_store.c'; then $(CYGPATH_W) 'config/credentials/local_credential_store.c'; else $(CYGPATH_W) '$(srcdir)/config/credentials/local_credential_store.c'; fi`; \
-	then mv -f "$(DEPDIR)/local_credential_store.Tpo" "$(DEPDIR)/local_credential_store.Po"; else rm -f "$(DEPDIR)/local_credential_store.Tpo"; exit 1; fi
-#	source='config/credentials/local_credential_store.c' object='local_credential_store.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o local_credential_store.obj `if test -f 'config/credentials/local_credential_store.c'; then $(CYGPATH_W) 'config/credentials/local_credential_store.c'; else $(CYGPATH_W) '$(srcdir)/config/credentials/local_credential_store.c'; fi`
-
-traffic_selector.o: config/traffic_selector.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT traffic_selector.o -MD -MP -MF "$(DEPDIR)/traffic_selector.Tpo" -c -o traffic_selector.o `test -f 'config/traffic_selector.c' || echo '$(srcdir)/'`config/traffic_selector.c; \
-	then mv -f "$(DEPDIR)/traffic_selector.Tpo" "$(DEPDIR)/traffic_selector.Po"; else rm -f "$(DEPDIR)/traffic_selector.Tpo"; exit 1; fi
-#	source='config/traffic_selector.c' object='traffic_selector.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o traffic_selector.o `test -f 'config/traffic_selector.c' || echo '$(srcdir)/'`config/traffic_selector.c
-
-traffic_selector.obj: config/traffic_selector.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT traffic_selector.obj -MD -MP -MF "$(DEPDIR)/traffic_selector.Tpo" -c -o traffic_selector.obj `if test -f 'config/traffic_selector.c'; then $(CYGPATH_W) 'config/traffic_selector.c'; else $(CYGPATH_W) '$(srcdir)/config/traffic_selector.c'; fi`; \
-	then mv -f "$(DEPDIR)/traffic_selector.Tpo" "$(DEPDIR)/traffic_selector.Po"; else rm -f "$(DEPDIR)/traffic_selector.Tpo"; exit 1; fi
-#	source='config/traffic_selector.c' object='traffic_selector.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o traffic_selector.obj `if test -f 'config/traffic_selector.c'; then $(CYGPATH_W) 'config/traffic_selector.c'; else $(CYGPATH_W) '$(srcdir)/config/traffic_selector.c'; fi`
-
-proposal.o: config/proposal.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proposal.o -MD -MP -MF "$(DEPDIR)/proposal.Tpo" -c -o proposal.o `test -f 'config/proposal.c' || echo '$(srcdir)/'`config/proposal.c; \
-	then mv -f "$(DEPDIR)/proposal.Tpo" "$(DEPDIR)/proposal.Po"; else rm -f "$(DEPDIR)/proposal.Tpo"; exit 1; fi
-#	source='config/proposal.c' object='proposal.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o proposal.o `test -f 'config/proposal.c' || echo '$(srcdir)/'`config/proposal.c
-
-proposal.obj: config/proposal.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proposal.obj -MD -MP -MF "$(DEPDIR)/proposal.Tpo" -c -o proposal.obj `if test -f 'config/proposal.c'; then $(CYGPATH_W) 'config/proposal.c'; else $(CYGPATH_W) '$(srcdir)/config/proposal.c'; fi`; \
-	then mv -f "$(DEPDIR)/proposal.Tpo" "$(DEPDIR)/proposal.Po"; else rm -f "$(DEPDIR)/proposal.Tpo"; exit 1; fi
-#	source='config/proposal.c' object='proposal.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o proposal.obj `if test -f 'config/proposal.c'; then $(CYGPATH_W) 'config/proposal.c'; else $(CYGPATH_W) '$(srcdir)/config/proposal.c'; fi`
-
-configuration.o: config/configuration.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT configuration.o -MD -MP -MF "$(DEPDIR)/configuration.Tpo" -c -o configuration.o `test -f 'config/configuration.c' || echo '$(srcdir)/'`config/configuration.c; \
-	then mv -f "$(DEPDIR)/configuration.Tpo" "$(DEPDIR)/configuration.Po"; else rm -f "$(DEPDIR)/configuration.Tpo"; exit 1; fi
-#	source='config/configuration.c' object='configuration.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o configuration.o `test -f 'config/configuration.c' || echo '$(srcdir)/'`config/configuration.c
-
-configuration.obj: config/configuration.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT configuration.obj -MD -MP -MF "$(DEPDIR)/configuration.Tpo" -c -o configuration.obj `if test -f 'config/configuration.c'; then $(CYGPATH_W) 'config/configuration.c'; else $(CYGPATH_W) '$(srcdir)/config/configuration.c'; fi`; \
-	then mv -f "$(DEPDIR)/configuration.Tpo" "$(DEPDIR)/configuration.Po"; else rm -f "$(DEPDIR)/configuration.Tpo"; exit 1; fi
-#	source='config/configuration.c' object='configuration.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o configuration.obj `if test -f 'config/configuration.c'; then $(CYGPATH_W) 'config/configuration.c'; else $(CYGPATH_W) '$(srcdir)/config/configuration.c'; fi`
-
-ike_sa_init_requested.o: sa/states/ike_sa_init_requested.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_init_requested.o -MD -MP -MF "$(DEPDIR)/ike_sa_init_requested.Tpo" -c -o ike_sa_init_requested.o `test -f 'sa/states/ike_sa_init_requested.c' || echo '$(srcdir)/'`sa/states/ike_sa_init_requested.c; \
-	then mv -f "$(DEPDIR)/ike_sa_init_requested.Tpo" "$(DEPDIR)/ike_sa_init_requested.Po"; else rm -f "$(DEPDIR)/ike_sa_init_requested.Tpo"; exit 1; fi
-#	source='sa/states/ike_sa_init_requested.c' object='ike_sa_init_requested.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_init_requested.o `test -f 'sa/states/ike_sa_init_requested.c' || echo '$(srcdir)/'`sa/states/ike_sa_init_requested.c
-
-ike_sa_init_requested.obj: sa/states/ike_sa_init_requested.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_init_requested.obj -MD -MP -MF "$(DEPDIR)/ike_sa_init_requested.Tpo" -c -o ike_sa_init_requested.obj `if test -f 'sa/states/ike_sa_init_requested.c'; then $(CYGPATH_W) 'sa/states/ike_sa_init_requested.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_sa_init_requested.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_sa_init_requested.Tpo" "$(DEPDIR)/ike_sa_init_requested.Po"; else rm -f "$(DEPDIR)/ike_sa_init_requested.Tpo"; exit 1; fi
-#	source='sa/states/ike_sa_init_requested.c' object='ike_sa_init_requested.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_init_requested.obj `if test -f 'sa/states/ike_sa_init_requested.c'; then $(CYGPATH_W) 'sa/states/ike_sa_init_requested.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_sa_init_requested.c'; fi`
-
-state.o: sa/states/state.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT state.o -MD -MP -MF "$(DEPDIR)/state.Tpo" -c -o state.o `test -f 'sa/states/state.c' || echo '$(srcdir)/'`sa/states/state.c; \
-	then mv -f "$(DEPDIR)/state.Tpo" "$(DEPDIR)/state.Po"; else rm -f "$(DEPDIR)/state.Tpo"; exit 1; fi
-#	source='sa/states/state.c' object='state.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o state.o `test -f 'sa/states/state.c' || echo '$(srcdir)/'`sa/states/state.c
-
-state.obj: sa/states/state.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT state.obj -MD -MP -MF "$(DEPDIR)/state.Tpo" -c -o state.obj `if test -f 'sa/states/state.c'; then $(CYGPATH_W) 'sa/states/state.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/state.c'; fi`; \
-	then mv -f "$(DEPDIR)/state.Tpo" "$(DEPDIR)/state.Po"; else rm -f "$(DEPDIR)/state.Tpo"; exit 1; fi
-#	source='sa/states/state.c' object='state.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o state.obj `if test -f 'sa/states/state.c'; then $(CYGPATH_W) 'sa/states/state.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/state.c'; fi`
-
-ike_sa_init_responded.o: sa/states/ike_sa_init_responded.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_init_responded.o -MD -MP -MF "$(DEPDIR)/ike_sa_init_responded.Tpo" -c -o ike_sa_init_responded.o `test -f 'sa/states/ike_sa_init_responded.c' || echo '$(srcdir)/'`sa/states/ike_sa_init_responded.c; \
-	then mv -f "$(DEPDIR)/ike_sa_init_responded.Tpo" "$(DEPDIR)/ike_sa_init_responded.Po"; else rm -f "$(DEPDIR)/ike_sa_init_responded.Tpo"; exit 1; fi
-#	source='sa/states/ike_sa_init_responded.c' object='ike_sa_init_responded.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_init_responded.o `test -f 'sa/states/ike_sa_init_responded.c' || echo '$(srcdir)/'`sa/states/ike_sa_init_responded.c
-
-ike_sa_init_responded.obj: sa/states/ike_sa_init_responded.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_init_responded.obj -MD -MP -MF "$(DEPDIR)/ike_sa_init_responded.Tpo" -c -o ike_sa_init_responded.obj `if test -f 'sa/states/ike_sa_init_responded.c'; then $(CYGPATH_W) 'sa/states/ike_sa_init_responded.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_sa_init_responded.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_sa_init_responded.Tpo" "$(DEPDIR)/ike_sa_init_responded.Po"; else rm -f "$(DEPDIR)/ike_sa_init_responded.Tpo"; exit 1; fi
-#	source='sa/states/ike_sa_init_responded.c' object='ike_sa_init_responded.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_init_responded.obj `if test -f 'sa/states/ike_sa_init_responded.c'; then $(CYGPATH_W) 'sa/states/ike_sa_init_responded.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_sa_init_responded.c'; fi`
-
-ike_sa_established.o: sa/states/ike_sa_established.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_established.o -MD -MP -MF "$(DEPDIR)/ike_sa_established.Tpo" -c -o ike_sa_established.o `test -f 'sa/states/ike_sa_established.c' || echo '$(srcdir)/'`sa/states/ike_sa_established.c; \
-	then mv -f "$(DEPDIR)/ike_sa_established.Tpo" "$(DEPDIR)/ike_sa_established.Po"; else rm -f "$(DEPDIR)/ike_sa_established.Tpo"; exit 1; fi
-#	source='sa/states/ike_sa_established.c' object='ike_sa_established.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_established.o `test -f 'sa/states/ike_sa_established.c' || echo '$(srcdir)/'`sa/states/ike_sa_established.c
-
-ike_sa_established.obj: sa/states/ike_sa_established.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_established.obj -MD -MP -MF "$(DEPDIR)/ike_sa_established.Tpo" -c -o ike_sa_established.obj `if test -f 'sa/states/ike_sa_established.c'; then $(CYGPATH_W) 'sa/states/ike_sa_established.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_sa_established.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_sa_established.Tpo" "$(DEPDIR)/ike_sa_established.Po"; else rm -f "$(DEPDIR)/ike_sa_established.Tpo"; exit 1; fi
-#	source='sa/states/ike_sa_established.c' object='ike_sa_established.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_established.obj `if test -f 'sa/states/ike_sa_established.c'; then $(CYGPATH_W) 'sa/states/ike_sa_established.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_sa_established.c'; fi`
-
-responder_init.o: sa/states/responder_init.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT responder_init.o -MD -MP -MF "$(DEPDIR)/responder_init.Tpo" -c -o responder_init.o `test -f 'sa/states/responder_init.c' || echo '$(srcdir)/'`sa/states/responder_init.c; \
-	then mv -f "$(DEPDIR)/responder_init.Tpo" "$(DEPDIR)/responder_init.Po"; else rm -f "$(DEPDIR)/responder_init.Tpo"; exit 1; fi
-#	source='sa/states/responder_init.c' object='responder_init.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o responder_init.o `test -f 'sa/states/responder_init.c' || echo '$(srcdir)/'`sa/states/responder_init.c
-
-responder_init.obj: sa/states/responder_init.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT responder_init.obj -MD -MP -MF "$(DEPDIR)/responder_init.Tpo" -c -o responder_init.obj `if test -f 'sa/states/responder_init.c'; then $(CYGPATH_W) 'sa/states/responder_init.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/responder_init.c'; fi`; \
-	then mv -f "$(DEPDIR)/responder_init.Tpo" "$(DEPDIR)/responder_init.Po"; else rm -f "$(DEPDIR)/responder_init.Tpo"; exit 1; fi
-#	source='sa/states/responder_init.c' object='responder_init.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o responder_init.obj `if test -f 'sa/states/responder_init.c'; then $(CYGPATH_W) 'sa/states/responder_init.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/responder_init.c'; fi`
-
-initiator_init.o: sa/states/initiator_init.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initiator_init.o -MD -MP -MF "$(DEPDIR)/initiator_init.Tpo" -c -o initiator_init.o `test -f 'sa/states/initiator_init.c' || echo '$(srcdir)/'`sa/states/initiator_init.c; \
-	then mv -f "$(DEPDIR)/initiator_init.Tpo" "$(DEPDIR)/initiator_init.Po"; else rm -f "$(DEPDIR)/initiator_init.Tpo"; exit 1; fi
-#	source='sa/states/initiator_init.c' object='initiator_init.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initiator_init.o `test -f 'sa/states/initiator_init.c' || echo '$(srcdir)/'`sa/states/initiator_init.c
-
-initiator_init.obj: sa/states/initiator_init.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initiator_init.obj -MD -MP -MF "$(DEPDIR)/initiator_init.Tpo" -c -o initiator_init.obj `if test -f 'sa/states/initiator_init.c'; then $(CYGPATH_W) 'sa/states/initiator_init.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/initiator_init.c'; fi`; \
-	then mv -f "$(DEPDIR)/initiator_init.Tpo" "$(DEPDIR)/initiator_init.Po"; else rm -f "$(DEPDIR)/initiator_init.Tpo"; exit 1; fi
-#	source='sa/states/initiator_init.c' object='initiator_init.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initiator_init.obj `if test -f 'sa/states/initiator_init.c'; then $(CYGPATH_W) 'sa/states/initiator_init.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/initiator_init.c'; fi`
-
-ike_auth_requested.o: sa/states/ike_auth_requested.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_auth_requested.o -MD -MP -MF "$(DEPDIR)/ike_auth_requested.Tpo" -c -o ike_auth_requested.o `test -f 'sa/states/ike_auth_requested.c' || echo '$(srcdir)/'`sa/states/ike_auth_requested.c; \
-	then mv -f "$(DEPDIR)/ike_auth_requested.Tpo" "$(DEPDIR)/ike_auth_requested.Po"; else rm -f "$(DEPDIR)/ike_auth_requested.Tpo"; exit 1; fi
-#	source='sa/states/ike_auth_requested.c' object='ike_auth_requested.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_auth_requested.o `test -f 'sa/states/ike_auth_requested.c' || echo '$(srcdir)/'`sa/states/ike_auth_requested.c
-
-ike_auth_requested.obj: sa/states/ike_auth_requested.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_auth_requested.obj -MD -MP -MF "$(DEPDIR)/ike_auth_requested.Tpo" -c -o ike_auth_requested.obj `if test -f 'sa/states/ike_auth_requested.c'; then $(CYGPATH_W) 'sa/states/ike_auth_requested.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_auth_requested.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_auth_requested.Tpo" "$(DEPDIR)/ike_auth_requested.Po"; else rm -f "$(DEPDIR)/ike_auth_requested.Tpo"; exit 1; fi
-#	source='sa/states/ike_auth_requested.c' object='ike_auth_requested.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_auth_requested.obj `if test -f 'sa/states/ike_auth_requested.c'; then $(CYGPATH_W) 'sa/states/ike_auth_requested.c'; else $(CYGPATH_W) '$(srcdir)/sa/states/ike_auth_requested.c'; fi`
-
-child_sa.o: sa/child_sa.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT child_sa.o -MD -MP -MF "$(DEPDIR)/child_sa.Tpo" -c -o child_sa.o `test -f 'sa/child_sa.c' || echo '$(srcdir)/'`sa/child_sa.c; \
-	then mv -f "$(DEPDIR)/child_sa.Tpo" "$(DEPDIR)/child_sa.Po"; else rm -f "$(DEPDIR)/child_sa.Tpo"; exit 1; fi
-#	source='sa/child_sa.c' object='child_sa.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o child_sa.o `test -f 'sa/child_sa.c' || echo '$(srcdir)/'`sa/child_sa.c
-
-child_sa.obj: sa/child_sa.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT child_sa.obj -MD -MP -MF "$(DEPDIR)/child_sa.Tpo" -c -o child_sa.obj `if test -f 'sa/child_sa.c'; then $(CYGPATH_W) 'sa/child_sa.c'; else $(CYGPATH_W) '$(srcdir)/sa/child_sa.c'; fi`; \
-	then mv -f "$(DEPDIR)/child_sa.Tpo" "$(DEPDIR)/child_sa.Po"; else rm -f "$(DEPDIR)/child_sa.Tpo"; exit 1; fi
-#	source='sa/child_sa.c' object='child_sa.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o child_sa.obj `if test -f 'sa/child_sa.c'; then $(CYGPATH_W) 'sa/child_sa.c'; else $(CYGPATH_W) '$(srcdir)/sa/child_sa.c'; fi`
-
-ike_sa_manager.o: sa/ike_sa_manager.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_manager.o -MD -MP -MF "$(DEPDIR)/ike_sa_manager.Tpo" -c -o ike_sa_manager.o `test -f 'sa/ike_sa_manager.c' || echo '$(srcdir)/'`sa/ike_sa_manager.c; \
-	then mv -f "$(DEPDIR)/ike_sa_manager.Tpo" "$(DEPDIR)/ike_sa_manager.Po"; else rm -f "$(DEPDIR)/ike_sa_manager.Tpo"; exit 1; fi
-#	source='sa/ike_sa_manager.c' object='ike_sa_manager.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_manager.o `test -f 'sa/ike_sa_manager.c' || echo '$(srcdir)/'`sa/ike_sa_manager.c
-
-ike_sa_manager.obj: sa/ike_sa_manager.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_manager.obj -MD -MP -MF "$(DEPDIR)/ike_sa_manager.Tpo" -c -o ike_sa_manager.obj `if test -f 'sa/ike_sa_manager.c'; then $(CYGPATH_W) 'sa/ike_sa_manager.c'; else $(CYGPATH_W) '$(srcdir)/sa/ike_sa_manager.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_sa_manager.Tpo" "$(DEPDIR)/ike_sa_manager.Po"; else rm -f "$(DEPDIR)/ike_sa_manager.Tpo"; exit 1; fi
-#	source='sa/ike_sa_manager.c' object='ike_sa_manager.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_manager.obj `if test -f 'sa/ike_sa_manager.c'; then $(CYGPATH_W) 'sa/ike_sa_manager.c'; else $(CYGPATH_W) '$(srcdir)/sa/ike_sa_manager.c'; fi`
-
-ike_sa_id.o: sa/ike_sa_id.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_id.o -MD -MP -MF "$(DEPDIR)/ike_sa_id.Tpo" -c -o ike_sa_id.o `test -f 'sa/ike_sa_id.c' || echo '$(srcdir)/'`sa/ike_sa_id.c; \
-	then mv -f "$(DEPDIR)/ike_sa_id.Tpo" "$(DEPDIR)/ike_sa_id.Po"; else rm -f "$(DEPDIR)/ike_sa_id.Tpo"; exit 1; fi
-#	source='sa/ike_sa_id.c' object='ike_sa_id.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_id.o `test -f 'sa/ike_sa_id.c' || echo '$(srcdir)/'`sa/ike_sa_id.c
-
-ike_sa_id.obj: sa/ike_sa_id.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa_id.obj -MD -MP -MF "$(DEPDIR)/ike_sa_id.Tpo" -c -o ike_sa_id.obj `if test -f 'sa/ike_sa_id.c'; then $(CYGPATH_W) 'sa/ike_sa_id.c'; else $(CYGPATH_W) '$(srcdir)/sa/ike_sa_id.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_sa_id.Tpo" "$(DEPDIR)/ike_sa_id.Po"; else rm -f "$(DEPDIR)/ike_sa_id.Tpo"; exit 1; fi
-#	source='sa/ike_sa_id.c' object='ike_sa_id.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa_id.obj `if test -f 'sa/ike_sa_id.c'; then $(CYGPATH_W) 'sa/ike_sa_id.c'; else $(CYGPATH_W) '$(srcdir)/sa/ike_sa_id.c'; fi`
-
-authenticator.o: sa/authenticator.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT authenticator.o -MD -MP -MF "$(DEPDIR)/authenticator.Tpo" -c -o authenticator.o `test -f 'sa/authenticator.c' || echo '$(srcdir)/'`sa/authenticator.c; \
-	then mv -f "$(DEPDIR)/authenticator.Tpo" "$(DEPDIR)/authenticator.Po"; else rm -f "$(DEPDIR)/authenticator.Tpo"; exit 1; fi
-#	source='sa/authenticator.c' object='authenticator.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o authenticator.o `test -f 'sa/authenticator.c' || echo '$(srcdir)/'`sa/authenticator.c
-
-authenticator.obj: sa/authenticator.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT authenticator.obj -MD -MP -MF "$(DEPDIR)/authenticator.Tpo" -c -o authenticator.obj `if test -f 'sa/authenticator.c'; then $(CYGPATH_W) 'sa/authenticator.c'; else $(CYGPATH_W) '$(srcdir)/sa/authenticator.c'; fi`; \
-	then mv -f "$(DEPDIR)/authenticator.Tpo" "$(DEPDIR)/authenticator.Po"; else rm -f "$(DEPDIR)/authenticator.Tpo"; exit 1; fi
-#	source='sa/authenticator.c' object='authenticator.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o authenticator.obj `if test -f 'sa/authenticator.c'; then $(CYGPATH_W) 'sa/authenticator.c'; else $(CYGPATH_W) '$(srcdir)/sa/authenticator.c'; fi`
-
-ike_sa.o: sa/ike_sa.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa.o -MD -MP -MF "$(DEPDIR)/ike_sa.Tpo" -c -o ike_sa.o `test -f 'sa/ike_sa.c' || echo '$(srcdir)/'`sa/ike_sa.c; \
-	then mv -f "$(DEPDIR)/ike_sa.Tpo" "$(DEPDIR)/ike_sa.Po"; else rm -f "$(DEPDIR)/ike_sa.Tpo"; exit 1; fi
-#	source='sa/ike_sa.c' object='ike_sa.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa.o `test -f 'sa/ike_sa.c' || echo '$(srcdir)/'`sa/ike_sa.c
-
-ike_sa.obj: sa/ike_sa.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_sa.obj -MD -MP -MF "$(DEPDIR)/ike_sa.Tpo" -c -o ike_sa.obj `if test -f 'sa/ike_sa.c'; then $(CYGPATH_W) 'sa/ike_sa.c'; else $(CYGPATH_W) '$(srcdir)/sa/ike_sa.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_sa.Tpo" "$(DEPDIR)/ike_sa.Po"; else rm -f "$(DEPDIR)/ike_sa.Tpo"; exit 1; fi
-#	source='sa/ike_sa.c' object='ike_sa.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_sa.obj `if test -f 'sa/ike_sa.c'; then $(CYGPATH_W) 'sa/ike_sa.c'; else $(CYGPATH_W) '$(srcdir)/sa/ike_sa.c'; fi`
-
-encryption_payload.o: encoding/payloads/encryption_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encryption_payload.o -MD -MP -MF "$(DEPDIR)/encryption_payload.Tpo" -c -o encryption_payload.o `test -f 'encoding/payloads/encryption_payload.c' || echo '$(srcdir)/'`encoding/payloads/encryption_payload.c; \
-	then mv -f "$(DEPDIR)/encryption_payload.Tpo" "$(DEPDIR)/encryption_payload.Po"; else rm -f "$(DEPDIR)/encryption_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/encryption_payload.c' object='encryption_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encryption_payload.o `test -f 'encoding/payloads/encryption_payload.c' || echo '$(srcdir)/'`encoding/payloads/encryption_payload.c
-
-encryption_payload.obj: encoding/payloads/encryption_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encryption_payload.obj -MD -MP -MF "$(DEPDIR)/encryption_payload.Tpo" -c -o encryption_payload.obj `if test -f 'encoding/payloads/encryption_payload.c'; then $(CYGPATH_W) 'encoding/payloads/encryption_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/encryption_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/encryption_payload.Tpo" "$(DEPDIR)/encryption_payload.Po"; else rm -f "$(DEPDIR)/encryption_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/encryption_payload.c' object='encryption_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encryption_payload.obj `if test -f 'encoding/payloads/encryption_payload.c'; then $(CYGPATH_W) 'encoding/payloads/encryption_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/encryption_payload.c'; fi`
-
-cert_payload.o: encoding/payloads/cert_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cert_payload.o -MD -MP -MF "$(DEPDIR)/cert_payload.Tpo" -c -o cert_payload.o `test -f 'encoding/payloads/cert_payload.c' || echo '$(srcdir)/'`encoding/payloads/cert_payload.c; \
-	then mv -f "$(DEPDIR)/cert_payload.Tpo" "$(DEPDIR)/cert_payload.Po"; else rm -f "$(DEPDIR)/cert_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/cert_payload.c' object='cert_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cert_payload.o `test -f 'encoding/payloads/cert_payload.c' || echo '$(srcdir)/'`encoding/payloads/cert_payload.c
-
-cert_payload.obj: encoding/payloads/cert_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cert_payload.obj -MD -MP -MF "$(DEPDIR)/cert_payload.Tpo" -c -o cert_payload.obj `if test -f 'encoding/payloads/cert_payload.c'; then $(CYGPATH_W) 'encoding/payloads/cert_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/cert_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/cert_payload.Tpo" "$(DEPDIR)/cert_payload.Po"; else rm -f "$(DEPDIR)/cert_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/cert_payload.c' object='cert_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cert_payload.obj `if test -f 'encoding/payloads/cert_payload.c'; then $(CYGPATH_W) 'encoding/payloads/cert_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/cert_payload.c'; fi`
-
-traffic_selector_substructure.o: encoding/payloads/traffic_selector_substructure.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT traffic_selector_substructure.o -MD -MP -MF "$(DEPDIR)/traffic_selector_substructure.Tpo" -c -o traffic_selector_substructure.o `test -f 'encoding/payloads/traffic_selector_substructure.c' || echo '$(srcdir)/'`encoding/payloads/traffic_selector_substructure.c; \
-	then mv -f "$(DEPDIR)/traffic_selector_substructure.Tpo" "$(DEPDIR)/traffic_selector_substructure.Po"; else rm -f "$(DEPDIR)/traffic_selector_substructure.Tpo"; exit 1; fi
-#	source='encoding/payloads/traffic_selector_substructure.c' object='traffic_selector_substructure.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o traffic_selector_substructure.o `test -f 'encoding/payloads/traffic_selector_substructure.c' || echo '$(srcdir)/'`encoding/payloads/traffic_selector_substructure.c
-
-traffic_selector_substructure.obj: encoding/payloads/traffic_selector_substructure.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT traffic_selector_substructure.obj -MD -MP -MF "$(DEPDIR)/traffic_selector_substructure.Tpo" -c -o traffic_selector_substructure.obj `if test -f 'encoding/payloads/traffic_selector_substructure.c'; then $(CYGPATH_W) 'encoding/payloads/traffic_selector_substructure.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/traffic_selector_substructure.c'; fi`; \
-	then mv -f "$(DEPDIR)/traffic_selector_substructure.Tpo" "$(DEPDIR)/traffic_selector_substructure.Po"; else rm -f "$(DEPDIR)/traffic_selector_substructure.Tpo"; exit 1; fi
-#	source='encoding/payloads/traffic_selector_substructure.c' object='traffic_selector_substructure.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o traffic_selector_substructure.obj `if test -f 'encoding/payloads/traffic_selector_substructure.c'; then $(CYGPATH_W) 'encoding/payloads/traffic_selector_substructure.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/traffic_selector_substructure.c'; fi`
-
-transform_attribute.o: encoding/payloads/transform_attribute.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT transform_attribute.o -MD -MP -MF "$(DEPDIR)/transform_attribute.Tpo" -c -o transform_attribute.o `test -f 'encoding/payloads/transform_attribute.c' || echo '$(srcdir)/'`encoding/payloads/transform_attribute.c; \
-	then mv -f "$(DEPDIR)/transform_attribute.Tpo" "$(DEPDIR)/transform_attribute.Po"; else rm -f "$(DEPDIR)/transform_attribute.Tpo"; exit 1; fi
-#	source='encoding/payloads/transform_attribute.c' object='transform_attribute.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transform_attribute.o `test -f 'encoding/payloads/transform_attribute.c' || echo '$(srcdir)/'`encoding/payloads/transform_attribute.c
-
-transform_attribute.obj: encoding/payloads/transform_attribute.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT transform_attribute.obj -MD -MP -MF "$(DEPDIR)/transform_attribute.Tpo" -c -o transform_attribute.obj `if test -f 'encoding/payloads/transform_attribute.c'; then $(CYGPATH_W) 'encoding/payloads/transform_attribute.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/transform_attribute.c'; fi`; \
-	then mv -f "$(DEPDIR)/transform_attribute.Tpo" "$(DEPDIR)/transform_attribute.Po"; else rm -f "$(DEPDIR)/transform_attribute.Tpo"; exit 1; fi
-#	source='encoding/payloads/transform_attribute.c' object='transform_attribute.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transform_attribute.obj `if test -f 'encoding/payloads/transform_attribute.c'; then $(CYGPATH_W) 'encoding/payloads/transform_attribute.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/transform_attribute.c'; fi`
-
-configuration_attribute.o: encoding/payloads/configuration_attribute.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT configuration_attribute.o -MD -MP -MF "$(DEPDIR)/configuration_attribute.Tpo" -c -o configuration_attribute.o `test -f 'encoding/payloads/configuration_attribute.c' || echo '$(srcdir)/'`encoding/payloads/configuration_attribute.c; \
-	then mv -f "$(DEPDIR)/configuration_attribute.Tpo" "$(DEPDIR)/configuration_attribute.Po"; else rm -f "$(DEPDIR)/configuration_attribute.Tpo"; exit 1; fi
-#	source='encoding/payloads/configuration_attribute.c' object='configuration_attribute.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o configuration_attribute.o `test -f 'encoding/payloads/configuration_attribute.c' || echo '$(srcdir)/'`encoding/payloads/configuration_attribute.c
-
-configuration_attribute.obj: encoding/payloads/configuration_attribute.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT configuration_attribute.obj -MD -MP -MF "$(DEPDIR)/configuration_attribute.Tpo" -c -o configuration_attribute.obj `if test -f 'encoding/payloads/configuration_attribute.c'; then $(CYGPATH_W) 'encoding/payloads/configuration_attribute.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/configuration_attribute.c'; fi`; \
-	then mv -f "$(DEPDIR)/configuration_attribute.Tpo" "$(DEPDIR)/configuration_attribute.Po"; else rm -f "$(DEPDIR)/configuration_attribute.Tpo"; exit 1; fi
-#	source='encoding/payloads/configuration_attribute.c' object='configuration_attribute.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o configuration_attribute.obj `if test -f 'encoding/payloads/configuration_attribute.c'; then $(CYGPATH_W) 'encoding/payloads/configuration_attribute.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/configuration_attribute.c'; fi`
-
-transform_substructure.o: encoding/payloads/transform_substructure.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT transform_substructure.o -MD -MP -MF "$(DEPDIR)/transform_substructure.Tpo" -c -o transform_substructure.o `test -f 'encoding/payloads/transform_substructure.c' || echo '$(srcdir)/'`encoding/payloads/transform_substructure.c; \
-	then mv -f "$(DEPDIR)/transform_substructure.Tpo" "$(DEPDIR)/transform_substructure.Po"; else rm -f "$(DEPDIR)/transform_substructure.Tpo"; exit 1; fi
-#	source='encoding/payloads/transform_substructure.c' object='transform_substructure.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transform_substructure.o `test -f 'encoding/payloads/transform_substructure.c' || echo '$(srcdir)/'`encoding/payloads/transform_substructure.c
-
-transform_substructure.obj: encoding/payloads/transform_substructure.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT transform_substructure.obj -MD -MP -MF "$(DEPDIR)/transform_substructure.Tpo" -c -o transform_substructure.obj `if test -f 'encoding/payloads/transform_substructure.c'; then $(CYGPATH_W) 'encoding/payloads/transform_substructure.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/transform_substructure.c'; fi`; \
-	then mv -f "$(DEPDIR)/transform_substructure.Tpo" "$(DEPDIR)/transform_substructure.Po"; else rm -f "$(DEPDIR)/transform_substructure.Tpo"; exit 1; fi
-#	source='encoding/payloads/transform_substructure.c' object='transform_substructure.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o transform_substructure.obj `if test -f 'encoding/payloads/transform_substructure.c'; then $(CYGPATH_W) 'encoding/payloads/transform_substructure.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/transform_substructure.c'; fi`
-
-auth_payload.o: encoding/payloads/auth_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT auth_payload.o -MD -MP -MF "$(DEPDIR)/auth_payload.Tpo" -c -o auth_payload.o `test -f 'encoding/payloads/auth_payload.c' || echo '$(srcdir)/'`encoding/payloads/auth_payload.c; \
-	then mv -f "$(DEPDIR)/auth_payload.Tpo" "$(DEPDIR)/auth_payload.Po"; else rm -f "$(DEPDIR)/auth_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/auth_payload.c' object='auth_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o auth_payload.o `test -f 'encoding/payloads/auth_payload.c' || echo '$(srcdir)/'`encoding/payloads/auth_payload.c
-
-auth_payload.obj: encoding/payloads/auth_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT auth_payload.obj -MD -MP -MF "$(DEPDIR)/auth_payload.Tpo" -c -o auth_payload.obj `if test -f 'encoding/payloads/auth_payload.c'; then $(CYGPATH_W) 'encoding/payloads/auth_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/auth_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/auth_payload.Tpo" "$(DEPDIR)/auth_payload.Po"; else rm -f "$(DEPDIR)/auth_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/auth_payload.c' object='auth_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o auth_payload.obj `if test -f 'encoding/payloads/auth_payload.c'; then $(CYGPATH_W) 'encoding/payloads/auth_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/auth_payload.c'; fi`
-
-ike_header.o: encoding/payloads/ike_header.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_header.o -MD -MP -MF "$(DEPDIR)/ike_header.Tpo" -c -o ike_header.o `test -f 'encoding/payloads/ike_header.c' || echo '$(srcdir)/'`encoding/payloads/ike_header.c; \
-	then mv -f "$(DEPDIR)/ike_header.Tpo" "$(DEPDIR)/ike_header.Po"; else rm -f "$(DEPDIR)/ike_header.Tpo"; exit 1; fi
-#	source='encoding/payloads/ike_header.c' object='ike_header.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_header.o `test -f 'encoding/payloads/ike_header.c' || echo '$(srcdir)/'`encoding/payloads/ike_header.c
-
-ike_header.obj: encoding/payloads/ike_header.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ike_header.obj -MD -MP -MF "$(DEPDIR)/ike_header.Tpo" -c -o ike_header.obj `if test -f 'encoding/payloads/ike_header.c'; then $(CYGPATH_W) 'encoding/payloads/ike_header.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/ike_header.c'; fi`; \
-	then mv -f "$(DEPDIR)/ike_header.Tpo" "$(DEPDIR)/ike_header.Po"; else rm -f "$(DEPDIR)/ike_header.Tpo"; exit 1; fi
-#	source='encoding/payloads/ike_header.c' object='ike_header.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ike_header.obj `if test -f 'encoding/payloads/ike_header.c'; then $(CYGPATH_W) 'encoding/payloads/ike_header.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/ike_header.c'; fi`
-
-nonce_payload.o: encoding/payloads/nonce_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nonce_payload.o -MD -MP -MF "$(DEPDIR)/nonce_payload.Tpo" -c -o nonce_payload.o `test -f 'encoding/payloads/nonce_payload.c' || echo '$(srcdir)/'`encoding/payloads/nonce_payload.c; \
-	then mv -f "$(DEPDIR)/nonce_payload.Tpo" "$(DEPDIR)/nonce_payload.Po"; else rm -f "$(DEPDIR)/nonce_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/nonce_payload.c' object='nonce_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nonce_payload.o `test -f 'encoding/payloads/nonce_payload.c' || echo '$(srcdir)/'`encoding/payloads/nonce_payload.c
-
-nonce_payload.obj: encoding/payloads/nonce_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nonce_payload.obj -MD -MP -MF "$(DEPDIR)/nonce_payload.Tpo" -c -o nonce_payload.obj `if test -f 'encoding/payloads/nonce_payload.c'; then $(CYGPATH_W) 'encoding/payloads/nonce_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/nonce_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/nonce_payload.Tpo" "$(DEPDIR)/nonce_payload.Po"; else rm -f "$(DEPDIR)/nonce_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/nonce_payload.c' object='nonce_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nonce_payload.obj `if test -f 'encoding/payloads/nonce_payload.c'; then $(CYGPATH_W) 'encoding/payloads/nonce_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/nonce_payload.c'; fi`
-
-eap_payload.o: encoding/payloads/eap_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eap_payload.o -MD -MP -MF "$(DEPDIR)/eap_payload.Tpo" -c -o eap_payload.o `test -f 'encoding/payloads/eap_payload.c' || echo '$(srcdir)/'`encoding/payloads/eap_payload.c; \
-	then mv -f "$(DEPDIR)/eap_payload.Tpo" "$(DEPDIR)/eap_payload.Po"; else rm -f "$(DEPDIR)/eap_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/eap_payload.c' object='eap_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eap_payload.o `test -f 'encoding/payloads/eap_payload.c' || echo '$(srcdir)/'`encoding/payloads/eap_payload.c
-
-eap_payload.obj: encoding/payloads/eap_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eap_payload.obj -MD -MP -MF "$(DEPDIR)/eap_payload.Tpo" -c -o eap_payload.obj `if test -f 'encoding/payloads/eap_payload.c'; then $(CYGPATH_W) 'encoding/payloads/eap_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/eap_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/eap_payload.Tpo" "$(DEPDIR)/eap_payload.Po"; else rm -f "$(DEPDIR)/eap_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/eap_payload.c' object='eap_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eap_payload.obj `if test -f 'encoding/payloads/eap_payload.c'; then $(CYGPATH_W) 'encoding/payloads/eap_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/eap_payload.c'; fi`
-
-ts_payload.o: encoding/payloads/ts_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ts_payload.o -MD -MP -MF "$(DEPDIR)/ts_payload.Tpo" -c -o ts_payload.o `test -f 'encoding/payloads/ts_payload.c' || echo '$(srcdir)/'`encoding/payloads/ts_payload.c; \
-	then mv -f "$(DEPDIR)/ts_payload.Tpo" "$(DEPDIR)/ts_payload.Po"; else rm -f "$(DEPDIR)/ts_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/ts_payload.c' object='ts_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ts_payload.o `test -f 'encoding/payloads/ts_payload.c' || echo '$(srcdir)/'`encoding/payloads/ts_payload.c
-
-ts_payload.obj: encoding/payloads/ts_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ts_payload.obj -MD -MP -MF "$(DEPDIR)/ts_payload.Tpo" -c -o ts_payload.obj `if test -f 'encoding/payloads/ts_payload.c'; then $(CYGPATH_W) 'encoding/payloads/ts_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/ts_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/ts_payload.Tpo" "$(DEPDIR)/ts_payload.Po"; else rm -f "$(DEPDIR)/ts_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/ts_payload.c' object='ts_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ts_payload.obj `if test -f 'encoding/payloads/ts_payload.c'; then $(CYGPATH_W) 'encoding/payloads/ts_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/ts_payload.c'; fi`
-
-notify_payload.o: encoding/payloads/notify_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT notify_payload.o -MD -MP -MF "$(DEPDIR)/notify_payload.Tpo" -c -o notify_payload.o `test -f 'encoding/payloads/notify_payload.c' || echo '$(srcdir)/'`encoding/payloads/notify_payload.c; \
-	then mv -f "$(DEPDIR)/notify_payload.Tpo" "$(DEPDIR)/notify_payload.Po"; else rm -f "$(DEPDIR)/notify_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/notify_payload.c' object='notify_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o notify_payload.o `test -f 'encoding/payloads/notify_payload.c' || echo '$(srcdir)/'`encoding/payloads/notify_payload.c
-
-notify_payload.obj: encoding/payloads/notify_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT notify_payload.obj -MD -MP -MF "$(DEPDIR)/notify_payload.Tpo" -c -o notify_payload.obj `if test -f 'encoding/payloads/notify_payload.c'; then $(CYGPATH_W) 'encoding/payloads/notify_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/notify_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/notify_payload.Tpo" "$(DEPDIR)/notify_payload.Po"; else rm -f "$(DEPDIR)/notify_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/notify_payload.c' object='notify_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o notify_payload.obj `if test -f 'encoding/payloads/notify_payload.c'; then $(CYGPATH_W) 'encoding/payloads/notify_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/notify_payload.c'; fi`
-
-id_payload.o: encoding/payloads/id_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT id_payload.o -MD -MP -MF "$(DEPDIR)/id_payload.Tpo" -c -o id_payload.o `test -f 'encoding/payloads/id_payload.c' || echo '$(srcdir)/'`encoding/payloads/id_payload.c; \
-	then mv -f "$(DEPDIR)/id_payload.Tpo" "$(DEPDIR)/id_payload.Po"; else rm -f "$(DEPDIR)/id_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/id_payload.c' object='id_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o id_payload.o `test -f 'encoding/payloads/id_payload.c' || echo '$(srcdir)/'`encoding/payloads/id_payload.c
-
-id_payload.obj: encoding/payloads/id_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT id_payload.obj -MD -MP -MF "$(DEPDIR)/id_payload.Tpo" -c -o id_payload.obj `if test -f 'encoding/payloads/id_payload.c'; then $(CYGPATH_W) 'encoding/payloads/id_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/id_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/id_payload.Tpo" "$(DEPDIR)/id_payload.Po"; else rm -f "$(DEPDIR)/id_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/id_payload.c' object='id_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o id_payload.obj `if test -f 'encoding/payloads/id_payload.c'; then $(CYGPATH_W) 'encoding/payloads/id_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/id_payload.c'; fi`
-
-ke_payload.o: encoding/payloads/ke_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ke_payload.o -MD -MP -MF "$(DEPDIR)/ke_payload.Tpo" -c -o ke_payload.o `test -f 'encoding/payloads/ke_payload.c' || echo '$(srcdir)/'`encoding/payloads/ke_payload.c; \
-	then mv -f "$(DEPDIR)/ke_payload.Tpo" "$(DEPDIR)/ke_payload.Po"; else rm -f "$(DEPDIR)/ke_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/ke_payload.c' object='ke_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ke_payload.o `test -f 'encoding/payloads/ke_payload.c' || echo '$(srcdir)/'`encoding/payloads/ke_payload.c
-
-ke_payload.obj: encoding/payloads/ke_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ke_payload.obj -MD -MP -MF "$(DEPDIR)/ke_payload.Tpo" -c -o ke_payload.obj `if test -f 'encoding/payloads/ke_payload.c'; then $(CYGPATH_W) 'encoding/payloads/ke_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/ke_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/ke_payload.Tpo" "$(DEPDIR)/ke_payload.Po"; else rm -f "$(DEPDIR)/ke_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/ke_payload.c' object='ke_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ke_payload.obj `if test -f 'encoding/payloads/ke_payload.c'; then $(CYGPATH_W) 'encoding/payloads/ke_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/ke_payload.c'; fi`
-
-unknown_payload.o: encoding/payloads/unknown_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unknown_payload.o -MD -MP -MF "$(DEPDIR)/unknown_payload.Tpo" -c -o unknown_payload.o `test -f 'encoding/payloads/unknown_payload.c' || echo '$(srcdir)/'`encoding/payloads/unknown_payload.c; \
-	then mv -f "$(DEPDIR)/unknown_payload.Tpo" "$(DEPDIR)/unknown_payload.Po"; else rm -f "$(DEPDIR)/unknown_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/unknown_payload.c' object='unknown_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unknown_payload.o `test -f 'encoding/payloads/unknown_payload.c' || echo '$(srcdir)/'`encoding/payloads/unknown_payload.c
-
-unknown_payload.obj: encoding/payloads/unknown_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unknown_payload.obj -MD -MP -MF "$(DEPDIR)/unknown_payload.Tpo" -c -o unknown_payload.obj `if test -f 'encoding/payloads/unknown_payload.c'; then $(CYGPATH_W) 'encoding/payloads/unknown_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/unknown_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/unknown_payload.Tpo" "$(DEPDIR)/unknown_payload.Po"; else rm -f "$(DEPDIR)/unknown_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/unknown_payload.c' object='unknown_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unknown_payload.obj `if test -f 'encoding/payloads/unknown_payload.c'; then $(CYGPATH_W) 'encoding/payloads/unknown_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/unknown_payload.c'; fi`
-
-encodings.o: encoding/payloads/encodings.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encodings.o -MD -MP -MF "$(DEPDIR)/encodings.Tpo" -c -o encodings.o `test -f 'encoding/payloads/encodings.c' || echo '$(srcdir)/'`encoding/payloads/encodings.c; \
-	then mv -f "$(DEPDIR)/encodings.Tpo" "$(DEPDIR)/encodings.Po"; else rm -f "$(DEPDIR)/encodings.Tpo"; exit 1; fi
-#	source='encoding/payloads/encodings.c' object='encodings.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encodings.o `test -f 'encoding/payloads/encodings.c' || echo '$(srcdir)/'`encoding/payloads/encodings.c
-
-encodings.obj: encoding/payloads/encodings.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT encodings.obj -MD -MP -MF "$(DEPDIR)/encodings.Tpo" -c -o encodings.obj `if test -f 'encoding/payloads/encodings.c'; then $(CYGPATH_W) 'encoding/payloads/encodings.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/encodings.c'; fi`; \
-	then mv -f "$(DEPDIR)/encodings.Tpo" "$(DEPDIR)/encodings.Po"; else rm -f "$(DEPDIR)/encodings.Tpo"; exit 1; fi
-#	source='encoding/payloads/encodings.c' object='encodings.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o encodings.obj `if test -f 'encoding/payloads/encodings.c'; then $(CYGPATH_W) 'encoding/payloads/encodings.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/encodings.c'; fi`
-
-cp_payload.o: encoding/payloads/cp_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cp_payload.o -MD -MP -MF "$(DEPDIR)/cp_payload.Tpo" -c -o cp_payload.o `test -f 'encoding/payloads/cp_payload.c' || echo '$(srcdir)/'`encoding/payloads/cp_payload.c; \
-	then mv -f "$(DEPDIR)/cp_payload.Tpo" "$(DEPDIR)/cp_payload.Po"; else rm -f "$(DEPDIR)/cp_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/cp_payload.c' object='cp_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cp_payload.o `test -f 'encoding/payloads/cp_payload.c' || echo '$(srcdir)/'`encoding/payloads/cp_payload.c
-
-cp_payload.obj: encoding/payloads/cp_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cp_payload.obj -MD -MP -MF "$(DEPDIR)/cp_payload.Tpo" -c -o cp_payload.obj `if test -f 'encoding/payloads/cp_payload.c'; then $(CYGPATH_W) 'encoding/payloads/cp_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/cp_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/cp_payload.Tpo" "$(DEPDIR)/cp_payload.Po"; else rm -f "$(DEPDIR)/cp_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/cp_payload.c' object='cp_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cp_payload.obj `if test -f 'encoding/payloads/cp_payload.c'; then $(CYGPATH_W) 'encoding/payloads/cp_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/cp_payload.c'; fi`
-
-delete_payload.o: encoding/payloads/delete_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete_payload.o -MD -MP -MF "$(DEPDIR)/delete_payload.Tpo" -c -o delete_payload.o `test -f 'encoding/payloads/delete_payload.c' || echo '$(srcdir)/'`encoding/payloads/delete_payload.c; \
-	then mv -f "$(DEPDIR)/delete_payload.Tpo" "$(DEPDIR)/delete_payload.Po"; else rm -f "$(DEPDIR)/delete_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/delete_payload.c' object='delete_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete_payload.o `test -f 'encoding/payloads/delete_payload.c' || echo '$(srcdir)/'`encoding/payloads/delete_payload.c
-
-delete_payload.obj: encoding/payloads/delete_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete_payload.obj -MD -MP -MF "$(DEPDIR)/delete_payload.Tpo" -c -o delete_payload.obj `if test -f 'encoding/payloads/delete_payload.c'; then $(CYGPATH_W) 'encoding/payloads/delete_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/delete_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/delete_payload.Tpo" "$(DEPDIR)/delete_payload.Po"; else rm -f "$(DEPDIR)/delete_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/delete_payload.c' object='delete_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete_payload.obj `if test -f 'encoding/payloads/delete_payload.c'; then $(CYGPATH_W) 'encoding/payloads/delete_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/delete_payload.c'; fi`
-
-sa_payload.o: encoding/payloads/sa_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sa_payload.o -MD -MP -MF "$(DEPDIR)/sa_payload.Tpo" -c -o sa_payload.o `test -f 'encoding/payloads/sa_payload.c' || echo '$(srcdir)/'`encoding/payloads/sa_payload.c; \
-	then mv -f "$(DEPDIR)/sa_payload.Tpo" "$(DEPDIR)/sa_payload.Po"; else rm -f "$(DEPDIR)/sa_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/sa_payload.c' object='sa_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sa_payload.o `test -f 'encoding/payloads/sa_payload.c' || echo '$(srcdir)/'`encoding/payloads/sa_payload.c
-
-sa_payload.obj: encoding/payloads/sa_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sa_payload.obj -MD -MP -MF "$(DEPDIR)/sa_payload.Tpo" -c -o sa_payload.obj `if test -f 'encoding/payloads/sa_payload.c'; then $(CYGPATH_W) 'encoding/payloads/sa_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/sa_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/sa_payload.Tpo" "$(DEPDIR)/sa_payload.Po"; else rm -f "$(DEPDIR)/sa_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/sa_payload.c' object='sa_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sa_payload.obj `if test -f 'encoding/payloads/sa_payload.c'; then $(CYGPATH_W) 'encoding/payloads/sa_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/sa_payload.c'; fi`
-
-certreq_payload.o: encoding/payloads/certreq_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT certreq_payload.o -MD -MP -MF "$(DEPDIR)/certreq_payload.Tpo" -c -o certreq_payload.o `test -f 'encoding/payloads/certreq_payload.c' || echo '$(srcdir)/'`encoding/payloads/certreq_payload.c; \
-	then mv -f "$(DEPDIR)/certreq_payload.Tpo" "$(DEPDIR)/certreq_payload.Po"; else rm -f "$(DEPDIR)/certreq_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/certreq_payload.c' object='certreq_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o certreq_payload.o `test -f 'encoding/payloads/certreq_payload.c' || echo '$(srcdir)/'`encoding/payloads/certreq_payload.c
-
-certreq_payload.obj: encoding/payloads/certreq_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT certreq_payload.obj -MD -MP -MF "$(DEPDIR)/certreq_payload.Tpo" -c -o certreq_payload.obj `if test -f 'encoding/payloads/certreq_payload.c'; then $(CYGPATH_W) 'encoding/payloads/certreq_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/certreq_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/certreq_payload.Tpo" "$(DEPDIR)/certreq_payload.Po"; else rm -f "$(DEPDIR)/certreq_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/certreq_payload.c' object='certreq_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o certreq_payload.obj `if test -f 'encoding/payloads/certreq_payload.c'; then $(CYGPATH_W) 'encoding/payloads/certreq_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/certreq_payload.c'; fi`
-
-vendor_id_payload.o: encoding/payloads/vendor_id_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vendor_id_payload.o -MD -MP -MF "$(DEPDIR)/vendor_id_payload.Tpo" -c -o vendor_id_payload.o `test -f 'encoding/payloads/vendor_id_payload.c' || echo '$(srcdir)/'`encoding/payloads/vendor_id_payload.c; \
-	then mv -f "$(DEPDIR)/vendor_id_payload.Tpo" "$(DEPDIR)/vendor_id_payload.Po"; else rm -f "$(DEPDIR)/vendor_id_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/vendor_id_payload.c' object='vendor_id_payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vendor_id_payload.o `test -f 'encoding/payloads/vendor_id_payload.c' || echo '$(srcdir)/'`encoding/payloads/vendor_id_payload.c
-
-vendor_id_payload.obj: encoding/payloads/vendor_id_payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT vendor_id_payload.obj -MD -MP -MF "$(DEPDIR)/vendor_id_payload.Tpo" -c -o vendor_id_payload.obj `if test -f 'encoding/payloads/vendor_id_payload.c'; then $(CYGPATH_W) 'encoding/payloads/vendor_id_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/vendor_id_payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/vendor_id_payload.Tpo" "$(DEPDIR)/vendor_id_payload.Po"; else rm -f "$(DEPDIR)/vendor_id_payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/vendor_id_payload.c' object='vendor_id_payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o vendor_id_payload.obj `if test -f 'encoding/payloads/vendor_id_payload.c'; then $(CYGPATH_W) 'encoding/payloads/vendor_id_payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/vendor_id_payload.c'; fi`
-
-proposal_substructure.o: encoding/payloads/proposal_substructure.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proposal_substructure.o -MD -MP -MF "$(DEPDIR)/proposal_substructure.Tpo" -c -o proposal_substructure.o `test -f 'encoding/payloads/proposal_substructure.c' || echo '$(srcdir)/'`encoding/payloads/proposal_substructure.c; \
-	then mv -f "$(DEPDIR)/proposal_substructure.Tpo" "$(DEPDIR)/proposal_substructure.Po"; else rm -f "$(DEPDIR)/proposal_substructure.Tpo"; exit 1; fi
-#	source='encoding/payloads/proposal_substructure.c' object='proposal_substructure.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o proposal_substructure.o `test -f 'encoding/payloads/proposal_substructure.c' || echo '$(srcdir)/'`encoding/payloads/proposal_substructure.c
-
-proposal_substructure.obj: encoding/payloads/proposal_substructure.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proposal_substructure.obj -MD -MP -MF "$(DEPDIR)/proposal_substructure.Tpo" -c -o proposal_substructure.obj `if test -f 'encoding/payloads/proposal_substructure.c'; then $(CYGPATH_W) 'encoding/payloads/proposal_substructure.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/proposal_substructure.c'; fi`; \
-	then mv -f "$(DEPDIR)/proposal_substructure.Tpo" "$(DEPDIR)/proposal_substructure.Po"; else rm -f "$(DEPDIR)/proposal_substructure.Tpo"; exit 1; fi
-#	source='encoding/payloads/proposal_substructure.c' object='proposal_substructure.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o proposal_substructure.obj `if test -f 'encoding/payloads/proposal_substructure.c'; then $(CYGPATH_W) 'encoding/payloads/proposal_substructure.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/proposal_substructure.c'; fi`
-
-payload.o: encoding/payloads/payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT payload.o -MD -MP -MF "$(DEPDIR)/payload.Tpo" -c -o payload.o `test -f 'encoding/payloads/payload.c' || echo '$(srcdir)/'`encoding/payloads/payload.c; \
-	then mv -f "$(DEPDIR)/payload.Tpo" "$(DEPDIR)/payload.Po"; else rm -f "$(DEPDIR)/payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/payload.c' object='payload.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o payload.o `test -f 'encoding/payloads/payload.c' || echo '$(srcdir)/'`encoding/payloads/payload.c
-
-payload.obj: encoding/payloads/payload.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT payload.obj -MD -MP -MF "$(DEPDIR)/payload.Tpo" -c -o payload.obj `if test -f 'encoding/payloads/payload.c'; then $(CYGPATH_W) 'encoding/payloads/payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/payload.c'; fi`; \
-	then mv -f "$(DEPDIR)/payload.Tpo" "$(DEPDIR)/payload.Po"; else rm -f "$(DEPDIR)/payload.Tpo"; exit 1; fi
-#	source='encoding/payloads/payload.c' object='payload.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o payload.obj `if test -f 'encoding/payloads/payload.c'; then $(CYGPATH_W) 'encoding/payloads/payload.c'; else $(CYGPATH_W) '$(srcdir)/encoding/payloads/payload.c'; fi`
-
-message.o: encoding/message.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT message.o -MD -MP -MF "$(DEPDIR)/message.Tpo" -c -o message.o `test -f 'encoding/message.c' || echo '$(srcdir)/'`encoding/message.c; \
-	then mv -f "$(DEPDIR)/message.Tpo" "$(DEPDIR)/message.Po"; else rm -f "$(DEPDIR)/message.Tpo"; exit 1; fi
-#	source='encoding/message.c' object='message.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o message.o `test -f 'encoding/message.c' || echo '$(srcdir)/'`encoding/message.c
-
-message.obj: encoding/message.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT message.obj -MD -MP -MF "$(DEPDIR)/message.Tpo" -c -o message.obj `if test -f 'encoding/message.c'; then $(CYGPATH_W) 'encoding/message.c'; else $(CYGPATH_W) '$(srcdir)/encoding/message.c'; fi`; \
-	then mv -f "$(DEPDIR)/message.Tpo" "$(DEPDIR)/message.Po"; else rm -f "$(DEPDIR)/message.Tpo"; exit 1; fi
-#	source='encoding/message.c' object='message.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o message.obj `if test -f 'encoding/message.c'; then $(CYGPATH_W) 'encoding/message.c'; else $(CYGPATH_W) '$(srcdir)/encoding/message.c'; fi`
-
-generator.o: encoding/generator.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generator.o -MD -MP -MF "$(DEPDIR)/generator.Tpo" -c -o generator.o `test -f 'encoding/generator.c' || echo '$(srcdir)/'`encoding/generator.c; \
-	then mv -f "$(DEPDIR)/generator.Tpo" "$(DEPDIR)/generator.Po"; else rm -f "$(DEPDIR)/generator.Tpo"; exit 1; fi
-#	source='encoding/generator.c' object='generator.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generator.o `test -f 'encoding/generator.c' || echo '$(srcdir)/'`encoding/generator.c
-
-generator.obj: encoding/generator.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT generator.obj -MD -MP -MF "$(DEPDIR)/generator.Tpo" -c -o generator.obj `if test -f 'encoding/generator.c'; then $(CYGPATH_W) 'encoding/generator.c'; else $(CYGPATH_W) '$(srcdir)/encoding/generator.c'; fi`; \
-	then mv -f "$(DEPDIR)/generator.Tpo" "$(DEPDIR)/generator.Po"; else rm -f "$(DEPDIR)/generator.Tpo"; exit 1; fi
-#	source='encoding/generator.c' object='generator.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o generator.obj `if test -f 'encoding/generator.c'; then $(CYGPATH_W) 'encoding/generator.c'; else $(CYGPATH_W) '$(srcdir)/encoding/generator.c'; fi`
-
-parser.o: encoding/parser.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parser.o -MD -MP -MF "$(DEPDIR)/parser.Tpo" -c -o parser.o `test -f 'encoding/parser.c' || echo '$(srcdir)/'`encoding/parser.c; \
-	then mv -f "$(DEPDIR)/parser.Tpo" "$(DEPDIR)/parser.Po"; else rm -f "$(DEPDIR)/parser.Tpo"; exit 1; fi
-#	source='encoding/parser.c' object='parser.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parser.o `test -f 'encoding/parser.c' || echo '$(srcdir)/'`encoding/parser.c
-
-parser.obj: encoding/parser.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parser.obj -MD -MP -MF "$(DEPDIR)/parser.Tpo" -c -o parser.obj `if test -f 'encoding/parser.c'; then $(CYGPATH_W) 'encoding/parser.c'; else $(CYGPATH_W) '$(srcdir)/encoding/parser.c'; fi`; \
-	then mv -f "$(DEPDIR)/parser.Tpo" "$(DEPDIR)/parser.Po"; else rm -f "$(DEPDIR)/parser.Tpo"; exit 1; fi
-#	source='encoding/parser.c' object='parser.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parser.obj `if test -f 'encoding/parser.c'; then $(CYGPATH_W) 'encoding/parser.c'; else $(CYGPATH_W) '$(srcdir)/encoding/parser.c'; fi`
-
-packet.o: network/packet.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT packet.o -MD -MP -MF "$(DEPDIR)/packet.Tpo" -c -o packet.o `test -f 'network/packet.c' || echo '$(srcdir)/'`network/packet.c; \
-	then mv -f "$(DEPDIR)/packet.Tpo" "$(DEPDIR)/packet.Po"; else rm -f "$(DEPDIR)/packet.Tpo"; exit 1; fi
-#	source='network/packet.c' object='packet.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o packet.o `test -f 'network/packet.c' || echo '$(srcdir)/'`network/packet.c
-
-packet.obj: network/packet.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT packet.obj -MD -MP -MF "$(DEPDIR)/packet.Tpo" -c -o packet.obj `if test -f 'network/packet.c'; then $(CYGPATH_W) 'network/packet.c'; else $(CYGPATH_W) '$(srcdir)/network/packet.c'; fi`; \
-	then mv -f "$(DEPDIR)/packet.Tpo" "$(DEPDIR)/packet.Po"; else rm -f "$(DEPDIR)/packet.Tpo"; exit 1; fi
-#	source='network/packet.c' object='packet.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o packet.obj `if test -f 'network/packet.c'; then $(CYGPATH_W) 'network/packet.c'; else $(CYGPATH_W) '$(srcdir)/network/packet.c'; fi`
-
-socket.o: network/socket.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT socket.o -MD -MP -MF "$(DEPDIR)/socket.Tpo" -c -o socket.o `test -f 'network/socket.c' || echo '$(srcdir)/'`network/socket.c; \
-	then mv -f "$(DEPDIR)/socket.Tpo" "$(DEPDIR)/socket.Po"; else rm -f "$(DEPDIR)/socket.Tpo"; exit 1; fi
-#	source='network/socket.c' object='socket.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.o `test -f 'network/socket.c' || echo '$(srcdir)/'`network/socket.c
-
-socket.obj: network/socket.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT socket.obj -MD -MP -MF "$(DEPDIR)/socket.Tpo" -c -o socket.obj `if test -f 'network/socket.c'; then $(CYGPATH_W) 'network/socket.c'; else $(CYGPATH_W) '$(srcdir)/network/socket.c'; fi`; \
-	then mv -f "$(DEPDIR)/socket.Tpo" "$(DEPDIR)/socket.Po"; else rm -f "$(DEPDIR)/socket.Tpo"; exit 1; fi
-#	source='network/socket.c' object='socket.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.obj `if test -f 'network/socket.c'; then $(CYGPATH_W) 'network/socket.c'; else $(CYGPATH_W) '$(srcdir)/network/socket.c'; fi`
-
-job.o: queues/jobs/job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT job.o -MD -MP -MF "$(DEPDIR)/job.Tpo" -c -o job.o `test -f 'queues/jobs/job.c' || echo '$(srcdir)/'`queues/jobs/job.c; \
-	then mv -f "$(DEPDIR)/job.Tpo" "$(DEPDIR)/job.Po"; else rm -f "$(DEPDIR)/job.Tpo"; exit 1; fi
-#	source='queues/jobs/job.c' object='job.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o job.o `test -f 'queues/jobs/job.c' || echo '$(srcdir)/'`queues/jobs/job.c
-
-job.obj: queues/jobs/job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT job.obj -MD -MP -MF "$(DEPDIR)/job.Tpo" -c -o job.obj `if test -f 'queues/jobs/job.c'; then $(CYGPATH_W) 'queues/jobs/job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/job.c'; fi`; \
-	then mv -f "$(DEPDIR)/job.Tpo" "$(DEPDIR)/job.Po"; else rm -f "$(DEPDIR)/job.Tpo"; exit 1; fi
-#	source='queues/jobs/job.c' object='job.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o job.obj `if test -f 'queues/jobs/job.c'; then $(CYGPATH_W) 'queues/jobs/job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/job.c'; fi`
-
-delete_established_ike_sa_job.o: queues/jobs/delete_established_ike_sa_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete_established_ike_sa_job.o -MD -MP -MF "$(DEPDIR)/delete_established_ike_sa_job.Tpo" -c -o delete_established_ike_sa_job.o `test -f 'queues/jobs/delete_established_ike_sa_job.c' || echo '$(srcdir)/'`queues/jobs/delete_established_ike_sa_job.c; \
-	then mv -f "$(DEPDIR)/delete_established_ike_sa_job.Tpo" "$(DEPDIR)/delete_established_ike_sa_job.Po"; else rm -f "$(DEPDIR)/delete_established_ike_sa_job.Tpo"; exit 1; fi
-#	source='queues/jobs/delete_established_ike_sa_job.c' object='delete_established_ike_sa_job.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete_established_ike_sa_job.o `test -f 'queues/jobs/delete_established_ike_sa_job.c' || echo '$(srcdir)/'`queues/jobs/delete_established_ike_sa_job.c
-
-delete_established_ike_sa_job.obj: queues/jobs/delete_established_ike_sa_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete_established_ike_sa_job.obj -MD -MP -MF "$(DEPDIR)/delete_established_ike_sa_job.Tpo" -c -o delete_established_ike_sa_job.obj `if test -f 'queues/jobs/delete_established_ike_sa_job.c'; then $(CYGPATH_W) 'queues/jobs/delete_established_ike_sa_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/delete_established_ike_sa_job.c'; fi`; \
-	then mv -f "$(DEPDIR)/delete_established_ike_sa_job.Tpo" "$(DEPDIR)/delete_established_ike_sa_job.Po"; else rm -f "$(DEPDIR)/delete_established_ike_sa_job.Tpo"; exit 1; fi
-#	source='queues/jobs/delete_established_ike_sa_job.c' object='delete_established_ike_sa_job.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete_established_ike_sa_job.obj `if test -f 'queues/jobs/delete_established_ike_sa_job.c'; then $(CYGPATH_W) 'queues/jobs/delete_established_ike_sa_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/delete_established_ike_sa_job.c'; fi`
-
-incoming_packet_job.o: queues/jobs/incoming_packet_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT incoming_packet_job.o -MD -MP -MF "$(DEPDIR)/incoming_packet_job.Tpo" -c -o incoming_packet_job.o `test -f 'queues/jobs/incoming_packet_job.c' || echo '$(srcdir)/'`queues/jobs/incoming_packet_job.c; \
-	then mv -f "$(DEPDIR)/incoming_packet_job.Tpo" "$(DEPDIR)/incoming_packet_job.Po"; else rm -f "$(DEPDIR)/incoming_packet_job.Tpo"; exit 1; fi
-#	source='queues/jobs/incoming_packet_job.c' object='incoming_packet_job.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o incoming_packet_job.o `test -f 'queues/jobs/incoming_packet_job.c' || echo '$(srcdir)/'`queues/jobs/incoming_packet_job.c
-
-incoming_packet_job.obj: queues/jobs/incoming_packet_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT incoming_packet_job.obj -MD -MP -MF "$(DEPDIR)/incoming_packet_job.Tpo" -c -o incoming_packet_job.obj `if test -f 'queues/jobs/incoming_packet_job.c'; then $(CYGPATH_W) 'queues/jobs/incoming_packet_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/incoming_packet_job.c'; fi`; \
-	then mv -f "$(DEPDIR)/incoming_packet_job.Tpo" "$(DEPDIR)/incoming_packet_job.Po"; else rm -f "$(DEPDIR)/incoming_packet_job.Tpo"; exit 1; fi
-#	source='queues/jobs/incoming_packet_job.c' object='incoming_packet_job.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o incoming_packet_job.obj `if test -f 'queues/jobs/incoming_packet_job.c'; then $(CYGPATH_W) 'queues/jobs/incoming_packet_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/incoming_packet_job.c'; fi`
-
-delete_half_open_ike_sa_job.o: queues/jobs/delete_half_open_ike_sa_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete_half_open_ike_sa_job.o -MD -MP -MF "$(DEPDIR)/delete_half_open_ike_sa_job.Tpo" -c -o delete_half_open_ike_sa_job.o `test -f 'queues/jobs/delete_half_open_ike_sa_job.c' || echo '$(srcdir)/'`queues/jobs/delete_half_open_ike_sa_job.c; \
-	then mv -f "$(DEPDIR)/delete_half_open_ike_sa_job.Tpo" "$(DEPDIR)/delete_half_open_ike_sa_job.Po"; else rm -f "$(DEPDIR)/delete_half_open_ike_sa_job.Tpo"; exit 1; fi
-#	source='queues/jobs/delete_half_open_ike_sa_job.c' object='delete_half_open_ike_sa_job.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete_half_open_ike_sa_job.o `test -f 'queues/jobs/delete_half_open_ike_sa_job.c' || echo '$(srcdir)/'`queues/jobs/delete_half_open_ike_sa_job.c
-
-delete_half_open_ike_sa_job.obj: queues/jobs/delete_half_open_ike_sa_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delete_half_open_ike_sa_job.obj -MD -MP -MF "$(DEPDIR)/delete_half_open_ike_sa_job.Tpo" -c -o delete_half_open_ike_sa_job.obj `if test -f 'queues/jobs/delete_half_open_ike_sa_job.c'; then $(CYGPATH_W) 'queues/jobs/delete_half_open_ike_sa_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/delete_half_open_ike_sa_job.c'; fi`; \
-	then mv -f "$(DEPDIR)/delete_half_open_ike_sa_job.Tpo" "$(DEPDIR)/delete_half_open_ike_sa_job.Po"; else rm -f "$(DEPDIR)/delete_half_open_ike_sa_job.Tpo"; exit 1; fi
-#	source='queues/jobs/delete_half_open_ike_sa_job.c' object='delete_half_open_ike_sa_job.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delete_half_open_ike_sa_job.obj `if test -f 'queues/jobs/delete_half_open_ike_sa_job.c'; then $(CYGPATH_W) 'queues/jobs/delete_half_open_ike_sa_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/delete_half_open_ike_sa_job.c'; fi`
-
-retransmit_request_job.o: queues/jobs/retransmit_request_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT retransmit_request_job.o -MD -MP -MF "$(DEPDIR)/retransmit_request_job.Tpo" -c -o retransmit_request_job.o `test -f 'queues/jobs/retransmit_request_job.c' || echo '$(srcdir)/'`queues/jobs/retransmit_request_job.c; \
-	then mv -f "$(DEPDIR)/retransmit_request_job.Tpo" "$(DEPDIR)/retransmit_request_job.Po"; else rm -f "$(DEPDIR)/retransmit_request_job.Tpo"; exit 1; fi
-#	source='queues/jobs/retransmit_request_job.c' object='retransmit_request_job.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o retransmit_request_job.o `test -f 'queues/jobs/retransmit_request_job.c' || echo '$(srcdir)/'`queues/jobs/retransmit_request_job.c
-
-retransmit_request_job.obj: queues/jobs/retransmit_request_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT retransmit_request_job.obj -MD -MP -MF "$(DEPDIR)/retransmit_request_job.Tpo" -c -o retransmit_request_job.obj `if test -f 'queues/jobs/retransmit_request_job.c'; then $(CYGPATH_W) 'queues/jobs/retransmit_request_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/retransmit_request_job.c'; fi`; \
-	then mv -f "$(DEPDIR)/retransmit_request_job.Tpo" "$(DEPDIR)/retransmit_request_job.Po"; else rm -f "$(DEPDIR)/retransmit_request_job.Tpo"; exit 1; fi
-#	source='queues/jobs/retransmit_request_job.c' object='retransmit_request_job.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o retransmit_request_job.obj `if test -f 'queues/jobs/retransmit_request_job.c'; then $(CYGPATH_W) 'queues/jobs/retransmit_request_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/retransmit_request_job.c'; fi`
-
-initiate_ike_sa_job.o: queues/jobs/initiate_ike_sa_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initiate_ike_sa_job.o -MD -MP -MF "$(DEPDIR)/initiate_ike_sa_job.Tpo" -c -o initiate_ike_sa_job.o `test -f 'queues/jobs/initiate_ike_sa_job.c' || echo '$(srcdir)/'`queues/jobs/initiate_ike_sa_job.c; \
-	then mv -f "$(DEPDIR)/initiate_ike_sa_job.Tpo" "$(DEPDIR)/initiate_ike_sa_job.Po"; else rm -f "$(DEPDIR)/initiate_ike_sa_job.Tpo"; exit 1; fi
-#	source='queues/jobs/initiate_ike_sa_job.c' object='initiate_ike_sa_job.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initiate_ike_sa_job.o `test -f 'queues/jobs/initiate_ike_sa_job.c' || echo '$(srcdir)/'`queues/jobs/initiate_ike_sa_job.c
-
-initiate_ike_sa_job.obj: queues/jobs/initiate_ike_sa_job.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT initiate_ike_sa_job.obj -MD -MP -MF "$(DEPDIR)/initiate_ike_sa_job.Tpo" -c -o initiate_ike_sa_job.obj `if test -f 'queues/jobs/initiate_ike_sa_job.c'; then $(CYGPATH_W) 'queues/jobs/initiate_ike_sa_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/initiate_ike_sa_job.c'; fi`; \
-	then mv -f "$(DEPDIR)/initiate_ike_sa_job.Tpo" "$(DEPDIR)/initiate_ike_sa_job.Po"; else rm -f "$(DEPDIR)/initiate_ike_sa_job.Tpo"; exit 1; fi
-#	source='queues/jobs/initiate_ike_sa_job.c' object='initiate_ike_sa_job.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o initiate_ike_sa_job.obj `if test -f 'queues/jobs/initiate_ike_sa_job.c'; then $(CYGPATH_W) 'queues/jobs/initiate_ike_sa_job.c'; else $(CYGPATH_W) '$(srcdir)/queues/jobs/initiate_ike_sa_job.c'; fi`
-
-job_queue.o: queues/job_queue.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT job_queue.o -MD -MP -MF "$(DEPDIR)/job_queue.Tpo" -c -o job_queue.o `test -f 'queues/job_queue.c' || echo '$(srcdir)/'`queues/job_queue.c; \
-	then mv -f "$(DEPDIR)/job_queue.Tpo" "$(DEPDIR)/job_queue.Po"; else rm -f "$(DEPDIR)/job_queue.Tpo"; exit 1; fi
-#	source='queues/job_queue.c' object='job_queue.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o job_queue.o `test -f 'queues/job_queue.c' || echo '$(srcdir)/'`queues/job_queue.c
-
-job_queue.obj: queues/job_queue.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT job_queue.obj -MD -MP -MF "$(DEPDIR)/job_queue.Tpo" -c -o job_queue.obj `if test -f 'queues/job_queue.c'; then $(CYGPATH_W) 'queues/job_queue.c'; else $(CYGPATH_W) '$(srcdir)/queues/job_queue.c'; fi`; \
-	then mv -f "$(DEPDIR)/job_queue.Tpo" "$(DEPDIR)/job_queue.Po"; else rm -f "$(DEPDIR)/job_queue.Tpo"; exit 1; fi
-#	source='queues/job_queue.c' object='job_queue.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o job_queue.obj `if test -f 'queues/job_queue.c'; then $(CYGPATH_W) 'queues/job_queue.c'; else $(CYGPATH_W) '$(srcdir)/queues/job_queue.c'; fi`
-
-event_queue.o: queues/event_queue.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT event_queue.o -MD -MP -MF "$(DEPDIR)/event_queue.Tpo" -c -o event_queue.o `test -f 'queues/event_queue.c' || echo '$(srcdir)/'`queues/event_queue.c; \
-	then mv -f "$(DEPDIR)/event_queue.Tpo" "$(DEPDIR)/event_queue.Po"; else rm -f "$(DEPDIR)/event_queue.Tpo"; exit 1; fi
-#	source='queues/event_queue.c' object='event_queue.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o event_queue.o `test -f 'queues/event_queue.c' || echo '$(srcdir)/'`queues/event_queue.c
-
-event_queue.obj: queues/event_queue.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT event_queue.obj -MD -MP -MF "$(DEPDIR)/event_queue.Tpo" -c -o event_queue.obj `if test -f 'queues/event_queue.c'; then $(CYGPATH_W) 'queues/event_queue.c'; else $(CYGPATH_W) '$(srcdir)/queues/event_queue.c'; fi`; \
-	then mv -f "$(DEPDIR)/event_queue.Tpo" "$(DEPDIR)/event_queue.Po"; else rm -f "$(DEPDIR)/event_queue.Tpo"; exit 1; fi
-#	source='queues/event_queue.c' object='event_queue.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o event_queue.obj `if test -f 'queues/event_queue.c'; then $(CYGPATH_W) 'queues/event_queue.c'; else $(CYGPATH_W) '$(srcdir)/queues/event_queue.c'; fi`
-
-send_queue.o: queues/send_queue.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT send_queue.o -MD -MP -MF "$(DEPDIR)/send_queue.Tpo" -c -o send_queue.o `test -f 'queues/send_queue.c' || echo '$(srcdir)/'`queues/send_queue.c; \
-	then mv -f "$(DEPDIR)/send_queue.Tpo" "$(DEPDIR)/send_queue.Po"; else rm -f "$(DEPDIR)/send_queue.Tpo"; exit 1; fi
-#	source='queues/send_queue.c' object='send_queue.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o send_queue.o `test -f 'queues/send_queue.c' || echo '$(srcdir)/'`queues/send_queue.c
-
-send_queue.obj: queues/send_queue.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT send_queue.obj -MD -MP -MF "$(DEPDIR)/send_queue.Tpo" -c -o send_queue.obj `if test -f 'queues/send_queue.c'; then $(CYGPATH_W) 'queues/send_queue.c'; else $(CYGPATH_W) '$(srcdir)/queues/send_queue.c'; fi`; \
-	then mv -f "$(DEPDIR)/send_queue.Tpo" "$(DEPDIR)/send_queue.Po"; else rm -f "$(DEPDIR)/send_queue.Tpo"; exit 1; fi
-#	source='queues/send_queue.c' object='send_queue.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o send_queue.obj `if test -f 'queues/send_queue.c'; then $(CYGPATH_W) 'queues/send_queue.c'; else $(CYGPATH_W) '$(srcdir)/queues/send_queue.c'; fi`
-
-kernel_interface.o: threads/kernel_interface.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kernel_interface.o -MD -MP -MF "$(DEPDIR)/kernel_interface.Tpo" -c -o kernel_interface.o `test -f 'threads/kernel_interface.c' || echo '$(srcdir)/'`threads/kernel_interface.c; \
-	then mv -f "$(DEPDIR)/kernel_interface.Tpo" "$(DEPDIR)/kernel_interface.Po"; else rm -f "$(DEPDIR)/kernel_interface.Tpo"; exit 1; fi
-#	source='threads/kernel_interface.c' object='kernel_interface.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kernel_interface.o `test -f 'threads/kernel_interface.c' || echo '$(srcdir)/'`threads/kernel_interface.c
-
-kernel_interface.obj: threads/kernel_interface.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kernel_interface.obj -MD -MP -MF "$(DEPDIR)/kernel_interface.Tpo" -c -o kernel_interface.obj `if test -f 'threads/kernel_interface.c'; then $(CYGPATH_W) 'threads/kernel_interface.c'; else $(CYGPATH_W) '$(srcdir)/threads/kernel_interface.c'; fi`; \
-	then mv -f "$(DEPDIR)/kernel_interface.Tpo" "$(DEPDIR)/kernel_interface.Po"; else rm -f "$(DEPDIR)/kernel_interface.Tpo"; exit 1; fi
-#	source='threads/kernel_interface.c' object='kernel_interface.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kernel_interface.obj `if test -f 'threads/kernel_interface.c'; then $(CYGPATH_W) 'threads/kernel_interface.c'; else $(CYGPATH_W) '$(srcdir)/threads/kernel_interface.c'; fi`
-
-thread_pool.o: threads/thread_pool.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thread_pool.o -MD -MP -MF "$(DEPDIR)/thread_pool.Tpo" -c -o thread_pool.o `test -f 'threads/thread_pool.c' || echo '$(srcdir)/'`threads/thread_pool.c; \
-	then mv -f "$(DEPDIR)/thread_pool.Tpo" "$(DEPDIR)/thread_pool.Po"; else rm -f "$(DEPDIR)/thread_pool.Tpo"; exit 1; fi
-#	source='threads/thread_pool.c' object='thread_pool.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread_pool.o `test -f 'threads/thread_pool.c' || echo '$(srcdir)/'`threads/thread_pool.c
-
-thread_pool.obj: threads/thread_pool.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thread_pool.obj -MD -MP -MF "$(DEPDIR)/thread_pool.Tpo" -c -o thread_pool.obj `if test -f 'threads/thread_pool.c'; then $(CYGPATH_W) 'threads/thread_pool.c'; else $(CYGPATH_W) '$(srcdir)/threads/thread_pool.c'; fi`; \
-	then mv -f "$(DEPDIR)/thread_pool.Tpo" "$(DEPDIR)/thread_pool.Po"; else rm -f "$(DEPDIR)/thread_pool.Tpo"; exit 1; fi
-#	source='threads/thread_pool.c' object='thread_pool.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thread_pool.obj `if test -f 'threads/thread_pool.c'; then $(CYGPATH_W) 'threads/thread_pool.c'; else $(CYGPATH_W) '$(srcdir)/threads/thread_pool.c'; fi`
-
-scheduler.o: threads/scheduler.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scheduler.o -MD -MP -MF "$(DEPDIR)/scheduler.Tpo" -c -o scheduler.o `test -f 'threads/scheduler.c' || echo '$(srcdir)/'`threads/scheduler.c; \
-	then mv -f "$(DEPDIR)/scheduler.Tpo" "$(DEPDIR)/scheduler.Po"; else rm -f "$(DEPDIR)/scheduler.Tpo"; exit 1; fi
-#	source='threads/scheduler.c' object='scheduler.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scheduler.o `test -f 'threads/scheduler.c' || echo '$(srcdir)/'`threads/scheduler.c
-
-scheduler.obj: threads/scheduler.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scheduler.obj -MD -MP -MF "$(DEPDIR)/scheduler.Tpo" -c -o scheduler.obj `if test -f 'threads/scheduler.c'; then $(CYGPATH_W) 'threads/scheduler.c'; else $(CYGPATH_W) '$(srcdir)/threads/scheduler.c'; fi`; \
-	then mv -f "$(DEPDIR)/scheduler.Tpo" "$(DEPDIR)/scheduler.Po"; else rm -f "$(DEPDIR)/scheduler.Tpo"; exit 1; fi
-#	source='threads/scheduler.c' object='scheduler.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scheduler.obj `if test -f 'threads/scheduler.c'; then $(CYGPATH_W) 'threads/scheduler.c'; else $(CYGPATH_W) '$(srcdir)/threads/scheduler.c'; fi`
-
-sender.o: threads/sender.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sender.o -MD -MP -MF "$(DEPDIR)/sender.Tpo" -c -o sender.o `test -f 'threads/sender.c' || echo '$(srcdir)/'`threads/sender.c; \
-	then mv -f "$(DEPDIR)/sender.Tpo" "$(DEPDIR)/sender.Po"; else rm -f "$(DEPDIR)/sender.Tpo"; exit 1; fi
-#	source='threads/sender.c' object='sender.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sender.o `test -f 'threads/sender.c' || echo '$(srcdir)/'`threads/sender.c
-
-sender.obj: threads/sender.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sender.obj -MD -MP -MF "$(DEPDIR)/sender.Tpo" -c -o sender.obj `if test -f 'threads/sender.c'; then $(CYGPATH_W) 'threads/sender.c'; else $(CYGPATH_W) '$(srcdir)/threads/sender.c'; fi`; \
-	then mv -f "$(DEPDIR)/sender.Tpo" "$(DEPDIR)/sender.Po"; else rm -f "$(DEPDIR)/sender.Tpo"; exit 1; fi
-#	source='threads/sender.c' object='sender.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sender.obj `if test -f 'threads/sender.c'; then $(CYGPATH_W) 'threads/sender.c'; else $(CYGPATH_W) '$(srcdir)/threads/sender.c'; fi`
-
-receiver.o: threads/receiver.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT receiver.o -MD -MP -MF "$(DEPDIR)/receiver.Tpo" -c -o receiver.o `test -f 'threads/receiver.c' || echo '$(srcdir)/'`threads/receiver.c; \
-	then mv -f "$(DEPDIR)/receiver.Tpo" "$(DEPDIR)/receiver.Po"; else rm -f "$(DEPDIR)/receiver.Tpo"; exit 1; fi
-#	source='threads/receiver.c' object='receiver.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o receiver.o `test -f 'threads/receiver.c' || echo '$(srcdir)/'`threads/receiver.c
-
-receiver.obj: threads/receiver.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT receiver.obj -MD -MP -MF "$(DEPDIR)/receiver.Tpo" -c -o receiver.obj `if test -f 'threads/receiver.c'; then $(CYGPATH_W) 'threads/receiver.c'; else $(CYGPATH_W) '$(srcdir)/threads/receiver.c'; fi`; \
-	then mv -f "$(DEPDIR)/receiver.Tpo" "$(DEPDIR)/receiver.Po"; else rm -f "$(DEPDIR)/receiver.Tpo"; exit 1; fi
-#	source='threads/receiver.c' object='receiver.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o receiver.obj `if test -f 'threads/receiver.c'; then $(CYGPATH_W) 'threads/receiver.c'; else $(CYGPATH_W) '$(srcdir)/threads/receiver.c'; fi`
-
-stroke_interface.o: threads/stroke_interface.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stroke_interface.o -MD -MP -MF "$(DEPDIR)/stroke_interface.Tpo" -c -o stroke_interface.o `test -f 'threads/stroke_interface.c' || echo '$(srcdir)/'`threads/stroke_interface.c; \
-	then mv -f "$(DEPDIR)/stroke_interface.Tpo" "$(DEPDIR)/stroke_interface.Po"; else rm -f "$(DEPDIR)/stroke_interface.Tpo"; exit 1; fi
-#	source='threads/stroke_interface.c' object='stroke_interface.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stroke_interface.o `test -f 'threads/stroke_interface.c' || echo '$(srcdir)/'`threads/stroke_interface.c
-
-stroke_interface.obj: threads/stroke_interface.c
-	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stroke_interface.obj -MD -MP -MF "$(DEPDIR)/stroke_interface.Tpo" -c -o stroke_interface.obj `if test -f 'threads/stroke_interface.c'; then $(CYGPATH_W) 'threads/stroke_interface.c'; else $(CYGPATH_W) '$(srcdir)/threads/stroke_interface.c'; fi`; \
-	then mv -f "$(DEPDIR)/stroke_interface.Tpo" "$(DEPDIR)/stroke_interface.Po"; else rm -f "$(DEPDIR)/stroke_interface.Tpo"; exit 1; fi
-#	source='threads/stroke_interface.c' object='stroke_interface.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stroke_interface.obj `if test -f 'threads/stroke_interface.c'; then $(CYGPATH_W) 'threads/stroke_interface.c'; else $(CYGPATH_W) '$(srcdir)/threads/stroke_interface.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
new file mode 100644
index 000000000..fa8b322e5
--- /dev/null
+++ b/src/charon/Makefile.am
@@ -0,0 +1,46 @@
+ipsec_PROGRAMS = charon
+
+charon_SOURCES = \
+config/connections/connection.c config/connections/connection.h config/connections/local_connection_store.c \
+config/connections/connection_store.h config/connections/local_connection_store.h config/policies/policy.c \
+config/policies/policy.h config/policies/policy_store.h config/policies/local_policy_store.c \
+config/policies/local_policy_store.h config/credentials/local_credential_store.c \
+config/credentials/local_credential_store.h config/credentials/credential_store.h config/traffic_selector.c \
+config/traffic_selector.h config/proposal.c config/proposal.h config/configuration.c config/configuration.h \
+sa/states/state.c sa/states/state.h sa/states/ike_sa_init_requested.c sa/states/ike_sa_init_requested.h \
+sa/states/ike_sa_init_responded.c sa/states/ike_sa_established.c sa/states/ike_sa_established.h \
+sa/states/responder_init.c sa/states/responder_init.h sa/states/initiator_init.c sa/states/initiator_init.h \
+sa/states/ike_sa_init_responded.h sa/states/ike_auth_requested.c sa/states/ike_auth_requested.h \
+sa/child_sa.c sa/child_sa.h sa/ike_sa.c sa/ike_sa.h sa/ike_sa_manager.c sa/ike_sa_manager.h \
+sa/ike_sa_id.c sa/ike_sa_id.h sa/authenticator.c sa/authenticator.h encoding/payloads/encryption_payload.c \
+encoding/payloads/cert_payload.c encoding/payloads/payload.h encoding/payloads/traffic_selector_substructure.c \
+encoding/payloads/configuration_attribute.h encoding/payloads/proposal_substructure.h \
+encoding/payloads/transform_attribute.c encoding/payloads/transform_attribute.h \
+encoding/payloads/configuration_attribute.c encoding/payloads/transform_substructure.c \
+encoding/payloads/encryption_payload.h encoding/payloads/auth_payload.c encoding/payloads/ike_header.c \
+encoding/payloads/transform_substructure.h encoding/payloads/nonce_payload.c encoding/payloads/cert_payload.h \
+encoding/payloads/eap_payload.c encoding/payloads/ike_header.h encoding/payloads/auth_payload.h \
+encoding/payloads/ts_payload.c encoding/payloads/traffic_selector_substructure.h encoding/payloads/nonce_payload.h \
+encoding/payloads/notify_payload.c encoding/payloads/eap_payload.h encoding/payloads/notify_payload.h \
+encoding/payloads/ts_payload.h encoding/payloads/id_payload.c encoding/payloads/ke_payload.c \
+encoding/payloads/unknown_payload.c encoding/payloads/encodings.c encoding/payloads/id_payload.h \
+encoding/payloads/cp_payload.c encoding/payloads/delete_payload.c encoding/payloads/sa_payload.c \
+encoding/payloads/ke_payload.h encoding/payloads/unknown_payload.h encoding/payloads/encodings.h \
+encoding/payloads/certreq_payload.c encoding/payloads/cp_payload.h encoding/payloads/delete_payload.h \
+encoding/payloads/sa_payload.h encoding/payloads/vendor_id_payload.c encoding/payloads/certreq_payload.h \
+encoding/payloads/vendor_id_payload.h encoding/payloads/proposal_substructure.c encoding/payloads/payload.c \
+encoding/parser.h encoding/message.c encoding/generator.c encoding/message.h encoding/generator.h \
+encoding/parser.c daemon.c daemon.h network/packet.c \
+network/socket.c network/packet.h network/socket.h queues/jobs/job.h queues/jobs/job.c \
+queues/jobs/delete_established_ike_sa_job.c queues/jobs/retransmit_request_job.h queues/jobs/initiate_ike_sa_job.h \
+queues/jobs/incoming_packet_job.c queues/jobs/delete_half_open_ike_sa_job.c \
+queues/jobs/delete_established_ike_sa_job.h queues/jobs/delete_half_open_ike_sa_job.h \
+queues/jobs/incoming_packet_job.h queues/jobs/retransmit_request_job.c queues/jobs/initiate_ike_sa_job.c \
+queues/job_queue.c queues/event_queue.c queues/send_queue.h queues/job_queue.h queues/event_queue.h \
+queues/send_queue.c threads/kernel_interface.c threads/thread_pool.c threads/scheduler.c threads/sender.c \
+threads/sender.h threads/kernel_interface.h threads/scheduler.h threads/receiver.c threads/stroke_interface.c \
+threads/thread_pool.h threads/receiver.h threads/stroke_interface.h
+
+INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon -I$(top_srcdir)/src/stroke
+AM_CFLAGS = -DIPSEC_CONFDIR=\"${confdir}\" -DIPSEC_PIDDIR=\"${piddir}\"
+LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp -lpthread
diff --git a/src/charon/Makefile.charon b/src/charon/Makefile.charon
deleted file mode 100644
index 336495db9..000000000
--- a/src/charon/Makefile.charon
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2006 Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-CHARON_DIR= $(MAIN_DIR)charon/
-
-$(BUILD_DIR)daemon.o :			$(CHARON_DIR)daemon.c $(CHARON_DIR)daemon.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-
-include $(CHARON_DIR)network/Makefile.network
-include $(CHARON_DIR)config/Makefile.config
-include $(CHARON_DIR)encoding/Makefile.encoding
-include $(CHARON_DIR)queues/Makefile.queues
-include $(CHARON_DIR)sa/Makefile.sa
-include $(CHARON_DIR)threads/Makefile.threads
\ No newline at end of file
diff --git a/src/charon/config/Makefile.config b/src/charon/config/Makefile.config
deleted file mode 100644
index d4638b318..000000000
--- a/src/charon/config/Makefile.config
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-CONFIG_DIR= $(CHARON_DIR)config/
-
-
-CHARON_OBJS+= $(BUILD_DIR)traffic_selector.o
-$(BUILD_DIR)traffic_selector.o :			$(CONFIG_DIR)traffic_selector.c $(CONFIG_DIR)traffic_selector.h
-											$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)proposal.o
-$(BUILD_DIR)proposal.o :					$(CONFIG_DIR)proposal.c $(CONFIG_DIR)proposal.h
-											$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)configuration.o
-$(BUILD_DIR)configuration.o :				$(CONFIG_DIR)configuration.c $(CONFIG_DIR)configuration.h
-											$(CC) $(CFLAGS) -c -o $@ $<
-
-include $(CONFIG_DIR)connections/Makefile.connections
-include $(CONFIG_DIR)credentials/Makefile.credentials
-include $(CONFIG_DIR)policies/Makefile.policies
\ No newline at end of file
diff --git a/src/charon/config/connections/Makefile.connections b/src/charon/config/connections/Makefile.connections
deleted file mode 100644
index 8fbc983f6..000000000
--- a/src/charon/config/connections/Makefile.connections
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2006 Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-CONNECTIONS_DIR= $(CONFIG_DIR)connections/
-
-
-CHARON_OBJS+= $(BUILD_DIR)connection.o
-$(BUILD_DIR)connection.o :				$(CONNECTIONS_DIR)connection.c $(CONNECTIONS_DIR)connection.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)local_connection_store.o
-$(BUILD_DIR)local_connection_store.o :	$(CONNECTIONS_DIR)local_connection_store.c $(CONNECTIONS_DIR)local_connection_store.h
-										$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/charon/config/credentials/Makefile.credentials b/src/charon/config/credentials/Makefile.credentials
deleted file mode 100644
index 720d56656..000000000
--- a/src/charon/config/credentials/Makefile.credentials
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2006 Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-CREDENTIALS_DIR= $(CONFIG_DIR)credentials/
-
-
-CHARON_OBJS+= $(BUILD_DIR)local_credential_store.o
-$(BUILD_DIR)local_credential_store.o :	$(CREDENTIALS_DIR)local_credential_store.c $(CREDENTIALS_DIR)local_credential_store.h
-										$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/charon/config/policies/Makefile.policies b/src/charon/config/policies/Makefile.policies
deleted file mode 100644
index e7ed8ab13..000000000
--- a/src/charon/config/policies/Makefile.policies
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2006 Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-POLICIES_DIR= $(CONFIG_DIR)policies/
-
-
-CHARON_OBJS+= $(BUILD_DIR)policy.o
-$(BUILD_DIR)policy.o :					$(POLICIES_DIR)policy.c $(POLICIES_DIR)policy.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)local_policy_store.o
-$(BUILD_DIR)local_policy_store.o :		$(POLICIES_DIR)local_policy_store.c $(POLICIES_DIR)local_policy_store.h
-										$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/charon/daemon.h b/src/charon/daemon.h
index 5cad1339b..0c3d11800 100644
--- a/src/charon/daemon.h
+++ b/src/charon/daemon.h
@@ -200,35 +200,35 @@
  * 
  * @ingroup charon
  */
-#define PID_FILE "/var/run/charon.pid"
+#define PID_FILE IPSEC_PIDDIR "/charon.pid"
 
 /**
  * Configuration directory
  * 
  * @ingroup charon
  */
-#define CONFIG_DIR "/etc"
+#define CONFIG_DIR IPSEC_CONFDIR
 
 /**
  * Directory of IPsec relevant files
  * 
  * @ingroup charon
  */
-#define IPSEC_DIR CONFIG_DIR "/ipsec.d"
+#define IPSEC_D_DIR CONFIG_DIR "/ipsec.d"
 
 /**
  * Directory for private keys
  * 
  * @ingroup charon
  */
-#define PRIVATE_KEY_DIR IPSEC_DIR "/private"
+#define PRIVATE_KEY_DIR IPSEC_D_DIR "/private"
 
 /**
  * Directory for trusted certificates
  * 
  * @ingroup charon
  */
-#define CERTIFICATE_DIR IPSEC_DIR "/certs"
+#define CERTIFICATE_DIR IPSEC_D_DIR "/certs"
 
 /**
  * Secrets files
diff --git a/src/charon/Architecture.txt b/src/charon/doc/Architecture.txt
similarity index 100%
rename from src/charon/Architecture.txt
rename to src/charon/doc/Architecture.txt
diff --git a/src/charon/Known-bugs.txt b/src/charon/doc/Known-bugs.txt
similarity index 100%
rename from src/charon/Known-bugs.txt
rename to src/charon/doc/Known-bugs.txt
diff --git a/src/charon/Todo-list.txt b/src/charon/doc/Todo-list.txt
similarity index 100%
rename from src/charon/Todo-list.txt
rename to src/charon/doc/Todo-list.txt
diff --git a/src/charon/encoding/Makefile.encoding b/src/charon/encoding/Makefile.encoding
deleted file mode 100644
index ccdb42f79..000000000
--- a/src/charon/encoding/Makefile.encoding
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-ENCODING_DIR= $(CHARON_DIR)encoding/
-
-CHARON_OBJS+= $(BUILD_DIR)generator.o
-$(BUILD_DIR)generator.o :		$(ENCODING_DIR)generator.c $(ENCODING_DIR)generator.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)parser.o
-$(BUILD_DIR)parser.o :			$(ENCODING_DIR)parser.c $(ENCODING_DIR)parser.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)message.o
-$(BUILD_DIR)message.o :			$(ENCODING_DIR)message.c $(ENCODING_DIR)message.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-
-include $(ENCODING_DIR)payloads/Makefile.payloads
\ No newline at end of file
diff --git a/src/charon/encoding/payloads/Makefile.payloads b/src/charon/encoding/payloads/Makefile.payloads
deleted file mode 100644
index 61d920907..000000000
--- a/src/charon/encoding/payloads/Makefile.payloads
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-PAYLOADS_DIR= $(ENCODING_DIR)payloads/
-
-CHARON_OBJS+= $(BUILD_DIR)encodings.o
-$(BUILD_DIR)encodings.o :				$(PAYLOADS_DIR)encodings.c $(PAYLOADS_DIR)encodings.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ike_header.o
-$(BUILD_DIR)ike_header.o :				$(PAYLOADS_DIR)ike_header.c $(PAYLOADS_DIR)ike_header.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ke_payload.o
-$(BUILD_DIR)ke_payload.o :				$(PAYLOADS_DIR)ke_payload.c $(PAYLOADS_DIR)ke_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)nonce_payload.o
-$(BUILD_DIR)nonce_payload.o :			$(PAYLOADS_DIR)nonce_payload.c $(PAYLOADS_DIR)nonce_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)notify_payload.o
-$(BUILD_DIR)notify_payload.o :			$(PAYLOADS_DIR)notify_payload.c $(PAYLOADS_DIR)notify_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)id_payload.o
-$(BUILD_DIR)id_payload.o :				$(PAYLOADS_DIR)id_payload.c $(PAYLOADS_DIR)id_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)auth_payload.o
-$(BUILD_DIR)auth_payload.o :				$(PAYLOADS_DIR)auth_payload.c $(PAYLOADS_DIR)auth_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)cert_payload.o
-$(BUILD_DIR)cert_payload.o :			$(PAYLOADS_DIR)cert_payload.c $(PAYLOADS_DIR)cert_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)certreq_payload.o
-$(BUILD_DIR)certreq_payload.o :			$(PAYLOADS_DIR)certreq_payload.c $(PAYLOADS_DIR)certreq_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)delete_payload.o
-$(BUILD_DIR)delete_payload.o :			$(PAYLOADS_DIR)delete_payload.c $(PAYLOADS_DIR)delete_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)vendor_id_payload.o
-$(BUILD_DIR)vendor_id_payload.o :		$(PAYLOADS_DIR)vendor_id_payload.c $(PAYLOADS_DIR)vendor_id_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)cp_payload.o
-$(BUILD_DIR)cp_payload.o :				$(PAYLOADS_DIR)cp_payload.c $(PAYLOADS_DIR)cp_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)configuration_attribute.o
-$(BUILD_DIR)configuration_attribute.o :	$(PAYLOADS_DIR)configuration_attribute.c $(PAYLOADS_DIR)configuration_attribute.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)eap_payload.o
-$(BUILD_DIR)eap_payload.o :				$(PAYLOADS_DIR)eap_payload.c $(PAYLOADS_DIR)eap_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)unknown_payload.o
-$(BUILD_DIR)unknown_payload.o :			$(PAYLOADS_DIR)unknown_payload.c $(PAYLOADS_DIR)unknown_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ts_payload.o
-$(BUILD_DIR)ts_payload.o :				$(PAYLOADS_DIR)ts_payload.c $(PAYLOADS_DIR)ts_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)traffic_selector_substructure.o
-$(BUILD_DIR)traffic_selector_substructure.o :	$(PAYLOADS_DIR)traffic_selector_substructure.c $(PAYLOADS_DIR)traffic_selector_substructure.h
-												$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)payload.o
-$(BUILD_DIR)payload.o :					$(PAYLOADS_DIR)payload.c $(PAYLOADS_DIR)payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)proposal_substructure.o
-$(BUILD_DIR)proposal_substructure.o :	$(PAYLOADS_DIR)proposal_substructure.c $(PAYLOADS_DIR)proposal_substructure.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)sa_payload.o
-$(BUILD_DIR)sa_payload.o :				$(PAYLOADS_DIR)sa_payload.c $(PAYLOADS_DIR)sa_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)transform_attribute.o
-$(BUILD_DIR)transform_attribute.o :		$(PAYLOADS_DIR)transform_attribute.c $(PAYLOADS_DIR)transform_attribute.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)transform_substructure.o
-$(BUILD_DIR)transform_substructure.o :	$(PAYLOADS_DIR)transform_substructure.c $(PAYLOADS_DIR)transform_substructure.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)encryption_payload.o
-$(BUILD_DIR)encryption_payload.o :		$(PAYLOADS_DIR)encryption_payload.c $(PAYLOADS_DIR)encryption_payload.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-								
diff --git a/src/charon/network/Makefile.network b/src/charon/network/Makefile.network
deleted file mode 100644
index fd99bd085..000000000
--- a/src/charon/network/Makefile.network
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-NETWORK_DIR= $(CHARON_DIR)network/
-
-
-CHARON_OBJS+= $(BUILD_DIR)packet.o
-$(BUILD_DIR)packet.o :		$(NETWORK_DIR)packet.c $(NETWORK_DIR)packet.h
-							$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)socket.o
-$(BUILD_DIR)socket.o :		$(NETWORK_DIR)socket.c $(NETWORK_DIR)socket.h
-							$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/charon/queues/Makefile.queues b/src/charon/queues/Makefile.queues
deleted file mode 100644
index eeb012d2b..000000000
--- a/src/charon/queues/Makefile.queues
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-QUEUES_DIR= $(CHARON_DIR)queues/
-
-CHARON_OBJS+= $(BUILD_DIR)event_queue.o
-$(BUILD_DIR)event_queue.o :		$(QUEUES_DIR)event_queue.c $(QUEUES_DIR)event_queue.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)job_queue.o
-$(BUILD_DIR)job_queue.o :		$(QUEUES_DIR)job_queue.c $(QUEUES_DIR)job_queue.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)send_queue.o
-$(BUILD_DIR)send_queue.o :		$(QUEUES_DIR)send_queue.c $(QUEUES_DIR)send_queue.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-
-include $(QUEUES_DIR)jobs/Makefile.jobs
\ No newline at end of file
diff --git a/src/charon/queues/jobs/Makefile.jobs b/src/charon/queues/jobs/Makefile.jobs
deleted file mode 100644
index db89987bc..000000000
--- a/src/charon/queues/jobs/Makefile.jobs
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-JOBS_DIR= $(QUEUES_DIR)jobs/
-
-CHARON_OBJS+= $(BUILD_DIR)delete_half_open_ike_sa_job.o
-$(BUILD_DIR)delete_half_open_ike_sa_job.o :	$(JOBS_DIR)delete_half_open_ike_sa_job.c $(JOBS_DIR)delete_half_open_ike_sa_job.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)delete_established_ike_sa_job.o
-$(BUILD_DIR)delete_established_ike_sa_job.o :	$(JOBS_DIR)delete_established_ike_sa_job.c $(JOBS_DIR)delete_established_ike_sa_job.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)incoming_packet_job.o
-$(BUILD_DIR)incoming_packet_job.o :		$(JOBS_DIR)incoming_packet_job.c $(JOBS_DIR)incoming_packet_job.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)initiate_ike_sa_job.o
-$(BUILD_DIR)initiate_ike_sa_job.o :		$(JOBS_DIR)initiate_ike_sa_job.c $(JOBS_DIR)initiate_ike_sa_job.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)retransmit_request_job.o
-$(BUILD_DIR)retransmit_request_job.o :	$(JOBS_DIR)retransmit_request_job.c $(JOBS_DIR)retransmit_request_job.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)job.o
-$(BUILD_DIR)job.o :						$(JOBS_DIR)job.c $(JOBS_DIR)job.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-								
\ No newline at end of file
diff --git a/src/charon/sa/Makefile.sa b/src/charon/sa/Makefile.sa
deleted file mode 100644
index 825c19959..000000000
--- a/src/charon/sa/Makefile.sa
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-SA_DIR= $(CHARON_DIR)sa/
-
-CHARON_OBJS+= $(BUILD_DIR)ike_sa_id.o
-$(BUILD_DIR)ike_sa_id.o :		$(SA_DIR)ike_sa_id.c $(SA_DIR)ike_sa_id.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ike_sa_manager.o
-$(BUILD_DIR)ike_sa_manager.o :	$(SA_DIR)ike_sa_manager.c $(SA_DIR)ike_sa_manager.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ike_sa.o
-$(BUILD_DIR)ike_sa.o :			$(SA_DIR)ike_sa.c $(SA_DIR)ike_sa.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)authenticator.o
-$(BUILD_DIR)authenticator.o :	$(SA_DIR)authenticator.c $(SA_DIR)authenticator.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)child_sa.o
-$(BUILD_DIR)child_sa.o :		$(SA_DIR)child_sa.c $(SA_DIR)child_sa.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-include $(SA_DIR)states/Makefile.states
\ No newline at end of file
diff --git a/src/charon/sa/states/Makefile.states b/src/charon/sa/states/Makefile.states
deleted file mode 100644
index a258ebef0..000000000
--- a/src/charon/sa/states/Makefile.states
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-STATES_DIR= $(SA_DIR)states/
-
-CHARON_OBJS+= $(BUILD_DIR)ike_auth_requested.o
-$(BUILD_DIR)ike_auth_requested.o :		$(STATES_DIR)ike_auth_requested.c $(STATES_DIR)ike_auth_requested.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ike_sa_established.o
-$(BUILD_DIR)ike_sa_established.o :		$(STATES_DIR)ike_sa_established.c $(STATES_DIR)ike_sa_established.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ike_sa_init_requested.o
-$(BUILD_DIR)ike_sa_init_requested.o :	$(STATES_DIR)ike_sa_init_requested.c $(STATES_DIR)ike_sa_init_requested.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)ike_sa_init_responded.o
-$(BUILD_DIR)ike_sa_init_responded.o :	$(STATES_DIR)ike_sa_init_responded.c $(STATES_DIR)ike_sa_init_responded.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-
-CHARON_OBJS+= $(BUILD_DIR)initiator_init.o
-$(BUILD_DIR)initiator_init.o :			$(STATES_DIR)initiator_init.c $(STATES_DIR)initiator_init.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)responder_init.o
-$(BUILD_DIR)responder_init.o :			$(STATES_DIR)responder_init.c $(STATES_DIR)responder_init.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-CHARON_OBJS+= $(BUILD_DIR)state.o
-$(BUILD_DIR)state.o :					$(STATES_DIR)state.c $(STATES_DIR)state.h
-										$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/charon/testing/Makefile.testcases b/src/charon/testing/Makefile.testcases
deleted file mode 100644
index 5a261a799..000000000
--- a/src/charon/testing/Makefile.testcases
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-TESTCASES_DIR= $(MAIN_DIR)testing/
-
-
-$(BUILD_DIR)testcases.o :			$(TESTCASES_DIR)testcases.c
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)aes_cbc_crypter_test.o
-$(BUILD_DIR)aes_cbc_crypter_test.o :	$(TESTCASES_DIR)aes_cbc_crypter_test.c $(TESTCASES_DIR)aes_cbc_crypter_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)diffie_hellman_test.o
-$(BUILD_DIR)diffie_hellman_test.o :	$(TESTCASES_DIR)diffie_hellman_test.c $(TESTCASES_DIR)diffie_hellman_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)event_queue_test.o
-$(BUILD_DIR)event_queue_test.o :	$(TESTCASES_DIR)event_queue_test.c $(TESTCASES_DIR)event_queue_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)generator_test.o
-$(BUILD_DIR)generator_test.o :		$(TESTCASES_DIR)generator_test.c $(TESTCASES_DIR)generator_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)ike_sa_id_test.o
-$(BUILD_DIR)ike_sa_id_test.o :		$(TESTCASES_DIR)ike_sa_id_test.c $(TESTCASES_DIR)ike_sa_id_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)job_queue_test.o
-$(BUILD_DIR)job_queue_test.o :		$(TESTCASES_DIR)job_queue_test.c $(TESTCASES_DIR)job_queue_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)parser_test.o
-$(BUILD_DIR)parser_test.o :			$(TESTCASES_DIR)parser_test.c $(TESTCASES_DIR)parser_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)hasher_test.o
-$(BUILD_DIR)hasher_test.o :			$(TESTCASES_DIR)hasher_test.c $(TESTCASES_DIR)hasher_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)ike_sa_manager_test.o
-$(BUILD_DIR)ike_sa_manager_test.o :	$(TESTCASES_DIR)ike_sa_manager_test.c $(TESTCASES_DIR)ike_sa_manager_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)linked_list_test.o
-$(BUILD_DIR)linked_list_test.o :	$(TESTCASES_DIR)linked_list_test.c $(TESTCASES_DIR)linked_list_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)hmac_test.o
-$(BUILD_DIR)hmac_test.o :			$(TESTCASES_DIR)hmac_test.c $(TESTCASES_DIR)hmac_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)hmac_signer_test.o
-$(BUILD_DIR)hmac_signer_test.o :		$(TESTCASES_DIR)hmac_signer_test.c $(TESTCASES_DIR)hmac_signer_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-											
-TEST_OBJS+= $(BUILD_DIR)scheduler_test.o
-$(BUILD_DIR)scheduler_test.o :		$(TESTCASES_DIR)scheduler_test.c $(TESTCASES_DIR)scheduler_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)prf_plus_test.o
-$(BUILD_DIR)prf_plus_test.o :		$(TESTCASES_DIR)prf_plus_test.c $(TESTCASES_DIR)prf_plus_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)send_queue_test.o
-$(BUILD_DIR)send_queue_test.o :		$(TESTCASES_DIR)send_queue_test.c $(TESTCASES_DIR)send_queue_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)socket_test.o
-$(BUILD_DIR)socket_test.o :			$(TESTCASES_DIR)socket_test.c $(TESTCASES_DIR)socket_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)packet_test.o
-$(BUILD_DIR)packet_test.o :			$(TESTCASES_DIR)packet_test.c $(TESTCASES_DIR)packet_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)ike_sa_test.o
-$(BUILD_DIR)ike_sa_test.o :			$(TESTCASES_DIR)ike_sa_test.c $(TESTCASES_DIR)ike_sa_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)sender_test.o
-$(BUILD_DIR)sender_test.o :			$(TESTCASES_DIR)sender_test.c $(TESTCASES_DIR)sender_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)thread_pool_test.o
-$(BUILD_DIR)thread_pool_test.o :	$(TESTCASES_DIR)thread_pool_test.c $(TESTCASES_DIR)thread_pool_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-									
-TEST_OBJS+= $(BUILD_DIR)encryption_payload_test.o
-$(BUILD_DIR)encryption_payload_test.o :	$(TESTCASES_DIR)encryption_payload_test.c $(TESTCASES_DIR)encryption_payload_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)connection_test.o
-$(BUILD_DIR)connection_test.o :		$(TESTCASES_DIR)connection_test.c $(TESTCASES_DIR)connection_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)policy_test.o
-$(BUILD_DIR)policy_test.o :			$(TESTCASES_DIR)policy_test.c $(TESTCASES_DIR)policy_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)proposal_test.o
-$(BUILD_DIR)proposal_test.o :		$(TESTCASES_DIR)proposal_test.c $(TESTCASES_DIR)proposal_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)rsa_test.o
-$(BUILD_DIR)rsa_test.o :			$(TESTCASES_DIR)rsa_test.c $(TESTCASES_DIR)rsa_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)kernel_interface_test.o
-$(BUILD_DIR)kernel_interface_test.o :	$(TESTCASES_DIR)kernel_interface_test.c $(TESTCASES_DIR)kernel_interface_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)child_sa_test.o
-$(BUILD_DIR)child_sa_test.o :		$(TESTCASES_DIR)child_sa_test.c $(TESTCASES_DIR)child_sa_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)certificate_test.o
-$(BUILD_DIR)certificate_test.o :	$(TESTCASES_DIR)certificate_test.c $(TESTCASES_DIR)certificate_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)leak_detective_test.o
-$(BUILD_DIR)leak_detective_test.o :	$(TESTCASES_DIR)leak_detective_test.c $(TESTCASES_DIR)leak_detective_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
-
-TEST_OBJS+= $(BUILD_DIR)identification_test.o
-$(BUILD_DIR)identification_test.o :	$(TESTCASES_DIR)identification_test.c $(TESTCASES_DIR)identification_test.h
-									$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/charon/threads/Makefile.threads b/src/charon/threads/Makefile.threads
deleted file mode 100644
index 949c1ad24..000000000
--- a/src/charon/threads/Makefile.threads
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-THREADS_DIR= $(CHARON_DIR)threads/
-
-CHARON_OBJS+= $(BUILD_DIR)receiver.o
-$(BUILD_DIR)receiver.o :		$(THREADS_DIR)receiver.c $(THREADS_DIR)receiver.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)scheduler.o
-$(BUILD_DIR)scheduler.o :		$(THREADS_DIR)scheduler.c $(THREADS_DIR)scheduler.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)sender.o
-$(BUILD_DIR)sender.o :			$(THREADS_DIR)sender.c $(THREADS_DIR)sender.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)thread_pool.o
-$(BUILD_DIR)thread_pool.o :		$(THREADS_DIR)thread_pool.c $(THREADS_DIR)thread_pool.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)kernel_interface.o
-$(BUILD_DIR)kernel_interface.o :$(THREADS_DIR)kernel_interface.c $(THREADS_DIR)kernel_interface.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-CHARON_OBJS+= $(BUILD_DIR)stroke_interface.o
-$(BUILD_DIR)stroke_interface.o :$(THREADS_DIR)stroke_interface.c $(THREADS_DIR)stroke_interface.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/ipsec/Makefile b/src/ipsec/Makefile
deleted file mode 100644
index fdff3728a..000000000
--- a/src/ipsec/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Makefile for miscelaneous programs
-# Copyright (C) 2002  Michael Richardson	<mcr@freeswan.org>
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.2 2006/02/10 11:27:31 as Exp $
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-PROGRAM=ipsec
-PROGRAMDIR=${SBINDIR}
-MANPROGPREFIX:=./
-LIBFILES:=$(wildcard distro.txt)
-
-include ../Makefile.program
-
-install:: ipsec
-	@$(INSTALL) $(INSTBINFLAGS) ipsec $(RCDIR)/ipsec
-
diff --git a/src/ipsec/Makefile.am b/src/ipsec/Makefile.am
new file mode 100644
index 000000000..44964e041
--- /dev/null
+++ b/src/ipsec/Makefile.am
@@ -0,0 +1,16 @@
+sbin_SCRIPTS = ipsec
+CLEANFILES = ipsec
+dist_man8_MANS = ipsec.8
+EXTRA_DIST = ipsec.in
+
+ipsec : ipsec.in
+	sed \
+	-e "s:@IPSEC_VERSION@:$(PACKAGE_VERSION):" \
+	-e "s:@IPSEC_NAME@:$(PACKAGE_NAME):" \
+	-e "s:@IPSEC_DISTRO@::" \
+	-e "s:@IPSEC_DIR@:$(ipsecdir):" \
+	-e "s:@IPSEC_SBINDIR@:$(sbindir):" \
+	-e "s:@IPSEC_CONFDIR@:$(confdir):" \
+	-e "s:@IPSEC_PIDDIR@:$(piddir):" \
+	$< > $@
+	chmod +x $@
diff --git a/src/ipsec/ipsec.8 b/src/ipsec/ipsec.8
index 823289372..b37ac2c3a 100644
--- a/src/ipsec/ipsec.8
+++ b/src/ipsec/ipsec.8
@@ -313,10 +313,16 @@ The
 command sets them if they are not already set.
 .nf
 .na
-IPSEC_EXECDIR	directory containing published commands
-IPSEC_LIBDIR	directory containing internal executables
-IPSEC_SBINDIR	directory containing \fBipsec\fP command
-IPSEC_CONFS	directory containing configuration files
+
+IPSEC_DIR 		directory containing ipsec programs and utilities
+IPSEC_SBINDIR		directory containing \fBipsec\fP command
+IPSEC_CONFDIR 		directory containing configuration files
+IPSEC_PIDDIR		directory containing PID files
+IPSEC_NAME 		name of ipsec distribution
+IPSEC_VERSION 		version numer of ipsec userland and kernel
+IPSEC_STARTER_PID 	PID file for ipsec starter
+IPSEC_PLUTO_PID 	PID file for IKEv1 keying daemon
+IPSEC_CHARON_PID	PID file for IKEv2 keying daemon
 .ad
 .fi
 .SH SEE ALSO
diff --git a/src/ipsec/ipsec.in b/src/ipsec/ipsec.in
index 1a5006eed..9c4ec4780 100755
--- a/src/ipsec/ipsec.in
+++ b/src/ipsec/ipsec.in
@@ -2,6 +2,7 @@
 # prefix command to run stuff from our programs directory
 # Copyright (C) 1998-2002  Henry Spencer.
 # Copyright (C) 2006 Andreas Steffen
+# Copyright (C) 2006 Martin Willi 
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -15,58 +16,28 @@
 #
 # RCSID $Id: ipsec.in,v 1.13 2006/03/09 20:09:33 as Exp $
 
-IPSEC_NAME=strongSwan
+# name and version of the ipsec implementation
+IPSEC_NAME="@IPSEC_NAME@"
+IPSEC_VERSION="U@IPSEC_VERSION@/K`uname -r`"
 
 # where the private directory and the config files are
-IPSEC_EXECDIR="${IPSEC_EXECDIR-@IPSEC_EXECDIR@}"
-IPSEC_LIBDIR="${IPSEC_LIBDIR-@IPSEC_LIBDIR@}"
-IPSEC_SBINDIR="${IPSEC_SBINDIR-@IPSEC_SBINDIR@}"
-IPSEC_CONFS="${IPSEC_CONFS-@IPSEC_CONFS@}"
+IPSEC_DIR="@IPSEC_DIR@"
+IPSEC_SBINDIR="@IPSEC_SBINDIR@"
+IPSEC_CONFDIR="@IPSEC_CONFDIR@"
+IPSEC_PIDDIR="@IPSEC_PIDDIR@"
 
-IPSEC_DIR="$IPSEC_LIBDIR"
-export IPSEC_DIR IPSEC_CONFS IPSEC_LIBDIR IPSEC_EXECDIR
+IPSEC_STARTER_PID="${IPSEC_PIDDIR}/starter.pid"
+IPSEC_PLUTO_PID="${IPSEC_PIDDIR}/pluto.pid"
+IPSEC_CHARON_PID="${IPSEC_PIDDIR}/charon.pid"
 
-IPSEC_STARTER_PID="/var/run/starter.pid"
-IPSEC_PLUTO_PID="/var/run/pluto.pid"
-IPSEC_CHARON_PID="/var/run/charon.pid"
+IPSEC_WHACK="${IPSEC_DIR}/whack"
+IPSEC_STROKE="${IPSEC_DIR}/stroke"
+IPSEC_STARTER="${IPSEC_DIR}/starter"
 
-# standardize PATH, and export it for everything else's benefit
-PATH="${IPSEC_SBINDIR}":/sbin:/usr/sbin:/usr/local/bin:/bin:/usr/bin
-export PATH
+export IPSEC_DIR IPSEC_SBINDIR IPSEC_CONFDIR IPSEC_PIDDIR IPSEC_VERSION IPSEC_NAME IPSEC_STARTER_PID IPSEC_PLUTO_PID IPSEC_CHARON_PID
 
-# things not to be listed in --help command list
-DONTMENTION='^(ipsec|_.*|.*\.old|.*~)$'
-
-# version numbering (details filled in by build)
-# Possibly should call a C program to invoke the version_code() function
-# instead, but for performance's sake, we inline it here (and only here).
-version="xxx"
-
-# export the version information
-IPSEC_VERSION="$version"
-export IPSEC_VERSION
-
-# function for the funky user/kernel version stuff
-fixversion() {
-	if test -f /proc/net/ipsec_version
-	then
-	stack=" (KLIPS)"
-	kv="`awk '{print $NF}' /proc/net/ipsec_version`"
-	else
-                if test -f /proc/net/pfkey
-                then
-			stack=" (native)"
-                        kv="`uname -r`"
-                else
-                        kv="(no kernel code presently loaded)"
-                fi
-	fi
-	if test " $kv" != " $version"
-	then
-	version="U$version/K$kv"
-	fi
-	version="$version$stack"
-}
+IPSEC_DISTRO="Distributed by the Institute of Internet Technologies and Applications
+              University of Applied Sciences Rapperswil, Switzerland (ITA-HSR)"
 
 case "$1" in
 '')
@@ -102,13 +73,13 @@ case "$1" in
 	echo "	starter"
 	echo "	version"
 	echo "	whack"
+	echo "	stoke"
 	echo
 	echo "Some of these functions have their own manual pages, e.g. ipsec_scepclient(8)."
 	exit 0
 	;;
 --versioncode)
-	fixversion
-	echo "$version"
+	echo "$IPSEC_VERSION"
 	exit 0
 	;;
 --copyright)
@@ -120,18 +91,18 @@ case "$1" in
 	exit 0
 	;;
 --confdir)
-	echo "$IPSEC_CONFS"
+	echo "$IPSEC_CONFDIR"
 	exit 0
 	;;
 down)
 	shift
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack --name "$1" --terminate
+		$IPSEC_WHACK --name "$1" --terminate
 	fi
 	if test -e $IPSEC_CHARON_PID
 	then
-		$IPSEC_EXECDIR/stroke down "$1"
+		$IPSEC_STROKE down "$1"
 	fi
 	exit 0
 	;;
@@ -145,11 +116,11 @@ rereadacerts|rereadcrls|rereadall)
 	shift
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack "$@" "--$op"
+		$IPSEC_WHACK "$@" "--$op"
 	fi
 	#if test -e $IPSEC_CHARON_PID
 	#then
-	#	$IPSEC_EXECDIR/stroke "$op"
+	#	$IPSEC_STROKE "$op"
 	#fi
 	exit 0
 	;;
@@ -157,7 +128,7 @@ ready)
 	shift
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack --listen
+		$IPSEC_WHACK --listen
 	fi
 	exit 0
 	;;
@@ -183,7 +154,7 @@ route|unroute)
 	shift
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack --name "$1" "--$op"
+		$IPSEC_WHACK --name "$1" "--$op"
 	fi
 	exit 0
 	;;
@@ -192,20 +163,20 @@ scencrypt|scdecrypt)
 	shift
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack "--$op" "$@"
+		$IPSEC_WHACK "--$op" "$@"
 	fi
 	exit 0
 	;;
 secrets)
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack --rereadsecrets
+		$IPSEC_WHACK --rereadsecrets
 	fi
 	exit 0
 	;;
 start)
 	shift
-	exec $IPSEC_EXECDIR/starter "$@"
+	exec $IPSEC_STARTER "$@"
 	;;
 status|statusall)
 	op="$1"
@@ -214,20 +185,20 @@ status|statusall)
 	then
 		if test -e $IPSEC_PLUTO_PID
 		then
-			$IPSEC_EXECDIR/whack "--$op"
+			$IPSEC_WHACK "--$op"
 		fi
 		if test -e $IPSEC_CHARON_PID
 		then
-			$IPSEC_EXECDIR/stroke "$op"
+			$IPSEC_STROKE "$op"
 		fi
 	else
 		if test -e $IPSEC_PLUTO_PID
 		then
-			$IPSEC_EXECDIR/whack --name "$1" "--$op"
+			$IPSEC_WHACK --name "$1" "--$op"
 		fi
 		if test -e $IPSEC_CHARON_PID
 		then
-			$IPSEC_EXECDIR/stroke "$op" "$1"
+			$IPSEC_STROKE "$op" "$1"
 		fi
 	fi
 	exit 0
@@ -246,11 +217,11 @@ up)
 	shift
 	if test -e $IPSEC_PLUTO_PID
 	then
-		$IPSEC_EXECDIR/whack --name "$1" --initiate
+		$IPSEC_WHACK --name "$1" --initiate
 	fi
 	if test -e $IPSEC_CHARON_PID
 	then
-	    $IPSEC_EXECDIR/stroke up "$1"
+	    $IPSEC_STROKE up "$1"
 	fi
 	exit 0
 	;;
@@ -265,13 +236,9 @@ update)
 	exit 0
 	;;
 version|--version)
-	fixversion
-	echo "Linux $IPSEC_NAME $version"
+	echo "Linux $IPSEC_NAME $IPSEC_VERSION"
 	echo "See \`ipsec --copyright' for copyright information."
-	if [ -f $IPSEC_LIBDIR/distro.txt ]
-	then
-		cat $IPSEC_LIBDIR/distro.txt
-	fi
+	echo $IPSEC_DISTRO
 	exit 0
 	;;
 --*)
@@ -283,11 +250,11 @@ esac
 cmd="$1"
 shift
 
-path="$IPSEC_EXECDIR/$cmd"
+path="$IPSEC_DIR/$cmd"
 
 if test ! -x "$path" 
 then
-    path="$IPSEC_LIBDIR/$cmd"
+    path="$IPSEC_DIR/$cmd"
     if test ! -x "$path"
     then
 	echo "$0: unknown IPsec command \`$cmd' (\`ipsec --help' for list)" >&2
diff --git a/src/libcrypto/Makefile.am b/src/libcrypto/Makefile.am
index 5f0aa2d60..68720f486 100644
--- a/src/libcrypto/Makefile.am
+++ b/src/libcrypto/Makefile.am
@@ -1,2 +1,45 @@
 noinst_LIBRARIES = libcrypto.a
-libcrypto_a_LIBADD = libaes/libaes.a libblowfish/libblowfish.a libdes/libdes.a libserpent/libserpent.a libsha2/libsha2.a libtwofish/libtwofish.a
+libcrypto_a_SOURCES = \
+libaes/aes_xcbc_mac.c \
+libaes/aes_cbc.c \
+libaes/aes_xcbc_mac.h \
+libaes/aes_cbc.h \
+libaes/aes.c \
+libaes/aes.h \
+include/md32_common.h \
+include/cbc_generic.h \
+include/hmac_generic.h \
+libblowfish/bf_skey.c \
+libblowfish/blowfish.h \
+libblowfish/bf_pi.h \
+libblowfish/bf_locl.h \
+libblowfish/bf_enc.c \
+libsha2/hmac_sha2.c \
+libsha2/sha2.h \
+libsha2/hmac_sha2.h \
+libsha2/sha2.c \
+libserpent/serpent_cbc.c \
+libserpent/serpent_cbc.h \
+libserpent/serpent.c \
+libserpent/serpent.h \
+libtwofish/twofish_cbc.h \
+libtwofish/twofish_cbc.c \
+libtwofish/twofish.c \
+libtwofish/twofish.h \
+libdes/des_enc.c \
+libdes/podd.h \
+libdes/sk.h \
+libdes/set_key.c \
+libdes/speed.c \
+libdes/fcrypt_b.c \
+libdes/fcrypt.c \
+libdes/destest.c \
+libdes/spr.h \
+libdes/cbc_enc.c \
+libdes/ecb_enc.c \
+libdes/des_opts.c \
+libdes/des_locl.h \
+libdes/des_ver.h \
+libdes/des.h
+
+INCLUDES = -I$(top_srcdir)/src/libcrypto/include
diff --git a/src/libcrypto/libaes/Makefile.am b/src/libcrypto/libaes/Makefile.am
deleted file mode 100644
index 3ebe2c56d..000000000
--- a/src/libcrypto/libaes/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LIBRARIES = libaes.a
-libaes_a_SOURCES = aes_xcbc_mac.c aes_cbc.c aes.c
-
diff --git a/src/libcrypto/libblowfish/Makefile.am b/src/libcrypto/libblowfish/Makefile.am
deleted file mode 100644
index bfa6dd37f..000000000
--- a/src/libcrypto/libblowfish/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LIBRARIES = libblowfish.a
-libblowfish_a_SOURCES = bf_skey.c bf_enc.c
-
diff --git a/src/libcrypto/libdes/Makefile b/src/libcrypto/libdes/Makefile
deleted file mode 100644
index 4fd649495..000000000
--- a/src/libcrypto/libdes/Makefile
+++ /dev/null
@@ -1,422 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# src/libfreeswan/libcrypto/libdes/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ../../../..
-
-pkgdatadir = $(datadir)/strongSwan
-pkglibdir = $(libdir)/strongSwan
-pkgincludedir = $(includedir)/strongSwan
-top_builddir = ../../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-subdir = src/libfreeswan/libcrypto/libdes
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-libdes_a_AR = $(AR) $(ARFLAGS)
-libdes_a_LIBADD =
-am_libdes_a_OBJECTS = cbc_enc.$(OBJEXT) ecb_enc.$(OBJEXT) \
-	des_enc.$(OBJEXT) fcrypt_b.$(OBJEXT) fcrypt.$(OBJEXT) \
-	set_key.$(OBJEXT)
-libdes_a_OBJECTS = $(am_libdes_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libdes_a_SOURCES)
-DIST_SOURCES = $(libdes_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/mwilli/strongswan/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/mwilli/strongswan/trunk/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/mwilli/strongswan/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/mwilli/strongswan/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/mwilli/strongswan/trunk/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE=\"strongSwan\" -DVERSION=\"4.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/mwilli/strongswan/trunk/missing --run makeinfo
-OBJEXT = o
-PACKAGE = strongSwan
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 4.0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/mwilli/strongswan/trunk/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-noinst_LIBRARIES = libdes.a
-libdes_a_SOURCES = cbc_enc.c ecb_enc.c des_enc.c fcrypt_b.c fcrypt.c set_key.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/libfreeswan/libcrypto/libdes/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/libfreeswan/libcrypto/libdes/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdes.a: $(libdes_a_OBJECTS) $(libdes_a_DEPENDENCIES) 
-	-rm -f libdes.a
-	$(libdes_a_AR) libdes.a $(libdes_a_OBJECTS) $(libdes_a_LIBADD)
-	$(RANLIB) libdes.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/cbc_enc.Po
-include ./$(DEPDIR)/des_enc.Po
-include ./$(DEPDIR)/ecb_enc.Po
-include ./$(DEPDIR)/fcrypt.Po
-include ./$(DEPDIR)/fcrypt_b.Po
-include ./$(DEPDIR)/set_key.Po
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/libcrypto/libdes/Makefile.am b/src/libcrypto/libdes/Makefile.am
deleted file mode 100644
index 356e375b9..000000000
--- a/src/libcrypto/libdes/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LIBRARIES = libdes.a
-libdes_a_SOURCES = cbc_enc.c ecb_enc.c des_enc.c fcrypt_b.c fcrypt.c set_key.c
-
diff --git a/src/libcrypto/libserpent/Makefile.am b/src/libcrypto/libserpent/Makefile.am
deleted file mode 100644
index 38d064474..000000000
--- a/src/libcrypto/libserpent/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LIBRARIES = libserpent.a
-libserpent_a_SOURCES = serpent.c serpent_cbc.c
-
diff --git a/src/libcrypto/libsha2/Makefile.am b/src/libcrypto/libsha2/Makefile.am
deleted file mode 100644
index 6c98110d7..000000000
--- a/src/libcrypto/libsha2/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LIBRARIES = libsha2.a
-libsha2_a_SOURCES = hmac_sha2.c sha2.c
-
diff --git a/src/libcrypto/libtwofish/Makefile.am b/src/libcrypto/libtwofish/Makefile.am
deleted file mode 100644
index 9f9640aa6..000000000
--- a/src/libcrypto/libtwofish/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_LIBRARIES = libtwofish.a
-libtwofish_a_SOURCES = twofish.c twofish_cbc.c
-
diff --git a/src/libcrypto/oldlibdes/.cvsignore b/src/libcrypto/oldlibdes/.cvsignore
deleted file mode 100644
index e06b80457..000000000
--- a/src/libcrypto/oldlibdes/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-des_opts
-destest
-speed
diff --git a/src/libfreeswan/Makefile b/src/libfreeswan/Makefile
deleted file mode 100644
index 50a98b40d..000000000
--- a/src/libfreeswan/Makefile
+++ /dev/null
@@ -1,174 +0,0 @@
-# FreeS/WAN library
-# Copyright (C) 1998-2001  Henry Spencer.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.2 2004/03/22 21:53:17 as Exp $
-
-
-FREESWANSRCDIR=../..
-
-include ${FREESWANSRCDIR}/Makefile.inc
-include ${FREESWANSRCDIR}/Makefile.ver
-
-
-MANDIR=$(MANTREE)/man3
-
-SRCS=addrtoa.c addrtot.c addrtypeof.c anyaddr.c atoaddr.c \
-	atoasr.c atosa.c atosubnet.c atoul.c copyright.c datatot.c \
-	goodmask.c initaddr.c initsaid.c initsubnet.c keyblobtoid.c \
-	optionsfrom.c pfkey_v2_build.c pfkey_v2_ext_bits.c pfkey_v2_parse.c \
-	pfkey_v2_debug.c prng.c \
-	portof.c rangetoa.c rangetosubnet.c sameaddr.c \
-	satoa.c satot.c subnetof.c subnettoa.c subnettot.c \
-	subnettypeof.c ttoaddr.c ttodata.c ttoprotoport.c \
-	ttosa.c ttosubnet.c ttoul.c ultoa.c ultot.c 
-
-OBJS=${SRCS:.c=.o} version.o
-
-KLIPSD=${FREESWANSRCDIR}/linux/include
-SRCDIR=${FREESWANSRCDIR}/linux/lib/libfreeswan
-
-VPATH = ${SRCDIR}
-
-HDRS=${KLIPSD}/freeswan.h ${SRCDIR}/internal.h
-
-LIB=libfreeswan.a
-# Original flags
-CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
-CFLAGS+= -Wall
-#CFLAGS+= -Wconversion
-#CFLAGS+= -Wmissing-prototypes
-CFLAGS+= -Wpointer-arith
-CFLAGS+= -Wcast-qual
-#CFLAGS+= -Wmissing-declarations
-CFLAGS+= -Wstrict-prototypes
-#CFLAGS+= -pedantic
-#CFLAGS+= -W
-#CFLAGS+= -Wwrite-strings
-CFLAGS+= -Wbad-function-cast 
-CFLAGS+= -DNAT_TRAVERSAL
-
-
-ARFLAGS=crvs
-EXTHDRS=des.h
-EXTLIBS=libdes.a
-MANS=anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 \
-	initaddr.3 initsubnet.3 optionsfrom.3 portof.3 rangetosubnet.3 \
-	sameaddr.3 subnetof.3 ttoaddr.3 ttodata.3 ttosa.3 ttoul.3 version.3
-
-.PHONY:	all install clean l t lt tar check depend checkprograms
-
-all:	$(LIB) 
-programs: $(LIB)
-
-install:
-	@mkdir -p $(MANDIR)
-	@for f in $(MANS) ; \
-	do \
-		$(INSTALL) $(INSTMANFLAGS) $(SRCDIR)/$$f $(MANDIR)/ipsec_$$f || exit 1 ; \
-	done
-	@$(FREESWANSRCDIR)/utils/manlink $(foreach man, $(MANS), ${SRCDIR}/$(man)) | \
-	while read from to; \
-	do \
-		ln -s -f ipsec_$$from $(MANDIR)/$$to; \
-	done
-
-
-install_file_list:
-	@for f in $(MANS) ; \
-	do \
-		echo $(MANDIR)/ipsec_$$f;\
-	done;
-	@$(FREESWANSRCDIR)/utils/manlink $(foreach man, $(MANS), ${SRCDIR}/$(man)) | \
-	while read from to; \
-	do \
-		echo $(MANDIR)/$$to; \
-	done
-
-$(LIB):	$(OBJS)
-	$(AR) $(ARFLAGS) $(LIB) $(OBJS)
-
-$(OBJS):	$(HDRS)
-
-# build version.c using version number from Makefile.ver
-version.c:	${SRCDIR}/version.in.c ${FREESWANSRCDIR}/Makefile.ver
-	sed '/"/s/xxx/$(IPSECVERSION)/' ${SRCDIR}/version.in.c >$@
-
-#libdes.a:	../libdes/libdes.a
-#	ln -f -s ../libdes/libdes.a
-#
-# yes, that's CFLAG=, not CFLAGS=
-#../libdes/libdes.a:
-#	cd ../libdes ; \
-#	if test " `arch | sed 's/^i[3456]/x/'`" = " x86" ; \
-#	then $(MAKE) CC='$(CC)' CFLAG='$(CFLAGS)' TESTING='' x86-elf ; \
-#	else $(MAKE) CC='$(CC)' CFLAG='$(CFLAGS)' libdes.a ; \
-#	fi
-
-clean:
-	rm -f $(LIB) *.o try* core *.core $(EXTHDRS) $(EXTLIBS) version.c
-
-
-# developer-only stuff
-l:
-	$(MAKE) $(LIB) ARFLAGS=crv CFLAGS=-O
-	$(RANLIB) $(LIB)
-
-t:	$(LIB) 
-	ln -f -s ${SRCDIR}/atosubnet.c try.c
-	${CC} ${CFLAGS} -DATOSUBNET_MAIN try.c $(LIB) -o try
-	./try -r
-	ln -f -s ${SRCDIR}/ttosubnet.c try1a.c
-	${CC} ${CFLAGS} -DTTOSUBNET_MAIN try1a.c $(LIB) -o try1a
-	./try1a -r
-	ln -f -s ${SRCDIR}/ttodata.c try2.c
-	${CC} ${CFLAGS} -DTTODATA_MAIN try2.c $(LIB) -o try2
-	./try2 -r
-	ln -f -s ${SRCDIR}/atoasr.c try3.c
-	${CC} ${CFLAGS} -DATOASR_MAIN try3.c $(LIB) -o try3
-	./try3 -r
-	ln -f -s ${SRCDIR}/atosa.c try4.c
-	${CC} ${CFLAGS} -DATOSA_MAIN try4.c $(LIB) -o try4
-	./try4 -r
-	ln -f -s ${SRCDIR}/ttosa.c try4a.c
-	${CC} ${CFLAGS} -DTTOSA_MAIN try4a.c $(LIB) -o try4a
-	./try4a -r
-	ln -f -s ${SRCDIR}/rangetosubnet.c try6.c
-	${CC} ${CFLAGS} -DRANGETOSUBNET_MAIN try6.c $(LIB) -o try6
-	./try6 -r
-	ln -f -s ${SRCDIR}/addrtot.c try7.c
-	${CC} ${CFLAGS} -DADDRTOT_MAIN try7.c $(LIB) -o try7
-	./try7 -r
-
-lt:	$(LIB)
-	$(MAKE) t
-	cp optionsfrom.c try5.c
-	cc -DTEST try5.c $(LIB) -o try5
-	echo --foo --bar >try5in1
-	echo --optionsfrom >>try5in1
-	echo try5in2 >>try5in1
-	echo --foo >try5in2
-	./try5 --foo --bar --optionsfrom try5in1 --bar something
-
-tar:	clean
-	tar -cvf /tmp/lib.tar Makefile [a-z]*
-
-check:
-	echo no checks in lib right now.
-
-depend:
-	makedepend -Y -- $(CFLAGS) -- $(SRCS)
-
-checkprograms:
-
-# DO NOT DELETE
-
diff --git a/src/libfreeswan/Makefile.am b/src/libfreeswan/Makefile.am
new file mode 100644
index 000000000..83f439574
--- /dev/null
+++ b/src/libfreeswan/Makefile.am
@@ -0,0 +1,20 @@
+noinst_LIBRARIES = libfreeswan.a
+libfreeswan_a_SOURCES = addrtoa.c addrtot.c addrtypeof.c anyaddr.c atoaddr.c atoasr.c \
+			atosa.c atosubnet.c atoul.c copyright.c datatot.c freeswan.h \
+			goodmask.c initaddr.c initsaid.c initsubnet.c internal.h ipcomp.h \
+			ipsec_ah.h ipsec_alg.h ipsec_encap.h ipsec_eroute.h ipsec_errs.h \
+			ipsec_esp.h ipsec_ipe4.h ipsec_kversion.h ipsec_life.h ipsec_md5h.h \
+			ipsec_param.h ipsec_policy.h ipsec_proto.h ipsec_radij.h ipsec_rcv.h \
+			ipsec_sa.h ipsec_sha1.h ipsec_stats.h ipsec_tunnel.h ipsec_xform.h \
+			ipsec_xmit.h  keyblobtoid.c optionsfrom.c pfkey_v2_build.c pfkey_v2_debug.c \
+			pfkey_v2_ext_bits.c pfkey_v2_parse.c portof.c prng.c radij.h rangetoa.c \
+			pfkey.h pfkeyv2.h rangetosubnet.c sameaddr.c satoa.c \
+			satot.c subnetof.c subnettoa.c subnettot.c \
+			subnettypeof.c ttoaddr.c ttodata.c ttoprotoport.c ttosa.c ttosubnet.c ttoul.c \
+			ultoa.c ultot.c version.c
+INCLUDES = -I$(top_srcdir)/src/pluto
+AM_CFLAGS = -DNAT_TRAVERSAL
+dist_man3_MANS = anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 initaddr.3 initsubnet.3 \
+                 keyblobtoid.3 optionsfrom.3 portof.3 prng.3 rangetosubnet.3 sameaddr.3 subnetof.3 \
+                 ttoaddr.3 ttodata.3 ttosa.3 ttoul.3 version.3
+
diff --git a/src/libfreeswan/Makefile.objs b/src/libfreeswan/Makefile.objs
deleted file mode 100644
index 41a89dba9..000000000
--- a/src/libfreeswan/Makefile.objs
+++ /dev/null
@@ -1,18 +0,0 @@
-obj-y += ultoa.o 
-obj-y += addrtoa.o 
-obj-y += subnettoa.o 
-obj-y += subnetof.o 
-obj-y += goodmask.o 
-obj-y += datatot.o 
-obj-y += rangetoa.o 
-obj-y += satoa.o 
-obj-y += prng.o 
-obj-y += pfkey_v2_parse.o 
-obj-y += pfkey_v2_build.o 
-obj-y += pfkey_v2_debug.o 
-obj-y += pfkey_v2_ext_bits.o 
-obj-y += version.o
-
-
-version.c:	${LIBFREESWANDIR}/version.in.c ${FREESWANSRCDIR}/Makefile.ver
-	sed '/"/s/xxx/$(IPSECVERSION)/' ${LIBFREESWANDIR}/version.in.c >$@
diff --git a/src/libfreeswan/freeswan.h b/src/libfreeswan/freeswan.h
index 4ef948b0a..ee2182554 100644
--- a/src/libfreeswan/freeswan.h
+++ b/src/libfreeswan/freeswan.h
@@ -43,7 +43,7 @@
 
 #endif /* __KERNEL__ */
 
-#include <freeswan/ipsec_param.h>
+#include <ipsec_param.h>
 
 
 /*
diff --git a/src/libfreeswan/pfkey.h b/src/libfreeswan/pfkey.h
new file mode 100644
index 000000000..f858cd95e
--- /dev/null
+++ b/src/libfreeswan/pfkey.h
@@ -0,0 +1,498 @@
+/*
+ * FreeS/WAN specific PF_KEY headers
+ * Copyright (C) 1999, 2000, 2001  Richard Guy Briggs.
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * RCSID $Id: pfkey.h,v 1.2 2004/03/22 21:53:18 as Exp $
+ */
+
+#ifndef __NET_IPSEC_PF_KEY_H
+#define __NET_IPSEC_PF_KEY_H
+#ifdef __KERNEL__
+extern struct proto_ops pfkey_proto_ops;
+typedef struct sock pfkey_sock;
+extern int debug_pfkey;
+
+extern /* void */ int pfkey_init(void);
+extern /* void */ int pfkey_cleanup(void);
+
+extern struct sock *pfkey_sock_list;
+struct socket_list
+{
+	struct socket *socketp;
+	struct socket_list *next;
+};
+extern int pfkey_list_insert_socket(struct socket*, struct socket_list**);
+extern int pfkey_list_remove_socket(struct socket*, struct socket_list**);
+extern struct socket_list *pfkey_open_sockets;
+extern struct socket_list *pfkey_registered_sockets[SADB_SATYPE_MAX+1];
+
+/* 
+ *	There is a field-by-field copy in klips/net/ipsec/ipsec_alg.h
+ *	please keep in sync until we migrate all support stuff
+ *	to ipsec_alg objects
+ */
+struct supported
+{
+	uint16_t supported_alg_exttype;
+	uint8_t supported_alg_id;
+	uint8_t supported_alg_ivlen;
+	uint16_t supported_alg_minbits;
+	uint16_t supported_alg_maxbits;
+};
+extern struct supported_list *pfkey_supported_list[SADB_SATYPE_MAX+1];
+struct supported_list
+{
+	struct supported *supportedp;
+	struct supported_list *next;
+};
+extern int pfkey_list_insert_supported(struct supported*, struct supported_list**);
+extern int pfkey_list_remove_supported(struct supported*, struct supported_list**);
+
+struct sockaddr_key
+{
+	uint16_t	key_family;	/* PF_KEY */
+	uint16_t	key_pad;	/* not used */
+	uint32_t	key_pid;	/* process ID */
+};
+
+struct pfkey_extracted_data
+{
+	struct ipsec_sa* ips;
+	struct ipsec_sa* ips2;
+	struct eroute *eroute;
+};
+
+extern int
+pfkey_alloc_eroute(struct eroute** eroute);
+
+extern int
+pfkey_sa_process(struct sadb_ext *pfkey_ext,
+		 struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_lifetime_process(struct sadb_ext *pfkey_ext,
+		       struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_address_process(struct sadb_ext *pfkey_ext,
+		      struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_key_process(struct sadb_ext *pfkey_ext,
+		  struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_ident_process(struct sadb_ext *pfkey_ext,
+		    struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_sens_process(struct sadb_ext *pfkey_ext,
+		   struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_prop_process(struct sadb_ext *pfkey_ext,
+		   struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_supported_process(struct sadb_ext *pfkey_ext,
+			struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_spirange_process(struct sadb_ext *pfkey_ext,
+		       struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_x_kmprivate_process(struct sadb_ext *pfkey_ext,
+			  struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_x_satype_process(struct sadb_ext *pfkey_ext,
+		       struct pfkey_extracted_data* extr);
+
+extern int
+pfkey_x_debug_process(struct sadb_ext *pfkey_ext,
+		      struct pfkey_extracted_data* extr);
+
+extern int pfkey_register_reply(int satype, struct sadb_msg *);
+extern int pfkey_upmsg(struct socket *, struct sadb_msg *);
+extern int pfkey_expire(struct ipsec_sa *, int);
+extern int pfkey_acquire(struct ipsec_sa *);
+#else /* ! __KERNEL__ */
+
+extern void (*pfkey_debug_func)(const char *message, ...);
+
+#endif /* __KERNEL__ */
+
+extern uint8_t satype2proto(uint8_t satype);
+extern uint8_t proto2satype(uint8_t proto);
+extern char* satype2name(uint8_t satype);
+extern char* proto2name(uint8_t proto);
+
+struct key_opt
+{
+	uint32_t	key_pid;	/* process ID */
+	struct sock	*sk;
+};
+
+#define key_pid(sk) ((struct key_opt*)&((sk)->protinfo))->key_pid
+
+#define IPSEC_PFKEYv2_ALIGN (sizeof(uint64_t)/sizeof(uint8_t))
+#define BITS_PER_OCTET 8
+#define OCTETBITS 8
+#define PFKEYBITS 64
+#define DIVUP(x,y) ((x + y -1) / y) /* divide, rounding upwards */
+#define ALIGN_N(x,y) (DIVUP(x,y) * y) /* align on y boundary */
+
+#define PFKEYv2_MAX_MSGSIZE 4096
+
+/*
+ * PF_KEYv2 permitted and required extensions in and out bitmaps
+ */
+struct pf_key_ext_parsers_def {
+	int  (*parser)(struct sadb_ext*);
+	char  *parser_name;
+};
+
+
+extern unsigned int extensions_bitmaps[2/*in/out*/][2/*perm/req*/][SADB_MAX + 1/*ext*/];
+#define EXT_BITS_IN 0
+#define EXT_BITS_OUT 1
+#define EXT_BITS_PERM 0
+#define EXT_BITS_REQ 1
+
+extern void pfkey_extensions_init(struct sadb_ext *extensions[SADB_EXT_MAX + 1]);
+extern void pfkey_extensions_free(struct sadb_ext *extensions[SADB_EXT_MAX + 1]);
+extern void pfkey_msg_free(struct sadb_msg **pfkey_msg);
+
+extern int pfkey_msg_parse(struct sadb_msg *pfkey_msg,
+			   struct pf_key_ext_parsers_def *ext_parsers[],
+			   struct sadb_ext **extensions,
+			   int dir);
+
+/*
+ * PF_KEYv2 build function prototypes
+ */
+
+int
+pfkey_msg_hdr_build(struct sadb_ext**	pfkey_ext,
+		    uint8_t		msg_type,
+		    uint8_t		satype,
+		    uint8_t		msg_errno,
+		    uint32_t		seq,
+		    uint32_t		pid);
+
+int
+pfkey_sa_ref_build(struct sadb_ext **	pfkey_ext,
+	       uint16_t			exttype,
+	       uint32_t			spi, /* in network order */
+	       uint8_t			replay_window,
+	       uint8_t			sa_state,
+	       uint8_t			auth,
+	       uint8_t			encrypt,
+	       uint32_t			flags,
+	       uint32_t/*IPsecSAref_t*/	ref);
+
+int
+pfkey_sa_build(struct sadb_ext **	pfkey_ext,
+	       uint16_t			exttype,
+	       uint32_t			spi, /* in network order */
+	       uint8_t			replay_window,
+	       uint8_t			sa_state,
+	       uint8_t			auth,
+	       uint8_t			encrypt,
+	       uint32_t			flags);
+
+int
+pfkey_lifetime_build(struct sadb_ext **	pfkey_ext,
+		     uint16_t		exttype,
+		     uint32_t		allocations,
+		     uint64_t		bytes,
+		     uint64_t		addtime,
+		     uint64_t		usetime,
+		     uint32_t		packets);
+
+int
+pfkey_address_build(struct sadb_ext**	pfkey_ext,
+		    uint16_t		exttype,
+		    uint8_t		proto,
+		    uint8_t		prefixlen,
+		    struct sockaddr*	address);
+
+int
+pfkey_key_build(struct sadb_ext**	pfkey_ext,
+		uint16_t		exttype,
+		uint16_t		key_bits,
+		char*			key);
+
+int
+pfkey_ident_build(struct sadb_ext**	pfkey_ext,
+		  uint16_t		exttype,
+		  uint16_t		ident_type,
+		  uint64_t		ident_id,
+		  uint8_t               ident_len,
+		  char*			ident_string);
+
+#ifdef NAT_TRAVERSAL
+#ifdef __KERNEL__
+extern int pfkey_nat_t_new_mapping(struct ipsec_sa *, struct sockaddr *, __u16);
+extern int pfkey_x_nat_t_type_process(struct sadb_ext *pfkey_ext, struct pfkey_extracted_data* extr);
+extern int pfkey_x_nat_t_port_process(struct sadb_ext *pfkey_ext, struct pfkey_extracted_data* extr);
+#endif /* __KERNEL__ */
+int
+pfkey_x_nat_t_type_build(struct sadb_ext**  pfkey_ext,
+            uint8_t         type);
+int
+pfkey_x_nat_t_port_build(struct sadb_ext**  pfkey_ext,
+            uint16_t         exttype,
+            uint16_t         port);
+#endif
+
+int
+pfkey_sens_build(struct sadb_ext**	pfkey_ext,
+		 uint32_t		dpd,
+		 uint8_t		sens_level,
+		 uint8_t		sens_len,
+		 uint64_t*		sens_bitmap,
+		 uint8_t		integ_level,
+		 uint8_t		integ_len,
+		 uint64_t*		integ_bitmap);
+
+int pfkey_x_protocol_build(struct sadb_ext **, uint8_t);
+
+
+int
+pfkey_prop_build(struct sadb_ext**	pfkey_ext,
+		 uint8_t		replay,
+		 unsigned int		comb_num,
+		 struct sadb_comb*	comb);
+
+int
+pfkey_supported_build(struct sadb_ext**	pfkey_ext,
+		      uint16_t		exttype,
+		      unsigned int	alg_num,
+		      struct sadb_alg*	alg);
+
+int
+pfkey_spirange_build(struct sadb_ext**	pfkey_ext,
+		     uint16_t		exttype,
+		     uint32_t		min,
+		     uint32_t		max);
+
+int
+pfkey_x_kmprivate_build(struct sadb_ext**	pfkey_ext);
+
+int
+pfkey_x_satype_build(struct sadb_ext**	pfkey_ext,
+		     uint8_t		satype);
+
+int
+pfkey_x_debug_build(struct sadb_ext**	pfkey_ext,
+		    uint32_t            tunnel,
+		    uint32_t		netlink,
+		    uint32_t		xform,
+		    uint32_t		eroute,
+		    uint32_t		spi,
+		    uint32_t		radij,
+		    uint32_t		esp,
+		    uint32_t		ah,
+		    uint32_t		rcv,
+		    uint32_t            pfkey,
+		    uint32_t            ipcomp,
+		    uint32_t            verbose);
+
+int
+pfkey_msg_build(struct sadb_msg**	pfkey_msg,
+		struct sadb_ext*	extensions[],
+		int			dir);
+
+/* in pfkey_v2_debug.c - routines to decode numbers -> strings */
+const char *
+pfkey_v2_sadb_ext_string(int extnum);
+
+const char *
+pfkey_v2_sadb_type_string(int sadb_type);
+
+
+#endif /* __NET_IPSEC_PF_KEY_H */
+
+/*
+ * $Log: pfkey.h,v $
+ * Revision 1.2  2004/03/22 21:53:18  as
+ * merged alg-0.8.1 branch with HEAD
+ *
+ * Revision 1.1.2.1.2.1  2004/03/16 09:48:18  as
+ * alg-0.8.1rc12 patch merged
+ *
+ * Revision 1.1.2.1  2004/03/15 22:30:06  as
+ * nat-0.6c patch merged
+ *
+ * Revision 1.1  2004/03/15 20:35:25  as
+ * added files from freeswan-2.04-x509-1.5.3
+ *
+ * Revision 1.42  2003/08/25 22:08:19  mcr
+ * 	removed pfkey_proto_init() from pfkey.h for 2.6 support.
+ *
+ * Revision 1.41  2003/05/07 17:28:57  mcr
+ * 	new function pfkey_debug_func added for us in debugging from
+ * 	pfkey library.
+ *
+ * Revision 1.40  2003/01/30 02:31:34  rgb
+ *
+ * Convert IPsecSAref_t from signed to unsigned to fix apparent SAref exhaustion bug.
+ *
+ * Revision 1.39  2002/09/20 15:40:21  rgb
+ * Switch from pfkey_alloc_ipsec_sa() to ipsec_sa_alloc().
+ * Added ref parameter to pfkey_sa_build().
+ * Cleaned out unused cruft.
+ *
+ * Revision 1.38  2002/05/14 02:37:24  rgb
+ * Change all references to tdb, TDB or Tunnel Descriptor Block to ips,
+ * ipsec_sa or ipsec_sa.
+ * Added function prototypes for the functions moved to
+ * pfkey_v2_ext_process.c.
+ *
+ * Revision 1.37  2002/04/24 07:36:49  mcr
+ * Moved from ./lib/pfkey.h,v
+ *
+ * Revision 1.36  2002/01/20 20:34:49  mcr
+ * 	added pfkey_v2_sadb_type_string to decode sadb_type to string.
+ *
+ * Revision 1.35  2001/11/27 05:27:47  mcr
+ * 	pfkey parses are now maintained by a structure
+ * 	that includes their name for debug purposes.
+ *
+ * Revision 1.34  2001/11/26 09:23:53  rgb
+ * Merge MCR's ipsec_sa, eroute, proc and struct lifetime changes.
+ *
+ * Revision 1.33  2001/11/06 19:47:47  rgb
+ * Added packet parameter to lifetime and comb structures.
+ *
+ * Revision 1.32  2001/09/08 21:13:34  rgb
+ * Added pfkey ident extension support for ISAKMPd. (NetCelo)
+ *
+ * Revision 1.31  2001/06/14 19:35:16  rgb
+ * Update copyright date.
+ *
+ * Revision 1.30  2001/02/27 07:04:52  rgb
+ * Added satype2name prototype.
+ *
+ * Revision 1.29  2001/02/26 19:59:33  rgb
+ * Ditch unused sadb_satype2proto[], replaced by satype2proto().
+ *
+ * Revision 1.28  2000/10/10 20:10:19  rgb
+ * Added support for debug_ipcomp and debug_verbose to klipsdebug.
+ *
+ * Revision 1.27  2000/09/21 04:20:45  rgb
+ * Fixed array size off-by-one error.  (Thanks Svenning!)
+ *
+ * Revision 1.26  2000/09/12 03:26:05  rgb
+ * Added pfkey_acquire prototype.
+ *
+ * Revision 1.25  2000/09/08 19:21:28  rgb
+ * Fix pfkey_prop_build() parameter to be only single indirection.
+ *
+ * Revision 1.24  2000/09/01 18:46:42  rgb
+ * Added a supported algorithms array lists, one per satype and registered
+ * existing algorithms.
+ * Fixed pfkey_list_{insert,remove}_{socket,support}() to allow change to
+ * list.
+ *
+ * Revision 1.23  2000/08/27 01:55:26  rgb
+ * Define OCTETBITS and PFKEYBITS to avoid using 'magic' numbers in code.
+ *
+ * Revision 1.22  2000/08/20 21:39:23  rgb
+ * Added kernel prototypes for kernel funcitions pfkey_upmsg() and
+ * pfkey_expire().
+ *
+ * Revision 1.21  2000/08/15 17:29:23  rgb
+ * Fixes from SZI to untested pfkey_prop_build().
+ *
+ * Revision 1.20  2000/05/10 20:14:19  rgb
+ * Fleshed out sensitivity, proposal and supported extensions.
+ *
+ * Revision 1.19  2000/03/16 14:07:23  rgb
+ * Renamed ALIGN macro to avoid fighting with others in kernel.
+ *
+ * Revision 1.18  2000/01/22 23:24:06  rgb
+ * Added prototypes for proto2satype(), satype2proto() and proto2name().
+ *
+ * Revision 1.17  2000/01/21 06:26:59  rgb
+ * Converted from double tdb arguments to one structure (extr)
+ * containing pointers to all temporary information structures.
+ * Added klipsdebug switching capability.
+ * Dropped unused argument to pfkey_x_satype_build().
+ *
+ * Revision 1.16  1999/12/29 21:17:41  rgb
+ * Changed pfkey_msg_build() I/F to include a struct sadb_msg**
+ * parameter for cleaner manipulation of extensions[] and to guard
+ * against potential memory leaks.
+ * Changed the I/F to pfkey_msg_free() for the same reason.
+ *
+ * Revision 1.15  1999/12/09 23:12:54  rgb
+ * Added macro for BITS_PER_OCTET.
+ * Added argument to pfkey_sa_build() to do eroutes.
+ *
+ * Revision 1.14  1999/12/08 20:33:25  rgb
+ * Changed sa_family_t to uint16_t for 2.0.xx compatibility.
+ *
+ * Revision 1.13  1999/12/07 19:53:40  rgb
+ * Removed unused first argument from extension parsers.
+ * Changed __u* types to uint* to avoid use of asm/types.h and
+ * sys/types.h in userspace code.
+ * Added function prototypes for pfkey message and extensions
+ * initialisation and cleanup.
+ *
+ * Revision 1.12  1999/12/01 22:19:38  rgb
+ * Change pfkey_sa_build to accept an SPI in network byte order.
+ *
+ * Revision 1.11  1999/11/27 11:55:26  rgb
+ * Added extern sadb_satype2proto to enable moving protocol lookup table
+ * to lib/pfkey_v2_parse.c.
+ * Delete unused, moved typedefs.
+ * Add argument to pfkey_msg_parse() for direction.
+ * Consolidated the 4 1-d extension bitmap arrays into one 4-d array.
+ *
+ * Revision 1.10  1999/11/23 22:29:21  rgb
+ * This file has been moved in the distribution from klips/net/ipsec to
+ * lib.
+ * Add macros for dealing with alignment and rounding up more opaquely.
+ * The uint<n>_t type defines have been moved to freeswan.h to avoid
+ * chicken-and-egg problems.
+ * Add macros for dealing with alignment and rounding up more opaque.
+ * Added prototypes for using extention header bitmaps.
+ * Added prototypes of all the build functions.
+ *
+ * Revision 1.9  1999/11/20 21:59:48  rgb
+ * Moved socketlist type declarations and prototypes for shared use.
+ * Slightly modified scope of sockaddr_key declaration.
+ *
+ * Revision 1.8  1999/11/17 14:34:25  rgb
+ * Protect sa_family_t from being used in userspace with GLIBC<2.
+ *
+ * Revision 1.7  1999/10/27 19:40:35  rgb
+ * Add a maximum PFKEY packet size macro.
+ *
+ * Revision 1.6  1999/10/26 16:58:58  rgb
+ * Created a sockaddr_key and key_opt socket extension structures.
+ *
+ * Revision 1.5  1999/06/10 05:24:41  rgb
+ * Renamed variables to reduce confusion.
+ *
+ * Revision 1.4  1999/04/29 15:21:11  rgb
+ * Add pfkey support to debugging.
+ * Add return values to init and cleanup functions.
+ *
+ * Revision 1.3  1999/04/15 17:58:07  rgb
+ * Add RCSID labels.
+ *
+ */
diff --git a/src/libfreeswan/pfkey_v2_build.c b/src/libfreeswan/pfkey_v2_build.c
index be58c552f..195add1c4 100644
--- a/src/libfreeswan/pfkey_v2_build.c
+++ b/src/libfreeswan/pfkey_v2_build.c
@@ -87,7 +87,7 @@ void (*pfkey_debug_func)(const char *message, ...) PRINTF_LIKE(1);
          KLIPS_PRINT(debug_pfkey, "klips_debug:" args)
 #endif /* __KERNEL__ */
 
-#include "freeswan/ipsec_sa.h"  /* IPSEC_SAREF_NULL, IPSEC_SA_REF_TABLE_IDX_WIDTH */
+#include "ipsec_sa.h"  /* IPSEC_SAREF_NULL, IPSEC_SA_REF_TABLE_IDX_WIDTH */
 
 #define SENDERR(_x) do { error = -(_x); goto errlab; } while (0)
 
diff --git a/src/libfreeswan/pfkey_v2_parse.c b/src/libfreeswan/pfkey_v2_parse.c
index 5d1f5a3d8..9025654a2 100644
--- a/src/libfreeswan/pfkey_v2_parse.c
+++ b/src/libfreeswan/pfkey_v2_parse.c
@@ -49,9 +49,9 @@ char pfkey_v2_parse_c_version[] = "$Id: pfkey_v2_parse.c,v 1.4 2004/06/13 20:35:
 # endif /* if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */
 extern int debug_pfkey;
 
-# include <freeswan.h>
+# include freeswan.h"
 
-#include "freeswan/ipsec_encap.h"
+#include "ipsec_encap.h"
 
 #else /* __KERNEL__ */
 
@@ -60,9 +60,9 @@ extern int debug_pfkey;
 # include <linux/errno.h>
 
 # include <freeswan.h>
-# include "src/pluto/constants.h" 
-# include "src/pluto/defs.h"  /* for PRINTF_LIKE */
-# include "src/pluto/log.h"  /* for debugging and DBG_log */
+# include <constants.h>
+# include <defs.h>  /* for PRINTF_LIKE */
+# include <log.h>  /* for debugging and DBG_log */
 
 /* #define PLUTO */
 
@@ -86,7 +86,7 @@ extern int sysctl_ipsec_debug_verbose;
 		 || (sysctl_ipsec_debug_verbose && (debug_pfkey & level & PF_KEY_DEBUG_PARSE_FLOW))) \
  		, "klips_debug:" args)
 #endif /* __KERNEL__ */
-#include "freeswan/ipsec_sa.h"  /* IPSEC_SAREF_NULL, IPSEC_SA_REF_TABLE_IDX_WIDTH */
+#include "ipsec_sa.h"  /* IPSEC_SAREF_NULL, IPSEC_SA_REF_TABLE_IDX_WIDTH */
 
 
 #define SENDERR(_x) do { error = -(_x); goto errlab; } while (0)
diff --git a/src/libfreeswan/pfkeyv2.h b/src/libfreeswan/pfkeyv2.h
new file mode 100644
index 000000000..48579e27a
--- /dev/null
+++ b/src/libfreeswan/pfkeyv2.h
@@ -0,0 +1,385 @@
+/*
+ * RCSID $Id: pfkeyv2.h,v 1.5 2004/10/04 22:43:56 as Exp $
+ */
+
+/*
+RFC 2367               PF_KEY Key Management API               July 1998
+
+
+Appendix D: Sample Header File
+
+This file defines structures and symbols for the PF_KEY Version 2
+key management interface. It was written at the U.S. Naval Research
+Laboratory. This file is in the public domain. The authors ask that
+you leave this credit intact on any copies of this file.
+*/
+#ifndef __PFKEY_V2_H
+#define __PFKEY_V2_H 1
+
+#define PF_KEY_V2 2
+#define PFKEYV2_REVISION        199806L
+
+#define SADB_RESERVED    0
+#define SADB_GETSPI      1
+#define SADB_UPDATE      2
+#define SADB_ADD         3
+#define SADB_DELETE      4
+#define SADB_GET         5
+#define SADB_ACQUIRE     6
+#define SADB_REGISTER    7
+#define SADB_EXPIRE      8
+#define SADB_FLUSH       9
+#define SADB_DUMP       10
+#define SADB_X_PROMISC  11
+#define SADB_X_PCHANGE  12
+#define SADB_X_GRPSA    13
+#define SADB_X_ADDFLOW	14
+#define SADB_X_DELFLOW	15
+#define SADB_X_DEBUG	16
+#ifdef NAT_TRAVERSAL
+#define SADB_X_NAT_T_NEW_MAPPING  17
+#define SADB_MAX                  17
+#else
+#define SADB_MAX        16
+#endif
+
+struct sadb_msg {
+  uint8_t sadb_msg_version;
+  uint8_t sadb_msg_type;
+  uint8_t sadb_msg_errno;
+  uint8_t sadb_msg_satype;
+  uint16_t sadb_msg_len;
+  uint16_t sadb_msg_reserved;
+  uint32_t sadb_msg_seq;
+  uint32_t sadb_msg_pid;
+};
+
+struct sadb_ext {
+  uint16_t sadb_ext_len;
+  uint16_t sadb_ext_type;
+};
+
+struct sadb_sa {
+  uint16_t sadb_sa_len;
+  uint16_t sadb_sa_exttype;
+  uint32_t sadb_sa_spi;
+  uint8_t sadb_sa_replay;
+  uint8_t sadb_sa_state;
+  uint8_t sadb_sa_auth;
+  uint8_t sadb_sa_encrypt;
+  uint32_t sadb_sa_flags;
+  uint32_t /*IPsecSAref_t*/ sadb_x_sa_ref; /* 32 bits */
+  uint8_t sadb_x_reserved[4];
+};
+
+struct sadb_sa_v1 {
+  uint16_t sadb_sa_len;
+  uint16_t sadb_sa_exttype;
+  uint32_t sadb_sa_spi;
+  uint8_t sadb_sa_replay;
+  uint8_t sadb_sa_state;
+  uint8_t sadb_sa_auth;
+  uint8_t sadb_sa_encrypt;
+  uint32_t sadb_sa_flags;
+};
+
+struct sadb_lifetime {
+  uint16_t sadb_lifetime_len;
+  uint16_t sadb_lifetime_exttype;
+  uint32_t sadb_lifetime_allocations;
+  uint64_t sadb_lifetime_bytes;
+  uint64_t sadb_lifetime_addtime;
+  uint64_t sadb_lifetime_usetime;
+  uint32_t sadb_x_lifetime_packets;
+  uint32_t sadb_x_lifetime_reserved;
+};
+
+struct sadb_address {
+  uint16_t sadb_address_len;
+  uint16_t sadb_address_exttype;
+  uint8_t sadb_address_proto;
+  uint8_t sadb_address_prefixlen;
+  uint16_t sadb_address_reserved;
+};
+
+struct sadb_key {
+  uint16_t sadb_key_len;
+  uint16_t sadb_key_exttype;
+  uint16_t sadb_key_bits;
+  uint16_t sadb_key_reserved;
+};
+
+struct sadb_ident {
+  uint16_t sadb_ident_len;
+  uint16_t sadb_ident_exttype;
+  uint16_t sadb_ident_type;
+  uint16_t sadb_ident_reserved;
+  uint64_t sadb_ident_id;
+};
+
+struct sadb_sens {
+  uint16_t sadb_sens_len;
+  uint16_t sadb_sens_exttype;
+  uint32_t sadb_sens_dpd;
+  uint8_t sadb_sens_sens_level;
+  uint8_t sadb_sens_sens_len;
+  uint8_t sadb_sens_integ_level;
+  uint8_t sadb_sens_integ_len;
+  uint32_t sadb_sens_reserved;
+};
+
+struct sadb_prop {
+  uint16_t sadb_prop_len;
+  uint16_t sadb_prop_exttype;
+  uint8_t sadb_prop_replay;
+  uint8_t sadb_prop_reserved[3];
+};
+
+struct sadb_comb {
+  uint8_t sadb_comb_auth;
+  uint8_t sadb_comb_encrypt;
+  uint16_t sadb_comb_flags;
+  uint16_t sadb_comb_auth_minbits;
+  uint16_t sadb_comb_auth_maxbits;
+  uint16_t sadb_comb_encrypt_minbits;
+  uint16_t sadb_comb_encrypt_maxbits;
+  uint32_t sadb_comb_reserved;
+  uint32_t sadb_comb_soft_allocations;
+  uint32_t sadb_comb_hard_allocations;
+  uint64_t sadb_comb_soft_bytes;
+  uint64_t sadb_comb_hard_bytes;
+  uint64_t sadb_comb_soft_addtime;
+  uint64_t sadb_comb_hard_addtime;
+  uint64_t sadb_comb_soft_usetime;
+  uint64_t sadb_comb_hard_usetime;
+  uint32_t sadb_x_comb_soft_packets;
+  uint32_t sadb_x_comb_hard_packets;
+};
+
+struct sadb_supported {
+  uint16_t sadb_supported_len;
+  uint16_t sadb_supported_exttype;
+  uint32_t sadb_supported_reserved;
+};
+
+struct sadb_alg {
+  uint8_t sadb_alg_id;
+  uint8_t sadb_alg_ivlen;
+  uint16_t sadb_alg_minbits;
+  uint16_t sadb_alg_maxbits;
+  uint16_t sadb_alg_reserved;
+};
+
+struct sadb_spirange {
+  uint16_t sadb_spirange_len;
+  uint16_t sadb_spirange_exttype;
+  uint32_t sadb_spirange_min;
+  uint32_t sadb_spirange_max;
+  uint32_t sadb_spirange_reserved;
+};
+
+struct sadb_x_kmprivate {
+  uint16_t sadb_x_kmprivate_len;
+  uint16_t sadb_x_kmprivate_exttype;
+  uint32_t sadb_x_kmprivate_reserved;
+};
+
+struct sadb_x_satype {
+  uint16_t sadb_x_satype_len;
+  uint16_t sadb_x_satype_exttype;
+  uint8_t sadb_x_satype_satype;
+  uint8_t sadb_x_satype_reserved[3];
+};
+  
+struct sadb_x_policy {
+  uint16_t sadb_x_policy_len;
+  uint16_t sadb_x_policy_exttype;
+  uint16_t sadb_x_policy_type;
+  uint8_t sadb_x_policy_dir;
+  uint8_t sadb_x_policy_reserved;
+  uint32_t sadb_x_policy_id;
+  uint32_t sadb_x_policy_reserved2;
+};
+ 
+struct sadb_x_debug {
+  uint16_t sadb_x_debug_len;
+  uint16_t sadb_x_debug_exttype;
+  uint32_t sadb_x_debug_tunnel;
+  uint32_t sadb_x_debug_netlink;
+  uint32_t sadb_x_debug_xform;
+  uint32_t sadb_x_debug_eroute;
+  uint32_t sadb_x_debug_spi;
+  uint32_t sadb_x_debug_radij;
+  uint32_t sadb_x_debug_esp;
+  uint32_t sadb_x_debug_ah;
+  uint32_t sadb_x_debug_rcv;
+  uint32_t sadb_x_debug_pfkey;
+  uint32_t sadb_x_debug_ipcomp;
+  uint32_t sadb_x_debug_verbose;
+  uint8_t sadb_x_debug_reserved[4];
+};
+
+#ifdef NAT_TRAVERSAL
+struct sadb_x_nat_t_type {
+  uint16_t sadb_x_nat_t_type_len;
+  uint16_t sadb_x_nat_t_type_exttype;
+  uint8_t sadb_x_nat_t_type_type;
+  uint8_t sadb_x_nat_t_type_reserved[3];
+};
+struct sadb_x_nat_t_port {
+  uint16_t sadb_x_nat_t_port_len;
+  uint16_t sadb_x_nat_t_port_exttype;
+  uint16_t sadb_x_nat_t_port_port;
+  uint16_t sadb_x_nat_t_port_reserved;
+};
+#endif
+  
+/*
+ * A protocol structure for passing through the transport level
+ * protocol.  It contains more fields than are actually used/needed
+ * but it is this way to be compatible with the structure used in
+ * OpenBSD (http://www.openbsd.org/cgi-bin/cvsweb/src/sys/net/pfkeyv2.h)
+ */
+struct sadb_protocol {
+  uint16_t sadb_protocol_len;
+  uint16_t sadb_protocol_exttype;
+  uint8_t  sadb_protocol_proto;
+  uint8_t  sadb_protocol_direction;
+  uint8_t  sadb_protocol_flags;
+  uint8_t  sadb_protocol_reserved2;
+};
+
+#define SADB_EXT_RESERVED             0
+#define SADB_EXT_SA                   1
+#define SADB_EXT_LIFETIME_CURRENT     2
+#define SADB_EXT_LIFETIME_HARD        3
+#define SADB_EXT_LIFETIME_SOFT        4
+#define SADB_EXT_ADDRESS_SRC          5
+#define SADB_EXT_ADDRESS_DST          6
+#define SADB_EXT_ADDRESS_PROXY        7
+#define SADB_EXT_KEY_AUTH             8
+#define SADB_EXT_KEY_ENCRYPT          9
+#define SADB_EXT_IDENTITY_SRC         10
+#define SADB_EXT_IDENTITY_DST         11
+#define SADB_EXT_SENSITIVITY          12
+#define SADB_EXT_PROPOSAL             13
+#define SADB_EXT_SUPPORTED_AUTH       14
+#define SADB_EXT_SUPPORTED_ENCRYPT    15
+#define SADB_EXT_SPIRANGE             16
+#define SADB_X_EXT_KMPRIVATE          17
+#define SADB_X_EXT_SATYPE2            18
+#ifdef KERNEL26_HAS_KAME_DUPLICATES
+#define SADB_X_EXT_POLICY             18
+#endif
+#define SADB_X_EXT_SA2                19
+#define SADB_X_EXT_ADDRESS_DST2       20
+#define SADB_X_EXT_ADDRESS_SRC_FLOW   21
+#define SADB_X_EXT_ADDRESS_DST_FLOW   22
+#define SADB_X_EXT_ADDRESS_SRC_MASK   23
+#define SADB_X_EXT_ADDRESS_DST_MASK   24
+#define SADB_X_EXT_DEBUG              25
+#define SADB_X_EXT_PROTOCOL           26
+#ifdef NAT_TRAVERSAL
+#define SADB_X_EXT_NAT_T_TYPE         27
+#define SADB_X_EXT_NAT_T_SPORT        28
+#define SADB_X_EXT_NAT_T_DPORT        29
+#define SADB_X_EXT_NAT_T_OA           30
+#define SADB_EXT_MAX                  30
+#else
+#define SADB_EXT_MAX                  26
+#endif
+
+/* SADB_X_DELFLOW required over and above SADB_X_SAFLAGS_CLEARFLOW */
+#define SADB_X_EXT_ADDRESS_DELFLOW \
+	( (1<<SADB_X_EXT_ADDRESS_SRC_FLOW) \
+	| (1<<SADB_X_EXT_ADDRESS_DST_FLOW) \
+	| (1<<SADB_X_EXT_ADDRESS_SRC_MASK) \
+	| (1<<SADB_X_EXT_ADDRESS_DST_MASK))
+
+#define SADB_SATYPE_UNSPEC    0
+#define SADB_SATYPE_AH        2
+#define SADB_SATYPE_ESP       3
+#define SADB_SATYPE_RSVP      5
+#define SADB_SATYPE_OSPFV2    6
+#define SADB_SATYPE_RIPV2     7
+#define SADB_SATYPE_MIP       8
+#define SADB_X_SATYPE_IPIP    9
+#ifdef KERNEL26_HAS_KAME_DUPLICATES
+#define SADB_X_SATYPE_IPCOMP  9   /* ICK! */
+#endif
+#define SADB_X_SATYPE_COMP    10
+#define SADB_X_SATYPE_INT     11
+#define SADB_SATYPE_MAX       11
+
+#define SADB_SASTATE_LARVAL   0
+#define SADB_SASTATE_MATURE   1
+#define SADB_SASTATE_DYING    2
+#define SADB_SASTATE_DEAD     3
+#define SADB_SASTATE_MAX      3
+
+#define SADB_SAFLAGS_PFS		1
+#define SADB_X_SAFLAGS_REPLACEFLOW	2
+#define SADB_X_SAFLAGS_CLEARFLOW	4
+#define SADB_X_SAFLAGS_INFLOW		8
+
+/* not obvious, but these are the same values as used in isakmp,
+ * and in freeswan/ipsec_policy.h. If you need to add any, they
+ * should be added as according to
+ *   http://www.iana.org/assignments/isakmp-registry
+ *
+ * and if not, then please try to use a private-use value, and
+ * consider asking IANA to assign a value.
+ */
+#define SADB_AALG_NONE                  0
+#define SADB_AALG_MD5_HMAC		2
+#define SADB_AALG_SHA1_HMAC		3
+#define SADB_AALG_DES_MAC		4
+#define SADB_AALG_SHA2_256_HMAC		5
+#define SADB_AALG_SHA2_384_HMAC		6
+#define SADB_AALG_SHA2_512_HMAC		7
+#define SADB_AALG_RIPEMD_160_HMAC	8
+#define SADB_AALG_AES_XCBC_MAC		9
+#define SADB_X_AALG_NULL		251	/* kame */
+#define SADB_AALG_MAX			251
+
+#define SADB_EALG_NONE			0
+#define SADB_EALG_DES_CBC		2
+#define SADB_EALG_3DES_CBC		3
+#define SADB_EALG_RC5_CBC		4
+#define SADB_EALG_IDEA_CBC		5
+#define SADB_EALG_CAST_CBC		6
+#define SADB_EALG_BLOWFISH_CBC		7
+#define SADB_EALG_NULL			11
+#define SADB_EALG_AES_CBC		12
+#define SADB_EALG_AES_CTR		13
+#define SADB_X_EALG_SERPENT_CBC		252
+#define SADB_X_EALG_TWOFISH_CBC		253
+#define SADB_EALG_MAX			253
+
+#define SADB_X_CALG_NONE          0
+#define SADB_X_CALG_OUI           1
+#define SADB_X_CALG_DEFLATE       2
+#define SADB_X_CALG_LZS           3
+#define SADB_X_CALG_V42BIS        4
+#ifdef KERNEL26_HAS_KAME_DUPLICATES
+#define SADB_X_CALG_LZJH          4
+#endif
+#define SADB_X_CALG_MAX           4
+
+#define SADB_X_TALG_NONE          0
+#define SADB_X_TALG_IPv4_in_IPv4  1
+#define SADB_X_TALG_IPv6_in_IPv4  2
+#define SADB_X_TALG_IPv4_in_IPv6  3
+#define SADB_X_TALG_IPv6_in_IPv6  4
+#define SADB_X_TALG_MAX           4
+
+
+#define SADB_IDENTTYPE_RESERVED   0
+#define SADB_IDENTTYPE_PREFIX     1
+#define SADB_IDENTTYPE_FQDN       2
+#define SADB_IDENTTYPE_USERFQDN   3
+#define SADB_X_IDENTTYPE_CONNECTION 4
+#define SADB_IDENTTYPE_MAX        4
+
+#define SADB_KEY_FLAGS_MAX     0
+#endif /* __PFKEY_V2_H */
diff --git a/src/libfreeswan/version.in.c b/src/libfreeswan/version.c
similarity index 87%
rename from src/libfreeswan/version.in.c
rename to src/libfreeswan/version.c
index b3556f721..3a947b1b9 100644
--- a/src/libfreeswan/version.in.c
+++ b/src/libfreeswan/version.c
@@ -21,9 +21,8 @@
 
 #include "freeswan.h"
 
-#define	V	"xxx"		/* substituted in by Makefile */
-static const char strongswan_number[] = V;
-static const char strongswan_string[] = "Linux strongSwan " V;
+static const char strongswan_number[] = VERSION;
+static const char strongswan_string[] = "Linux strongSwan " VERSION;
 
 /*
  - ipsec_version_code - return IPsec version number/code, as string
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
new file mode 100644
index 000000000..e9827a860
--- /dev/null
+++ b/src/libstrongswan/Makefile.am
@@ -0,0 +1,71 @@
+lib_LTLIBRARIES = libstrongswan.la
+
+libstrongswan_la_SOURCES = \
+crypto/rsa/rsa_private_key.c \
+crypto/rsa/rsa_public_key.h \
+crypto/rsa/rsa_private_key.h \
+crypto/rsa/rsa_public_key.c \
+crypto/prfs/hmac_prf.c \
+crypto/prfs/hmac_prf.h \
+crypto/prfs/prf.c \
+crypto/prfs/prf.h \
+crypto/signers/hmac_signer.c \
+crypto/signers/hmac_signer.h \
+crypto/signers/signer.c \
+crypto/signers/signer.h \
+crypto/crypters/aes_cbc_crypter.c \
+crypto/crypters/crypter.c \
+crypto/crypters/aes_cbc_crypter.h \
+crypto/crypters/crypter.h \
+crypto/hashers/sha1_hasher.c \
+crypto/hashers/md5_hasher.c \
+crypto/hashers/hasher.h \
+crypto/hashers/md5_hasher.h \
+crypto/hashers/hasher.c \
+crypto/hashers/sha1_hasher.h \
+crypto/diffie_hellman.c \
+crypto/prf_plus.h \
+crypto/x509.c \
+crypto/prf_plus.c \
+crypto/hmac.c \
+crypto/x509.h \
+crypto/hmac.h \
+crypto/diffie_hellman.h \
+utils/identification.h \
+utils/iterator.h \
+utils/linked_list.c \
+utils/linked_list.h \
+utils/tester.c \
+utils/leak_detective.c \
+utils/logger_manager.c \
+utils/randomizer.c \
+utils/tester.h \
+utils/leak_detective.h \
+utils/host.c \
+utils/logger_manager.h \
+utils/randomizer.h \
+utils/logger.c \
+utils/host.h \
+utils/logger.h \
+utils/identification.c \
+utils/lexparser.c \
+utils/lexparser.h \
+asn1/ttodata.c \
+asn1/oid.h \
+asn1/ttodata.h \
+asn1/pem.c \
+asn1/asn1.c \
+asn1/pem.h \
+asn1/asn1.h \
+asn1/oid.c \
+definitions.h \
+types.h \
+definitions.c \
+library.c \
+types.c \
+library.h 
+
+LDADD = -lgmp -lpthread
+
+INCLUDES = -I$(top_srcdir)/src/libstrongswan
+EXTRA_DIST = asn1/oid.txt asn1/oid.pl
diff --git a/src/openac/Makefile b/src/openac/Makefile
deleted file mode 100644
index 7aeacee0a..000000000
--- a/src/openac/Makefile
+++ /dev/null
@@ -1,154 +0,0 @@
-# Makefile for the openac attribute certificate generation tool
-# Copyright (C) 2004  Andreas Steffen
-# Zuercher Hochschule Winterthur
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.16 2006/02/17 19:33:27 as Exp $
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-CONFDIR=$(DESTDIR)/etc/openac
-PLUTODIR=../pluto
-
-PROGRAM=openac
-EXTRA8PROC=${PROGRAM}.8
-
-LIBS=${FREESWANLIB} $(LIBDESLITE) -lgmp
-CFLAGS+= -DDEBUG -DNO_PLUTO
-
-# This compile option activates the leak detective
-ifeq ($(USE_LEAK_DETECTIVE),true)
-  CFLAGS+= -DLEAK_DETECTIVE
-endif
-
-X509_OBJS= ac.o asn1.o ca.o certs.o constants.o crl.o defs.o mp_defs.o fetch.o \
-           id.o keys.o lex.o md2.o md5.o ocsp.o oid.o pem.o pgp.o pkcs1.o \
-           rnd.o sha1.o smartcard.o x509.o
-
-OBJS= build.o loglite.o ${X509_OBJS}
-
-include ../Makefile.program
-
-build.o : build.c build.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-loglite.o : loglite.c $(PLUTODIR)/log.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-# X.509 library
-
-ac.o : $(PLUTODIR)/ac.c $(PLUTODIR)/ac.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-asn1.o : $(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-ca.o : $(PLUTODIR)/ca.c $(PLUTODIR)/ca.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-certs.o : $(PLUTODIR)/certs.c $(PLUTODIR)/certs.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-constants.o : $(PLUTODIR)/constants.c $(PLUTODIR)/constants.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-crl.o : $(PLUTODIR)/crl.c $(PLUTODIR)/crl.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-defs.o : $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-mp_defs.o : $(PLUTODIR)/mp_defs.c $(PLUTODIR)/mp_defs.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-fetch.o : $(PLUTODIR)/fetch.c $(PLUTODIR)/fetch.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-id.o : $(PLUTODIR)/id.c $(PLUTODIR)/id.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-keys.o : $(PLUTODIR)/keys.c $(PLUTODIR)/keys.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-lex.o : $(PLUTODIR)/lex.c $(PLUTODIR)/lex.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-md2.o : $(PLUTODIR)/md2.c $(PLUTODIR)/md2.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-md5.o : $(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-ocsp.o : $(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-oid.o : $(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-pem.o : $(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-pgp.o : $(PLUTODIR)/pgp.c $(PLUTODIR)/pgp.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-pkcs1.o : $(PLUTODIR)/pkcs1.c $(PLUTODIR)/pkcs1.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-rnd.o : $(PLUTODIR)/rnd.c $(PLUTODIR)/rnd.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-sha1.o : $(PLUTODIR)/sha1.c $(PLUTODIR)/sha1.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-smartcard.o : $(PLUTODIR)/smartcard.c $(PLUTODIR)/smartcard.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-x509.o : $(PLUTODIR)/x509.c $(PLUTODIR)/x509.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-# Stolen from pluto/Makefile
-
-gatherdeps:
-		@ls | grep '\.c$$' | sed -e 's/\(.*\)\.c$$/\1.o: \1.c/'
-		@echo
-		@ls | grep '\.c$$' | xargs grep '^#[    ]*include[      ]*"' | \
-                sed -e 's/\.c:#[        ]*include[      ]*"/.o: /' -e 's/".*//'
-
-# Dependencies generated by "make gatherdeps":
-
-build.o: build.c
-loglite.o: loglite.c
-openac.o: openac.c
-
-build.o: ../pluto/constants.h
-build.o: ../pluto/defs.h
-build.o: ../pluto/oid.h
-build.o: ../pluto/asn1.h
-build.o: ../pluto/x509.h
-build.o: ../pluto/log.h
-build.o: build.h
-loglite.o: ../pluto/constants.h
-loglite.o: ../pluto/defs.h
-loglite.o: ../pluto/log.h
-loglite.o: ../pluto/whack.h
-openac.o: ../pluto/constants.h
-openac.o: ../pluto/defs.h
-openac.o: ../pluto/mp_defs.h
-openac.o: ../pluto/log.h
-openac.o: ../pluto/asn1.h
-openac.o: ../pluto/certs.h
-openac.o: ../pluto/x509.h
-openac.o: ../pluto/crl.h
-openac.o: ../pluto/keys.h
-openac.o: ../pluto/ac.h
-openac.o: build.h
diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
new file mode 100644
index 000000000..d36313fa1
--- /dev/null
+++ b/src/openac/Makefile.am
@@ -0,0 +1,83 @@
+ipsec_PROGRAMS = openac
+openac_SOURCES = openac.c build.c build.h loglite.c
+
+INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto -I$(top_srcdir)/src/libcrypto -I$(top_srcdir)/src/whack
+AM_CFLAGS = -DDEBUG -DNO_PLUTO -DIPSEC_CONFDIR=\"${confdir}\"
+openac_LDADD = ac.o asn1.o ca.o certs.o constants.o crl.o defs.o mp_defs.o fetch.o id.o keys.o lex.o \
+               md2.o md5.o ocsp.o oid.o pem.o pgp.o pkcs1.o rnd.o sha1.o smartcard.o x509.o \
+               $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
+               -lgmp
+
+dist_man_MANS = openac.8
+
+PLUTODIR=$(top_srcdir)/src/pluto
+
+ac.o :		$(PLUTODIR)/ac.c $(PLUTODIR)/ac.h
+		$(COMPILE) -c -o $@ $<
+
+asn1.o :	$(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h
+		$(COMPILE) -c -o $@ $<
+
+ca.o :		$(PLUTODIR)/ca.c $(PLUTODIR)/ca.h
+		$(COMPILE) -c -o $@ $<
+
+certs.o :	$(PLUTODIR)/certs.c $(PLUTODIR)/certs.h
+		$(COMPILE) -c -o $@ $<
+
+constants.o :	$(PLUTODIR)/constants.c $(PLUTODIR)/constants.h
+		$(COMPILE) -c -o $@ $<
+
+crl.o : 	$(PLUTODIR)/crl.c $(PLUTODIR)/crl.h
+		$(COMPILE) -c -o $@ $<
+
+defs.o : 	$(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
+		$(COMPILE) -c -o $@ $<
+
+mp_defs.o :	$(PLUTODIR)/mp_defs.c $(PLUTODIR)/mp_defs.h
+		$(COMPILE) -c -o $@ $<
+
+fetch.o : 	$(PLUTODIR)/fetch.c $(PLUTODIR)/fetch.h
+		$(COMPILE) -c -o $@ $<
+
+id.o : 		$(PLUTODIR)/id.c $(PLUTODIR)/id.h
+		$(COMPILE) -c -o $@ $<
+
+keys.o :	$(PLUTODIR)/keys.c $(PLUTODIR)/keys.h
+		$(COMPILE) -c -o $@ $<
+
+lex.o :		$(PLUTODIR)/lex.c $(PLUTODIR)/lex.h
+		$(COMPILE) -c -o $@ $<
+
+md2.o :		$(PLUTODIR)/md2.c $(PLUTODIR)/md2.h
+		$(COMPILE) -c -o $@ $<
+
+md5.o :		$(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
+		$(COMPILE) -c -o $@ $<
+
+ocsp.o :	$(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
+		$(COMPILE) -c -o $@ $<
+
+oid.o :		$(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
+		$(COMPILE) -c -o $@ $<
+
+pem.o :		$(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
+		$(COMPILE) -c -o $@ $<
+
+pgp.o :		$(PLUTODIR)/pgp.c $(PLUTODIR)/pgp.h
+		$(COMPILE) -c -o $@ $<
+
+pkcs1.o :	$(PLUTODIR)/pkcs1.c $(PLUTODIR)/pkcs1.h
+		$(COMPILE) -c -o $@ $<
+
+rnd.o :		$(PLUTODIR)/rnd.c $(PLUTODIR)/rnd.h
+		$(COMPILE) -c -o $@ $<
+
+sha1.o :	$(PLUTODIR)/sha1.c $(PLUTODIR)/sha1.h
+		$(COMPILE) -c -o $@ $<
+
+smartcard.o :	$(PLUTODIR)/smartcard.c $(PLUTODIR)/smartcard.h
+		$(COMPILE) -c -o $@ $<
+
+x509.o :	$(PLUTODIR)/x509.c $(PLUTODIR)/x509.h
+		$(COMPILE) -c -o $@ $<
+
diff --git a/src/openac/loglite.c b/src/openac/loglite.c
index b1763cc9f..4219eb707 100644
--- a/src/openac/loglite.c
+++ b/src/openac/loglite.c
@@ -30,10 +30,10 @@
 
 #include <freeswan.h>
 
-#include "../pluto/constants.h"
-#include "../pluto/defs.h"
-#include "../pluto/log.h"
-#include "../pluto/whack.h"
+#include <constants.h>
+#include <defs.h>
+#include <log.h>
+#include <whack.h>
 
 bool
     log_to_stderr = FALSE,	/* should log go to stderr? */
diff --git a/src/openac/openac.c b/src/openac/openac.c
index 524a302d7..00f287b3a 100755
--- a/src/openac/openac.c
+++ b/src/openac/openac.c
@@ -40,8 +40,8 @@
 
 #include "build.h"
 
-#define OPENAC_PATH	"/etc/openac"
-#define OPENAC_SERIAL	"/etc/openac/serial"
+#define OPENAC_PATH   IPSEC_CONFDIR "/openac"
+#define OPENAC_SERIAL IPSEC_CONFDIR "/openac/serial"
 
 const char openac_version[] = "openac 0.3";
 
diff --git a/src/pluto/Makefile b/src/pluto/Makefile
deleted file mode 100644
index c2660fd4f..000000000
--- a/src/pluto/Makefile
+++ /dev/null
@@ -1,1095 +0,0 @@
-# Pluto Makefile
-# Copyright (C) 1997 Angelos D. Keromytis.
-# Copyright (C) 1998-2001  D. Hugh Redelmeier
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.44 2006/01/25 17:22:19 as Exp $
-
-# relative path to top directory of FreeS/WAN source
-# Note: referenced in ${FREESWANSRCDIR}/Makefile.inc
-FREESWANSRCDIR=../..
-
-include ${FREESWANSRCDIR}/Makefile.inc
-
-FMANDIR=$(MANTREE)/man5
-PMANDIR=$(MANTREE)/man8
-
-# -O on Linux makes gcc coredump when compiling sha1.c
-# -Wundef is nice but RHL5.2 compiler doesn't support it
-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
-	-Wcast-qual -Wmissing-declarations -Wwrite-strings \
-	-Wstrict-prototypes # -Wundef
-
-# where to find klips headers and FreeS/WAN headers
-HDRDIRS = -I$(KLIPSINC) -I${FREESWANSRCDIR}/programs/pluto/linux26
-
-# where to find sha2.h
-LIBCRYPTO=$(FREESWANSRCDIR)/lib/libcrypto
-HDRDIRS += -I$(LIBCRYPTO)
-
-# On non-LINUX systems, these one of these may be needed (see endian.h)
-# BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN
-# BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=LITTLE_ENDIAN
-
-# -DKLIPS enables interface to Kernel LINUX IPsec code
-# -DDEBUG enables debugging code, allowing for debugging output
-#    (note that output must also be selected at runtime, so it is
-#    reasonable to always define this)
-# -DVENDORID enables Pluto to send out a VendorID payload.
-#    this can be used by remote nodes to work around faults (bugs),
-#    but is most useful to humans who are debugging things.
-# -DGCC_LINT uses gcc-specific declarations to improve compile-time
-#    diagnostics.
-# -DLEAK_DETECTIVE enables crude code to find memory allocation leaks.
-# -DOLD_RESOLVER.  At some point, the resolver interface changed.
-#    This macro enables Pluto support for the old interface.
-#    It is automatically defined, based on the value of the <resolver.h>
-#    macro __RES.  We don't know the correct threshold, so you may
-#    find that you must manually define this.  If so, please inform
-#    us so that we can refine the threshold.
-# -DLIBCURL includes libcurl functions for the support of http-based protocols.
-# -DLDAP_VER includes openldap functions for the support of ldap-based queries.
-#    LDAPv2 and LDAPv3 are supported.
-# -DTHREADS enables an asynchronous thread managing CRL fetching.
-#    This option is activated either by -DLIBCURL or -DLDAP_VER.
-# -DSMARTCARD enables PKCS11-based smartcard support
-# -DPKCS11_DEFAULT_LIB defines a default PKCS11 library module which will be
-#    loaded during runtime and is overridden by the pkcs11module parameter in
-#    ipsec.conf. This option is activated by -DSMARTCARD.
-# -DI_KNOW_TRANSPORT_MODE_HAS_SECURITY_CONCERN_BUT_I_WANT_IT
-#     allows IPsec transport mode in NAT-ed environments. Because of the 
-#     inherent security risks of such scenarios this options is deactivated
-#     by default.
-
-# The following are best left undefined -- each can be overridden at runtime
-# if need be.
-# -DPORT=n sets the default UDP port for IKE messages (otherwise 500)
-# -DSHARED_SECRETS_FILE=string overrides /etc/ipsec.secrets as the
-#    default name of the file containing secrets used to authenticate other
-#    IKE daemons.  In the Makefile, two levels of quoting are needed:
-# -DSHARED_SECRETS_FILE='"/etc/ipsec.secrets"'
-# -DDEFAULT_CTLBASE=string overrides /var/run/pluto as default directory
-#    and basename for pluto's lockfile (.pid) and control socket (.ctl).
-#    Double quoting may be needed.
-
-ifeq ($(USE_LWRES),true)
-  LWRESDEF=-DUSE_LWRES
-  USE_ADNS=false
-  BINNAMEADNSIFNEEDE=
-else
-  USE_ADNS=true
-  BINNAMEADNSIFNEEDED=$(BINNAMEADNS)
-endif
-
-ifeq ($(USE_IPSECPOLICY),true)
-  IPSECPOLICY_FILES=rcv_info.c
-  IPSECPOLICY_DEFINES=-DIPSECPOLICY
-  IPSECPOLICY_LIBS=$(POLICYLIB)
-  IPSECPOLICY_OBJS=rcv_info.o
-endif
-
-ifeq ($(USE_KEYRR),true)
-  KEYRR_DEFINES=-DUSE_KEYRR
-endif
-
-ifeq ($(USE_KERNEL26),true)
-  KERNEL26_DEFS=-DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES
-  KERNEL26_SRCS=kernel_netlink.c kernel_netlink.h
-  KERNEL26_OBJS=kernel_netlink.o
-endif
-
-ifeq ($(USE_NAT_TRAVERSAL),true)
-NAT_DEFS=-DNAT_TRAVERSAL -DVIRTUAL_IP
-endif
-
-ifeq ($(USE_NAT_TRAVERSAL_TRANSPORT_MODE),true)
-NAT_DEFS+=-DI_KNOW_TRANSPORT_MODE_HAS_SECURITY_CONCERN_BUT_I_WANT_IT
-endif
-
-DEFINES = $(EXTRA_DEFINES) \
-	$(IPSECPOLICY_DEFINES) \
-	$(KEYRR_DEFINES) \
-	$(BYTE_ORDER) \
-	$(LWRESDEF) \
-	$(KERNEL26_DEFS) \
-	-DPLUTO \
-	-DKLIPS \
-	-DDEBUG \
-	-DGCC_LINT \
-	$(NAT_DEFS)
-
-# libefence is a free memory allocation debugger
-# Solaris 2 needs -lsocket -lnsl
-LIBSPLUTO = $(OBJSGCRYPT) $(LIBDESLITE) $(FREESWANLIB) $(IPSECPOLICY_LIBS)
-LIBSPLUTO+= -lgmp -lresolv # -lefence
-
-
-ifeq ($(USE_VENDORID),true)
-  DEFINES+= -DVENDORID
-endif
-
-ifeq ($(USE_XAUTH_VID),true)
-  DEFINES+= -DXAUTH_VID
-endif
-
-# This compile option activates dynamic URL fetching using libcurl
-ifeq ($(USE_LIBCURL),true)
-  DEFINES+= -DLIBCURL
-  LIBSPLUTO+= -lcurl
-  THREADS=1   # Asynchronous cURL queries require threads
-endif
-
-# This compile option activates dynamic LDAP CRL fetching
-ifeq ($(USE_LDAP),true)
-  DEFINES+= -DLDAP_VER=$(LDAP_VERSION)
-  LIBSPLUTO+= -lldap -llber
-  THREADS=1   # Asynchronous LDAP queries require threads
-endif
-
-# This compile option activates the use of threads
-ifdef THREADS
-  DEFINES+= -DTHREADS
-  LIBSPLUTO+= -lpthread
-endif
-
-# This compile option activates smartcard support
-ifeq ($(USE_SMARTCARD),true)
-  DEFINES+= -DSMARTCARD
-  ifdef PKCS11_DEFAULT_LIB
-    DEFINES+= -DPKCS11_DEFAULT_LIB=$(PKCS11_DEFAULT_LIB)
-  endif
-  LIBSPLUTO+= -ldl
-endif
-
-# enable IKEv2 support
-ifeq ($(USE_IKEV2),true)
-  DEFINES+= -DIKEV2
-endif
-
-# This compile option activates the leak detective
-ifeq ($(USE_LEAK_DETECTIVE),true)
-  DEFINES+= -DLEAK_DETECTIVE
-endif
-
-CPPFLAGS = $(HDRDIRS) $(DEFINES) \
-	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
-	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
-	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
-
-ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
-
-ifneq ($(LD_LIBRARY_PATH),)
-  LDFLAGS=-L$(LD_LIBRARY_PATH)
-endif
-
-LIBSADNS = $(FREESWANLIB)
-LIBSADNS += -lresolv # -lefence
-
-# Solaris needs -lsocket -lnsl
-LIBSWHACK = ${FREESWANLIB}
-
-BINNAMEPLUTO = pluto
-BINNAMEWHACK = whack
-BINNAMEADNS = _pluto_adns
-
-RM = /bin/rm
-RMFLAGS = -f
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-# files for a (source) distribution
-
-DISTMISC = CHANGES PLUTO-CONVENTIONS TODO ipsec.secrets Makefile routing.txt \
-	 pluto.8 ipsec.secrets.5 .cvsignore
-
-DISTGCRYPT = \
-	gcryptfix.c gcryptfix.h \
-	dsa.c dsa.h \
-	elgamal.c elgamal.h \
-	primegen.c \
-	smallprime.c
-
-DISTSRC = \
-	ac.c ac.h \
-	asn1.c asn1.h \
-	ca.c ca.h \
-	certs.c certs.h \
-	connections.c connections.h \
-	crl.c crl.h \
-	foodgroups.c foodgroups.h \
-	constants.c constants.h \
-	cookie.c cookie.h \
-	crypto.h crypto.c \
-	defs.h defs.c \
-	mp_defs.h mp_defs.c \
-	demux.c demux.h \
-	dnskey.c dnskey.h \
-	fetch.c fetch.h \
-	id.c id.h \
-	ipsec_doi.c ipsec_doi.h \
-	kernel.c kernel.h \
-	kernel_netlink.c kernel_netlink.h \
-	kernel_pfkey.c kernel_pfkey.h \
-	kernel_noklips.c kernel_noklips.h \
-	kernel_alg.c kernel_alg.h \
-	ike_alg.c ike_alg.h \
-	alg_info.c alg_info.h \
-	rcv_whack.c rcv_whack.h \
-	$(IPSECPOLICY_FILES) \
-	log.c log.h \
-	plutomain.c \
-	md2.c md2.h \
-	md5.c md5.h \
-	modecfg.c modecfg.h \
-	ocsp.c ocsp.h \
-	oid.txt oid.pl oid.c oid.h \
-	packet.c packet.h \
-	pem.c pem.h \
-	pgp.c pgp.h \
-	pkcs1.c pkcs1.h \
-	pkcs7.c pkcs7.h \
-	lex.c lex.h \
-	keys.c keys.h \
-	rnd.c rnd.h \
-	server.c server.h \
-	sha1.c sha1.h \
-	smartcard.c smartcard.h \
-	spdb.c spdb.h \
-	state.c state.h \
-	timer.c timer.h \
-	x509.c x509.h \
-	$(DISTGCRYPT) \
-	vendor.c nat_traversal.c virtual.c \
-	adns.c adns.h \
-	whack.c whack.h
-
-DIST = $(DISTMISC) $(DISTSRC)
-
-
-# start of support for DSS/DSA.  Not currently used.
-# OBJSGCRYPT =  gcryptfix.o dsa.o elgamal.o primegen.o smallprime.o
-OBJSGCRYPT =
-
-OBJSPLUTO = asn1.o connections.o constants.o cookie.o crypto.o defs.o fetch.o foodgroups.o \
-	log.o state.o plutomain.o server.o timer.o oid.o pem.o pgp.o pkcs1.o pkcs7.o x509.o \
-	ca.o certs.o id.o ipsec_doi.o kernel.o $(KERNEL26_OBJS) kernel_pfkey.o mp_defs.o \
-	kernel_noklips.o rcv_whack.o ${IPSECPOLICY_OBJS} demux.o packet.o lex.o keys.o \
-	dnskey.o smartcard.o ac.o rnd.o spdb.o sha1.o md5.o md2.o modecfg.o ocsp.o crl.o \
-	vendor.o nat_traversal.o virtual.o
-
-OBJSADNS = adns.o
-
-OBJSWHACK = whack.o
-
-all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK)
-programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK)
-
-oid.c: oid.txt oid.pl
-	perl oid.pl
-
-oid.h: oid.txt oid.pl
-	perl oid.pl
-
-install: all
-	mkdir -p ${LIBEXECDIR} ${LIBDIR}
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/cacerts
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/ocspcerts
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/certs
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/acerts
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/aacerts
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/crls
-	mkdir -p -m 755 $(CONFDIR)/ipsec.d/reqs
-	mkdir -p -m 700 $(CONFDIR)/ipsec.d/private
-	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
-	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)                  $(LIBDIR) ; fi
-	$(INSTALL) $(INSTMANFLAGS) pluto.8 $(PMANDIR)/ipsec_pluto.8
-	sh ${FREESWANSRCDIR}/utils/manlink pluto.8 | \
-		while read from to ; \
-		do \
-			ln -s -f ipsec_$$from $(PMANDIR)/$$to; \
-		done
-	$(INSTALL) $(INSTMANFLAGS) ipsec.secrets.5 $(FMANDIR)
-	sh ${FREESWANSRCDIR}/utils/manlink ipsec.secrets.5 | \
-		while read from to ; \
-		do \
-		 ln -s -f $$from $(FMANDIR)/$$to; \
-		done
-
-install_file_list:
-	@echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
-	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
-	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
-	@echo $(PMANDIR)/ipsec_pluto.8
-	@sh ${FREESWANSRCDIR}/utils/manlink pluto.8 | \
-		while read from to; \
-		do\
-			 echo $(PMANDIR)/$$to; \
-		done
-	@echo $(FMANDIR)/ipsec.secrets.5
-	@sh ${FREESWANSRCDIR}/utils/manlink ipsec.secrets.5 | \
-		while read from to; \
-		do \
-			echo $(FMANDIR)/$$to; \
-		done
-
-alg_info_test: alg_info_test.o alg_info.o kernel_alg.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(FREESWANLIB)
-	$(CC) -o $@ $^ $(LIBSPLUTO)
-
-# alg/libalg.o contains an already resolved object built with
-# additional crypto algos inside.
-OBJSPLUTO:= kernel_alg.o ike_alg.o alg_info.o db_ops.o $(OBJSPLUTO) alg/libalg.o 
-# if new alg source is created in alg directory,
-# trigger libalg.o rebuild
-alg/libalg.o: alg alg/Config.ike_alg
-	make -C alg libalg.o
-	touch alg/libalg.o
-
-# helper for creating alg/Make.common
-showdefs:
-	@echo DEFINES=$(DEFINES)
-	@echo CFLAGS=$(CFLAGS)
-	@echo CPPFLAGS=$(CPPFLAGS)
-	@echo COPTS=$(COPTS)
-
-$(BINNAMEPLUTO): $(OBJSPLUTO) $(ALG_LIBS)
-	$(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO)
-
-$(BINNAMEADNS): $(OBJSADNS)
-	$(CC) -o $(BINNAMEADNS) $(OBJSADNS) $(LIBSADNS)
-
-$(BINNAMEWHACK): $(OBJSWHACK)
-	$(CC) -o $(BINNAMEWHACK) $(OBJSWHACK) $(LIBSWHACK)
-
-distlist:
-	@echo $(DIST)
-
-# Exuberant Ctags doesn't work if LC_ALL is set to something other than C
-
-CTAGSFLAGS = -N --format=1 # fishy options required for Exuberant Ctags
-
-tags:	$(DISTSRC)
-	LC_ALL=C ctags $(CTAGSFLAGS) $(DISTSRC) $(LIBFREESWANDIR)/*.[ch]
-
-TAGS:	$(DISTSRC)
-	LC_ALL=C etags $(ETAGSFLAGS) $(DISTSRC) $(LIBFREESWANDIR)/*.[ch]
-
-cleanall: clean
-
-distclean: clean
-
-mostlyclean: clean
-
-realclean: clean
-
-clean:
-	$(RM) $(RMFLAGS) *.core core *~ a.out ktrace.out \
-		$(OBJSPLUTO) $(BINNAMEPLUTO) \
-		$(OBJSWHACK) $(BINNAMEWHACK) \
-		$(OBJSADNS) $(BINNAMEADNS)
-	make -C alg clean
-
-check:
-	echo no checks in lib right now.
-
-checkprograms:
-
-.c.o:
-	$(CC) $(COPTS) $(ALLFLAGS) -c $<
-
-# Gather dependencies caused by explicit #includes within .c files
-#
-# Each .c is assumed to compile into a .o with the corresponding name.
-# Only dependencies on based on "" includes are considered, not <>.
-# Dependencies caused by includes within headers are not noticed.
-# Unlike dependencies generated by the compiler, these include dependencies
-# suppressed by conditional compilation (good, we think).
-# This code can be tricked by embeding #include in comments or
-# vice-versa, but we're among friends.
-
-gatherdeps:
-	@ls $(DISTSRC) | grep '\.c' | sed -e 's/\(.*\)\.c$$/\1.o: \1.c/'
-	@echo
-	@ls $(DISTSRC) | grep '\.c' | xargs grep '^#[ 	]*include[ 	]*"' | \
-		sed -e 's/\.c:#[ 	]*include[ 	]*"/.o: /' -e 's/".*//'
-
-# Dependencies generated by "make gatherdeps":
-
-ac.o: ac.c
-adns.o: adns.c
-alg_info.o: alg_info.c
-asn1.o: asn1.c
-ca.o: ca.c
-certs.o: certs.c
-connections.o: connections.c
-constants.o: constants.c
-cookie.o: cookie.c
-crl.o: crl.c
-crypto.o: crypto.c
-defs.o: defs.c
-demux.o: demux.c
-dnskey.o: dnskey.c
-dsa.o: dsa.c
-elgamal.o: elgamal.c
-fetch.o: fetch.c
-foodgroups.o: foodgroups.c
-gcryptfix.o: gcryptfix.c
-id.o: id.c
-ike_alg.o: ike_alg.c
-ipsec_doi.o: ipsec_doi.c
-kernel.o: kernel.c
-kernel_alg.o: kernel_alg.c
-kernel_netlink.o: kernel_netlink.c
-kernel_noklips.o: kernel_noklips.c
-kernel_pfkey.o: kernel_pfkey.c
-keys.o: keys.c
-lex.o: lex.c
-log.o: log.c
-md2.o: md2.c
-md5.o: md5.c
-modecfg.o: modecfg.c
-mp_defs.o: mp_defs.c
-nat_traversal.o: nat_traversal.c
-ocsp.o: ocsp.c
-oid.o: oid.c
-packet.o: packet.c
-pem.o: pem.c
-pgp.o: pgp.c
-pkcs1.o: pkcs1.c
-pkcs7.o: pkcs7.c
-plutomain.o: plutomain.c
-primegen.o: primegen.c
-rcv_whack.o: rcv_whack.c
-rnd.o: rnd.c
-server.o: server.c
-sha1.o: sha1.c
-smallprime.o: smallprime.c
-smartcard.o: smartcard.c
-spdb.o: spdb.c
-state.o: state.c
-timer.o: timer.c
-vendor.o: vendor.c
-virtual.o: virtual.c
-whack.o: whack.c
-x509.o: x509.c
-
-ac.o: constants.h
-ac.o: defs.h
-ac.o: asn1.h
-ac.o: oid.h
-ac.o: ac.h
-ac.o: x509.h
-ac.o: crl.h
-ac.o: ca.h
-ac.o: certs.h
-ac.o: log.h
-ac.o: whack.h
-ac.o: fetch.h
-adns.o: constants.h
-adns.o: adns.h
-alg_info.o: alg_info.h
-alg_info.o: constants.h
-alg_info.o: defs.h
-alg_info.o: log.h
-alg_info.o: whack.h
-alg_info.o: sha1.h
-alg_info.o: md5.h
-alg_info.o: crypto.h
-alg_info.o: kernel_alg.h
-alg_info.o: ike_alg.h
-asn1.o: constants.h
-asn1.o: defs.h
-asn1.o: mp_defs.h
-asn1.o: asn1.h
-asn1.o: oid.h
-asn1.o: log.h
-ca.o: constants.h
-ca.o: defs.h
-ca.o: log.h
-ca.o: x509.h
-ca.o: ca.h
-ca.o: certs.h
-ca.o: whack.h
-ca.o: fetch.h
-certs.o: constants.h
-certs.o: defs.h
-certs.o: log.h
-certs.o: asn1.h
-certs.o: id.h
-certs.o: x509.h
-certs.o: pgp.h
-certs.o: pem.h
-certs.o: certs.h
-certs.o: pkcs1.h
-connections.o: kameipsec.h
-connections.o: constants.h
-connections.o: defs.h
-connections.o: id.h
-connections.o: x509.h
-connections.o: ca.h
-connections.o: crl.h
-connections.o: pgp.h
-connections.o: certs.h
-connections.o: ac.h
-connections.o: smartcard.h
-connections.o: fetch.h
-connections.o: connections.h
-connections.o: foodgroups.h
-connections.o: demux.h
-connections.o: state.h
-connections.o: timer.h
-connections.o: ipsec_doi.h
-connections.o: server.h
-connections.o: kernel.h
-connections.o: log.h
-connections.o: keys.h
-connections.o: adns.h
-connections.o: dnskey.h
-connections.o: whack.h
-connections.o: alg_info.h
-connections.o: ike_alg.h
-connections.o: kernel_alg.h
-connections.o: nat_traversal.h
-connections.o: virtual.h
-constants.o: constants.h
-constants.o: defs.h
-constants.o: log.h
-constants.o: packet.h
-cookie.o: constants.h
-cookie.o: defs.h
-cookie.o: sha1.h
-cookie.o: rnd.h
-cookie.o: cookie.h
-crl.o: constants.h
-crl.o: defs.h
-crl.o: log.h
-crl.o: asn1.h
-crl.o: oid.h
-crl.o: x509.h
-crl.o: crl.h
-crl.o: ca.h
-crl.o: certs.h
-crl.o: keys.h
-crl.o: whack.h
-crl.o: fetch.h
-crl.o: sha1.h
-crypto.o: constants.h
-crypto.o: defs.h
-crypto.o: state.h
-crypto.o: log.h
-crypto.o: md5.h
-crypto.o: sha1.h
-crypto.o: crypto.h
-crypto.o: alg_info.h
-crypto.o: ike_alg.h
-defs.o: constants.h
-defs.o: defs.h
-defs.o: log.h
-defs.o: whack.h
-demux.o: constants.h
-demux.o: defs.h
-demux.o: cookie.h
-demux.o: connections.h
-demux.o: state.h
-demux.o: packet.h
-demux.o: md5.h
-demux.o: sha1.h
-demux.o: crypto.h
-demux.o: ike_alg.h
-demux.o: log.h
-demux.o: demux.h
-demux.o: ipsec_doi.h
-demux.o: timer.h
-demux.o: whack.h
-demux.o: server.h
-demux.o: nat_traversal.h
-demux.o: vendor.h
-demux.o: modecfg.h
-dnskey.o: constants.h
-dnskey.o: adns.h
-dnskey.o: defs.h
-dnskey.o: log.h
-dnskey.o: id.h
-dnskey.o: connections.h
-dnskey.o: keys.h
-dnskey.o: dnskey.h
-dnskey.o: packet.h
-dnskey.o: timer.h
-dsa.o: constants.h
-dsa.o: defs.h
-dsa.o: log.h
-dsa.o: rnd.h
-dsa.o: gcryptfix.h
-dsa.o: dsa.h
-elgamal.o: constants.h
-elgamal.o: defs.h
-elgamal.o: log.h
-elgamal.o: rnd.h
-elgamal.o: gcryptfix.h
-elgamal.o: elgamal.h
-fetch.o: constants.h
-fetch.o: defs.h
-fetch.o: log.h
-fetch.o: id.h
-fetch.o: asn1.h
-fetch.o: pem.h
-fetch.o: x509.h
-fetch.o: ca.h
-fetch.o: whack.h
-fetch.o: ocsp.h
-fetch.o: crl.h
-fetch.o: fetch.h
-foodgroups.o: constants.h
-foodgroups.o: defs.h
-foodgroups.o: connections.h
-foodgroups.o: foodgroups.h
-foodgroups.o: kernel.h
-foodgroups.o: lex.h
-foodgroups.o: log.h
-foodgroups.o: whack.h
-gcryptfix.o: constants.h
-gcryptfix.o: defs.h
-gcryptfix.o: log.h
-gcryptfix.o: rnd.h
-gcryptfix.o: gcryptfix.h
-id.o: constants.h
-id.o: defs.h
-id.o: id.h
-id.o: log.h
-id.o: connections.h
-id.o: packet.h
-id.o: whack.h
-ike_alg.o: constants.h
-ike_alg.o: defs.h
-ike_alg.o: sha1.h
-ike_alg.o: md5.h
-ike_alg.o: crypto.h
-ike_alg.o: state.h
-ike_alg.o: packet.h
-ike_alg.o: log.h
-ike_alg.o: whack.h
-ike_alg.o: spdb.h
-ike_alg.o: alg_info.h
-ike_alg.o: ike_alg.h
-ike_alg.o: db_ops.h
-ike_alg.o: connections.h
-ike_alg.o: kernel.h
-ipsec_doi.o: constants.h
-ipsec_doi.o: defs.h
-ipsec_doi.o: mp_defs.h
-ipsec_doi.o: state.h
-ipsec_doi.o: id.h
-ipsec_doi.o: x509.h
-ipsec_doi.o: crl.h
-ipsec_doi.o: ca.h
-ipsec_doi.o: certs.h
-ipsec_doi.o: smartcard.h
-ipsec_doi.o: connections.h
-ipsec_doi.o: keys.h
-ipsec_doi.o: packet.h
-ipsec_doi.o: demux.h
-ipsec_doi.o: adns.h
-ipsec_doi.o: dnskey.h
-ipsec_doi.o: kernel.h
-ipsec_doi.o: log.h
-ipsec_doi.o: cookie.h
-ipsec_doi.o: server.h
-ipsec_doi.o: spdb.h
-ipsec_doi.o: timer.h
-ipsec_doi.o: rnd.h
-ipsec_doi.o: ipsec_doi.h
-ipsec_doi.o: whack.h
-ipsec_doi.o: fetch.h
-ipsec_doi.o: pkcs7.h
-ipsec_doi.o: asn1.h
-ipsec_doi.o: sha1.h
-ipsec_doi.o: md5.h
-ipsec_doi.o: crypto.h
-ipsec_doi.o: vendor.h
-ipsec_doi.o: alg_info.h
-ipsec_doi.o: ike_alg.h
-ipsec_doi.o: kernel_alg.h
-ipsec_doi.o: nat_traversal.h
-ipsec_doi.o: virtual.h
-kernel.o: kameipsec.h
-kernel.o: constants.h
-kernel.o: defs.h
-kernel.o: rnd.h
-kernel.o: id.h
-kernel.o: connections.h
-kernel.o: state.h
-kernel.o: timer.h
-kernel.o: kernel.h
-kernel.o: kernel_netlink.h
-kernel.o: kernel_pfkey.h
-kernel.o: kernel_noklips.h
-kernel.o: log.h
-kernel.o: ca.h
-kernel.o: server.h
-kernel.o: whack.h
-kernel.o: keys.h
-kernel.o: packet.h
-kernel.o: nat_traversal.h
-kernel.o: alg_info.h
-kernel.o: kernel_alg.h
-kernel_alg.o: constants.h
-kernel_alg.o: defs.h
-kernel_alg.o: connections.h
-kernel_alg.o: state.h
-kernel_alg.o: packet.h
-kernel_alg.o: spdb.h
-kernel_alg.o: kernel.h
-kernel_alg.o: kernel_alg.h
-kernel_alg.o: alg_info.h
-kernel_alg.o: log.h
-kernel_alg.o: whack.h
-kernel_alg.o: db_ops.h
-kernel_netlink.o: kameipsec.h
-kernel_netlink.o: linux26/rtnetlink.h
-kernel_netlink.o: linux26/xfrm.h
-kernel_netlink.o: constants.h
-kernel_netlink.o: defs.h
-kernel_netlink.o: kernel.h
-kernel_netlink.o: kernel_netlink.h
-kernel_netlink.o: kernel_pfkey.h
-kernel_netlink.o: log.h
-kernel_netlink.o: whack.h
-kernel_netlink.o: kernel_alg.h
-kernel_noklips.o: constants.h
-kernel_noklips.o: defs.h
-kernel_noklips.o: kernel.h
-kernel_noklips.o: kernel_noklips.h
-kernel_noklips.o: log.h
-kernel_noklips.o: whack.h
-kernel_pfkey.o: constants.h
-kernel_pfkey.o: defs.h
-kernel_pfkey.o: kernel.h
-kernel_pfkey.o: kernel_pfkey.h
-kernel_pfkey.o: log.h
-kernel_pfkey.o: whack.h
-kernel_pfkey.o: demux.h
-kernel_pfkey.o: nat_traversal.h
-kernel_pfkey.o: alg_info.h
-kernel_pfkey.o: kernel_alg.h
-keys.o: constants.h
-keys.o: defs.h
-keys.o: mp_defs.h
-keys.o: id.h
-keys.o: x509.h
-keys.o: pgp.h
-keys.o: certs.h
-keys.o: smartcard.h
-keys.o: connections.h
-keys.o: state.h
-keys.o: lex.h
-keys.o: keys.h
-keys.o: adns.h
-keys.o: dnskey.h
-keys.o: log.h
-keys.o: whack.h
-keys.o: timer.h
-keys.o: fetch.h
-keys.o: nat_traversal.h
-lex.o: constants.h
-lex.o: defs.h
-lex.o: log.h
-lex.o: whack.h
-lex.o: lex.h
-log.o: constants.h
-log.o: defs.h
-log.o: log.h
-log.o: server.h
-log.o: state.h
-log.o: connections.h
-log.o: kernel.h
-log.o: whack.h
-log.o: timer.h
-md2.o: md2.h
-md5.o: md5.h
-modecfg.o: constants.h
-modecfg.o: defs.h
-modecfg.o: state.h
-modecfg.o: demux.h
-modecfg.o: timer.h
-modecfg.o: ipsec_doi.h
-modecfg.o: log.h
-modecfg.o: md5.h
-modecfg.o: sha1.h
-modecfg.o: crypto.h
-modecfg.o: modecfg.h
-modecfg.o: whack.h
-mp_defs.o: constants.h
-mp_defs.o: defs.h
-mp_defs.o: mp_defs.h
-mp_defs.o: log.h
-nat_traversal.o: constants.h
-nat_traversal.o: defs.h
-nat_traversal.o: log.h
-nat_traversal.o: server.h
-nat_traversal.o: state.h
-nat_traversal.o: connections.h
-nat_traversal.o: packet.h
-nat_traversal.o: demux.h
-nat_traversal.o: kernel.h
-nat_traversal.o: whack.h
-nat_traversal.o: timer.h
-nat_traversal.o: cookie.h
-nat_traversal.o: sha1.h
-nat_traversal.o: md5.h
-nat_traversal.o: crypto.h
-nat_traversal.o: vendor.h
-nat_traversal.o: ike_alg.h
-nat_traversal.o: nat_traversal.h
-ocsp.o: constants.h
-ocsp.o: defs.h
-ocsp.o: log.h
-ocsp.o: x509.h
-ocsp.o: crl.h
-ocsp.o: ca.h
-ocsp.o: rnd.h
-ocsp.o: asn1.h
-ocsp.o: certs.h
-ocsp.o: smartcard.h
-ocsp.o: oid.h
-ocsp.o: whack.h
-ocsp.o: pkcs1.h
-ocsp.o: keys.h
-ocsp.o: fetch.h
-ocsp.o: ocsp.h
-oid.o: oid.h
-packet.o: constants.h
-packet.o: defs.h
-packet.o: log.h
-packet.o: packet.h
-packet.o: whack.h
-pem.o: constants.h
-pem.o: defs.h
-pem.o: log.h
-pem.o: md5.h
-pem.o: whack.h
-pem.o: pem.h
-pgp.o: constants.h
-pgp.o: defs.h
-pgp.o: mp_defs.h
-pgp.o: log.h
-pgp.o: id.h
-pgp.o: pgp.h
-pgp.o: certs.h
-pgp.o: md5.h
-pgp.o: whack.h
-pgp.o: pkcs1.h
-pgp.o: keys.h
-pkcs1.o: constants.h
-pkcs1.o: defs.h
-pkcs1.o: mp_defs.h
-pkcs1.o: asn1.h
-pkcs1.o: oid.h
-pkcs1.o: log.h
-pkcs1.o: pkcs1.h
-pkcs1.o: md2.h
-pkcs1.o: md5.h
-pkcs1.o: sha1.h
-pkcs1.o: rnd.h
-pkcs7.o: constants.h
-pkcs7.o: defs.h
-pkcs7.o: asn1.h
-pkcs7.o: oid.h
-pkcs7.o: log.h
-pkcs7.o: x509.h
-pkcs7.o: certs.h
-pkcs7.o: pkcs7.h
-pkcs7.o: rnd.h
-plutomain.o: constants.h
-plutomain.o: defs.h
-plutomain.o: id.h
-plutomain.o: ca.h
-plutomain.o: certs.h
-plutomain.o: ac.h
-plutomain.o: connections.h
-plutomain.o: foodgroups.h
-plutomain.o: packet.h
-plutomain.o: demux.h
-plutomain.o: server.h
-plutomain.o: kernel.h
-plutomain.o: log.h
-plutomain.o: keys.h
-plutomain.o: adns.h
-plutomain.o: dnskey.h
-plutomain.o: rnd.h
-plutomain.o: state.h
-plutomain.o: ipsec_doi.h
-plutomain.o: ocsp.h
-plutomain.o: crl.h
-plutomain.o: fetch.h
-plutomain.o: sha1.h
-plutomain.o: md5.h
-plutomain.o: crypto.h
-plutomain.o: virtual.h
-plutomain.o: nat_traversal.h
-primegen.o: constants.h
-primegen.o: defs.h
-primegen.o: log.h
-primegen.o: rnd.h
-primegen.o: gcryptfix.h
-rcv_whack.o: constants.h
-rcv_whack.o: defs.h
-rcv_whack.o: id.h
-rcv_whack.o: ca.h
-rcv_whack.o: certs.h
-rcv_whack.o: ac.h
-rcv_whack.o: smartcard.h
-rcv_whack.o: connections.h
-rcv_whack.o: foodgroups.h
-rcv_whack.o: whack.h
-rcv_whack.o: packet.h
-rcv_whack.o: demux.h
-rcv_whack.o: state.h
-rcv_whack.o: ipsec_doi.h
-rcv_whack.o: kernel.h
-rcv_whack.o: rcv_whack.h
-rcv_whack.o: log.h
-rcv_whack.o: keys.h
-rcv_whack.o: adns.h
-rcv_whack.o: dnskey.h
-rcv_whack.o: server.h
-rcv_whack.o: fetch.h
-rcv_whack.o: ocsp.h
-rcv_whack.o: crl.h
-rcv_whack.o: kernel_alg.h
-rcv_whack.o: ike_alg.h
-rnd.o: sha1.h
-rnd.o: constants.h
-rnd.o: defs.h
-rnd.o: rnd.h
-rnd.o: log.h
-rnd.o: timer.h
-server.o: constants.h
-server.o: defs.h
-server.o: state.h
-server.o: connections.h
-server.o: kernel.h
-server.o: log.h
-server.o: server.h
-server.o: timer.h
-server.o: packet.h
-server.o: demux.h
-server.o: rcv_whack.h
-server.o: rcv_info.h
-server.o: keys.h
-server.o: adns.h
-server.o: dnskey.h
-server.o: whack.h
-server.o: kameipsec.h
-server.o: nat_traversal.h
-sha1.o: sha1.h
-smallprime.o: constants.h
-smallprime.o: defs.h
-smallprime.o: gcryptfix.h
-smartcard.o: constants.h
-smartcard.o: rsaref/unix.h
-smartcard.o: rsaref/pkcs11.h
-smartcard.o: defs.h
-smartcard.o: mp_defs.h
-smartcard.o: log.h
-smartcard.o: x509.h
-smartcard.o: ca.h
-smartcard.o: certs.h
-smartcard.o: keys.h
-smartcard.o: smartcard.h
-smartcard.o: whack.h
-smartcard.o: fetch.h
-spdb.o: constants.h
-spdb.o: defs.h
-spdb.o: id.h
-spdb.o: connections.h
-spdb.o: state.h
-spdb.o: packet.h
-spdb.o: keys.h
-spdb.o: kernel.h
-spdb.o: log.h
-spdb.o: spdb.h
-spdb.o: whack.h
-spdb.o: sha1.h
-spdb.o: md5.h
-spdb.o: crypto.h
-spdb.o: alg_info.h
-spdb.o: kernel_alg.h
-spdb.o: ike_alg.h
-spdb.o: db_ops.h
-spdb.o: nat_traversal.h
-state.o: constants.h
-state.o: defs.h
-state.o: connections.h
-state.o: state.h
-state.o: kernel.h
-state.o: log.h
-state.o: packet.h
-state.o: keys.h
-state.o: rnd.h
-state.o: timer.h
-state.o: whack.h
-state.o: demux.h
-state.o: ipsec_doi.h
-state.o: sha1.h
-state.o: md5.h
-state.o: crypto.h
-timer.o: constants.h
-timer.o: defs.h
-timer.o: connections.h
-timer.o: state.h
-timer.o: demux.h
-timer.o: ipsec_doi.h
-timer.o: kernel.h
-timer.o: server.h
-timer.o: log.h
-timer.o: rnd.h
-timer.o: timer.h
-timer.o: whack.h
-timer.o: nat_traversal.h
-vendor.o: constants.h
-vendor.o: defs.h
-vendor.o: log.h
-vendor.o: md5.h
-vendor.o: connections.h
-vendor.o: packet.h
-vendor.o: demux.h
-vendor.o: whack.h
-vendor.o: vendor.h
-vendor.o: kernel.h
-vendor.o: nat_traversal.h
-virtual.o: constants.h
-virtual.o: defs.h
-virtual.o: log.h
-virtual.o: connections.h
-virtual.o: whack.h
-virtual.o: virtual.h
-whack.o: constants.h
-whack.o: defs.h
-whack.o: whack.h
-x509.o: constants.h
-x509.o: defs.h
-x509.o: mp_defs.h
-x509.o: log.h
-x509.o: id.h
-x509.o: asn1.h
-x509.o: oid.h
-x509.o: pkcs1.h
-x509.o: x509.h
-x509.o: crl.h
-x509.o: ca.h
-x509.o: certs.h
-x509.o: keys.h
-x509.o: whack.h
-x509.o: fetch.h
-x509.o: ocsp.h
-x509.o: sha1.h
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
new file mode 100644
index 000000000..c9dc7d7b0
--- /dev/null
+++ b/src/pluto/Makefile.am
@@ -0,0 +1,178 @@
+# Makefile.am was ported from the old Makefile the most
+# painless way. Only the most important options are included,
+# further work may be necessary here...
+
+ipsec_PROGRAMS = pluto _pluto_adns
+
+pluto_SOURCES = \
+linux26/rtnetlink.h \
+linux26/xfrm.h \
+linux26/netlink.h \
+rsaref/pkcs11t.h \
+rsaref/pkcs11.h \
+rsaref/unix.h \
+rsaref/pkcs11f.h \
+alg/ike_alg_twofish.c \
+alg/ike_alg_aes.c \
+alg/ike_alg_blowfish.c \
+alg/ike_alg_sha2.c \
+alg/ike_alg_serpent.c \
+alg/ike_alginit.c \
+kernel_alg.c \
+kernel_alg.h \
+kernel_pfkey.h \
+kernel_pfkey.c \
+gcryptfix.c \
+gcryptfix.h \
+primegen.c \
+smallprime.c \
+ocsp.c \
+ocsp.h \
+pgp.c \
+ac.c \
+certs.c \
+connections.c \
+certs.h \
+virtual.c \
+connections.h \
+fetch.c \
+virtual.h \
+fetch.h \
+ipsec_doi.c \
+ipsec_doi.h \
+x509.c \
+kameipsec.h \
+cookie.c \
+x509.h \
+cookie.h \
+pgp.h \
+ac.h \
+sha1.c \
+sha1.h \
+constants.c \
+smartcard.c \
+kernel.c \
+constants.h \
+smartcard.h \
+kernel.h \
+dnskey.c \
+asn1.c \
+dnskey.h \
+elgamal.c \
+db_ops.c \
+asn1.h \
+elgamal.h \
+oid.c \
+db_ops.h \
+mp_defs.c \
+state.c \
+oid.h \
+mp_defs.h \
+ca.c \
+state.h \
+pkcs7.c \
+lex.c \
+ca.h \
+pkcs7.h \
+id.c \
+lex.h \
+id.h \
+keys.c \
+ike_alg.c \
+keys.h \
+md5.c \
+md5.h \
+kernel_noklips.c \
+ike_alg.h \
+rcv_whack.c \
+rcv_whack.h \
+alg_info.c \
+alg_info.h \
+pem.c \
+kernel_noklips.h \
+foodgroups.c \
+pem.h \
+kernel_netlink.c \
+foodgroups.h \
+vendor.c \
+vendor.h \
+packet.c \
+packet.h \
+crl.c \
+md2.c \
+rnd.c \
+crl.h \
+md2.h \
+spdb.c \
+rnd.h \
+spdb.h \
+modecfg.c \
+timer.h \
+nat_traversal.c \
+server.c \
+dsa.c \
+plutomain.c \
+modecfg.h \
+kernel_netlink.h \
+nat_traversal.h \
+server.h \
+dsa.h \
+timer.c \
+crypto.c \
+pkcs1.c \
+log.c \
+defs.c \
+demux.c \
+crypto.h \
+pkcs1.h \
+log.h \
+defs.h \
+demux.h
+
+_pluto_adns_SOURCES = adns.c adns.h
+
+INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/libcrypto -I$(top_srcdir)/src/whack
+AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${confdir}\" -DIPSEC_PIDDIR=\"${piddir}\" \
+-DDEBUG -DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES -DNAT_TRAVERSAL -DVIRTUAL_IP -DPLUTO \
+-DVENDORID -DSHARED_SECRETS_FILE=\"${confdir}/ipsec.secrets\" -DTHREADS -DKLIPS
+pluto_LDADD = $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a -lgmp -lresolv -lpthread
+_pluto_adns_LDADD = -lresolv $(top_srcdir)/src/libfreeswan/libfreeswan.a
+dist_man_MANS = pluto.8 ipsec.secrets.5
+EXTRA_DIST = oid.pl oid.txt
+
+# TODO: get perl from ./configure
+PERL=perl
+
+oid.c: oid.txt oid.pl
+	$PERL oid.pl
+
+oid.h: oid.txt oid.pl
+	$PERL oid.pl
+
+# This compile option activates dynamic URL fetching using libcurl
+if USE_LIBCURL
+  pluto_LDADD += -lcurl
+endif
+
+# This compile option activates dynamic LDAP CRL fetching
+if USE_LDAP
+  pluto_LDADD += -lldap -llber
+endif
+
+# This compile option activates smartcard support
+if USE_SMARTCARD
+  AM_CFLAGS += -DSMARTCARD
+  pluto_LDADD += -ldl
+endif
+
+install-exec-local :
+	mkdir -p -m 755 $(confdir)/ipsec.d
+	mkdir -p -m 755 $(confdir)/ipsec.d/cacerts
+	mkdir -p -m 755 $(confdir)/ipsec.d/ocspcerts
+	mkdir -p -m 755 $(confdir)/ipsec.d/certs
+	mkdir -p -m 755 $(confdir)/ipsec.d/acerts
+	mkdir -p -m 755 $(confdir)/ipsec.d/aacerts
+	mkdir -p -m 755 $(confdir)/ipsec.d/crls
+	mkdir -p -m 755 $(confdir)/ipsec.d/reqs
+	mkdir -p -m 700 $(confdir)/ipsec.d/private
+
diff --git a/src/pluto/alg/Config.ike_alg b/src/pluto/alg/Config.ike_alg
index 0fcda4cad..42653f61b 100644
--- a/src/pluto/alg/Config.ike_alg
+++ b/src/pluto/alg/Config.ike_alg
@@ -2,8 +2,8 @@
 ## IKE algorithms config. for static linking into pluto
 ## By now  3DES,MD5 and SHA1 are already present in pluto.
 ##
-CONFIG_IKE_ALG_AES=y
-CONFIG_IKE_ALG_BLOWFISH=y
-CONFIG_IKE_ALG_SERPENT=y
-CONFIG_IKE_ALG_TWOFISH=y
-CONFIG_IKE_ALG_SHA2=y
+
+Optional building of algorithms has not been ported to the
+new build system with autotools. As all the crypto stuff
+will go into libstrongswan soon, we willll provide this
+possibility there...
diff --git a/src/pluto/alg/Makefile b/src/pluto/alg/Makefile
deleted file mode 100644
index 9732cc80e..000000000
--- a/src/pluto/alg/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# pluto/alg Makefile
-# Author: JuanJo Ciarlante <jjo-ipsec@mendoza.gov.ar>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# $Id: Makefile,v 1.3 2004/06/23 04:45:20 as Exp $
-
-Make.common: ../Makefile
-	make -s -C .. showdefs > $@
-
--include Make.common
-include Config.ike_alg
-
-LIBCRYPTO:=../../../lib/libcrypto
-ALLFLAGS=$(CPPFLAGS) $(CFLAGS) -I .. -I-  -I ../../../linux/include -I $(LIBCRYPTO)
-LIBALG := libalg.o
-
-all : $(LIBALG)
-
-include $(wildcard Makefile.ike_alg_*)
-#include $(wildcard Makefile.ike_alg_[ab]*)
-
-ALG_DIRS:=$(ALG_DIRS-y)
-ALG_LIBS:=$(ALG_LIBS-y)
-ALG_SRCS:=$(ALG_SRCS-y)
-ALG_OBJS:=$(ALG_OBJS-y)
-$(LIBALG): ike_alginit.o $(ALG_OBJS) $(ALG_LIBS) 
-	$(LD) -r -o $@ $^
-
-# Search for IKE_ALG_INIT_NAME: in ike_alg_*.c to
-# build ike_alginit.c:ike_alginit()
-
-ike_alginit.c: $(ALG_SRCS) Makefile Config.ike_alg
-	@awk '	\
-		BEGIN { print "extern int ike_alg_init(void); \
-			int ike_alg_init(void) {" } \
-		/IKE_ALG_INIT_NAME:/ \
-			{ print "{ extern int " $$2" (void); " $$2 "();}" } \
-		END   { print "return 0;}" } \
-		' $(ALG_SRCS) /dev/null > $@ 
-
-clean :
-	@for i in $(ALG_DIRS);do make -C $$i clean;done
-	rm -f *.[oa] ike_alginit.c Make.common
-
-gatherdeps:
-	@ls $(ALG_SRCS) | grep '\.c' | sed -e 's/\(.*\)\.c$$/\1.o: \1.c/'
-	@echo
-	@ls $(ALG_SRCS) | grep '\.c' | xargs grep '^#[ 	]*include[ 	]*"' | \
-		sed -n -e '/#include.*"lib/d' \
-		-e 's/\.c:#[ 	]*include[ 	]*"/.o: ..\//' -e 's/".*//p'
-
-# Dependencies generated by "make gatherdeps":
-
-ike_alg_aes.o: ike_alg_aes.c
-ike_alg_blowfish.o: ike_alg_blowfish.c
-ike_alg_serpent.o: ike_alg_serpent.c
-ike_alg_sha2.o: ike_alg_sha2.c
-ike_alg_twofish.o: ike_alg_twofish.c
-
-ike_alg_aes.o: ../constants.h
-ike_alg_aes.o: ../defs.h
-ike_alg_aes.o: ../log.h
-ike_alg_aes.o: ../alg_info.h
-ike_alg_aes.o: ../ike_alg.h
-ike_alg_blowfish.o: ../constants.h
-ike_alg_blowfish.o: ../defs.h
-ike_alg_blowfish.o: ../log.h
-ike_alg_blowfish.o: ../alg_info.h
-ike_alg_blowfish.o: ../ike_alg.h
-ike_alg_serpent.o: ../constants.h
-ike_alg_serpent.o: ../defs.h
-ike_alg_serpent.o: ../log.h
-ike_alg_serpent.o: ../alg_info.h
-ike_alg_serpent.o: ../ike_alg.h
-ike_alg_sha2.o: ../constants.h
-ike_alg_sha2.o: ../defs.h
-ike_alg_sha2.o: ../log.h
-ike_alg_sha2.o: ../alg_info.h
-ike_alg_sha2.o: ../ike_alg.h
-ike_alg_twofish.o: ../constants.h
-ike_alg_twofish.o: ../defs.h
-ike_alg_twofish.o: ../log.h
-ike_alg_twofish.o: ../alg_info.h
-ike_alg_twofish.o: ../ike_alg.h
diff --git a/src/pluto/alg/Makefile.ike_alg_aes b/src/pluto/alg/Makefile.ike_alg_aes
deleted file mode 100644
index 12009ba5c..000000000
--- a/src/pluto/alg/Makefile.ike_alg_aes
+++ /dev/null
@@ -1,14 +0,0 @@
-ALG:=aes
-CONFIG_YES:=$(CONFIG_IKE_ALG_AES)
-DIR_AES:=$(LIBCRYPTO)/libaes
-
-ALG_DIRS-$(CONFIG_YES)  := $(ALG_DIRS-$(CONFIG_YES)) $(DIR_AES)
-ALG_LIBS-$(CONFIG_YES)  := $(ALG_LIBS-$(CONFIG_YES)) $(DIR_AES)/libaes.a
-ALG_SRCS-$(CONFIG_YES)  := $(ALG_SRCS-$(CONFIG_YES)) ike_alg_$(ALG).c
-ALG_OBJS-$(CONFIG_YES)  := $(ALG_OBJS-$(CONFIG_YES)) ike_alg_$(ALG).o
-
-$(DIR_AES)/libaes.a:
-	make -C $(DIR_AES) CFLAGS="$(CFLAGS)" libaes.a
-
-ike_alg_$(ALG).o: ike_alg_$(ALG).c
-	$(CC) -I $(LIBCRYPTO) -I$(DIR_AES) $(COPTS) $(ALLFLAGS) -c $<
diff --git a/src/pluto/alg/Makefile.ike_alg_blowfish b/src/pluto/alg/Makefile.ike_alg_blowfish
deleted file mode 100644
index c3af6199b..000000000
--- a/src/pluto/alg/Makefile.ike_alg_blowfish
+++ /dev/null
@@ -1,13 +0,0 @@
-ALG:=blowfish
-CONFIG_YES:=$(CONFIG_IKE_ALG_BLOWFISH)
-DIR_BLOWFISH:=$(LIBCRYPTO)/libblowfish
-ALG_DIRS-$(CONFIG_YES) := $(ALG_DIRS-$(CONFIG_YES)) $(DIR_BLOWFISH)
-ALG_LIBS-$(CONFIG_YES) := $(ALG_LIBS-$(CONFIG_YES)) $(DIR_BLOWFISH)/libblowfish.a
-ALG_SRCS-$(CONFIG_YES) := $(ALG_SRCS-$(CONFIG_YES)) ike_alg_$(ALG).c
-ALG_OBJS-$(CONFIG_YES) := $(ALG_OBJS-$(CONFIG_YES)) ike_alg_$(ALG).o
-
-$(DIR_BLOWFISH)/libblowfish.a:
-	make -C $(DIR_BLOWFISH) CFLAGS="$(CFLAGS)" libblowfish.a
-
-ike_alg_$(ALG).o: ike_alg_$(ALG).c
-	$(CC) -I $(LIBCRYPTO) -I$(DIR_BLOWFISH) $(COPTS) $(ALLFLAGS) -c $<
diff --git a/src/pluto/alg/Makefile.ike_alg_serpent b/src/pluto/alg/Makefile.ike_alg_serpent
deleted file mode 100644
index 3395ac0ea..000000000
--- a/src/pluto/alg/Makefile.ike_alg_serpent
+++ /dev/null
@@ -1,13 +0,0 @@
-ALG:=serpent
-CONFIG_YES:=$(CONFIG_IKE_ALG_SERPENT)
-DIR_SERPENT:=$(LIBCRYPTO)/libserpent
-ALG_DIRS-$(CONFIG_YES) := $(ALG_DIRS-$(CONFIG_YES)) $(DIR_SERPENT)
-ALG_LIBS-$(CONFIG_YES) := $(ALG_LIBS-$(CONFIG_YES)) $(DIR_SERPENT)/libserpent.a
-ALG_SRCS-$(CONFIG_YES) := $(ALG_SRCS-$(CONFIG_YES)) ike_alg_$(ALG).c
-ALG_OBJS-$(CONFIG_YES) := $(ALG_OBJS-$(CONFIG_YES)) ike_alg_$(ALG).o
-
-$(DIR_SERPENT)/libserpent.a:
-	make -C $(DIR_SERPENT) CFLAGS="$(CFLAGS)" libserpent.a
-
-ike_alg_$(ALG).o: ike_alg_$(ALG).c
-	$(CC) -I $(LIBCRYPTO) -I$(DIR_SERPENT) $(COPTS) $(ALLFLAGS) -c $<
diff --git a/src/pluto/alg/Makefile.ike_alg_sha2 b/src/pluto/alg/Makefile.ike_alg_sha2
deleted file mode 100644
index 67e68a667..000000000
--- a/src/pluto/alg/Makefile.ike_alg_sha2
+++ /dev/null
@@ -1,13 +0,0 @@
-ALG:=sha2
-CONFIG_YES:=$(CONFIG_IKE_ALG_SHA2)
-DIR_SHA2:=$(LIBCRYPTO)/libsha2
-ALG_DIRS-$(CONFIG_YES) := $(ALG_DIRS-$(CONFIG_YES)) $(DIR_SHA2)
-ALG_LIBS-$(CONFIG_YES) := $(ALG_LIBS-$(CONFIG_YES)) $(DIR_SHA2)/libsha2.a
-ALG_SRCS-$(CONFIG_YES) := $(ALG_SRCS-$(CONFIG_YES)) ike_alg_$(ALG).c
-ALG_OBJS-$(CONFIG_YES) := $(ALG_OBJS-$(CONFIG_YES)) ike_alg_$(ALG).o
-
-$(DIR_SHA2)/libsha2.a:
-	make -C $(DIR_SHA2) libsha2.a
-
-ike_alg_$(ALG).o: ike_alg_$(ALG).c
-	$(CC) -I $(LIBCRYPTO) -I$(DIR_SHA2) $(COPTS) $(ALLFLAGS) -c $<
diff --git a/src/pluto/alg/Makefile.ike_alg_twofish b/src/pluto/alg/Makefile.ike_alg_twofish
deleted file mode 100644
index dcd30dd3e..000000000
--- a/src/pluto/alg/Makefile.ike_alg_twofish
+++ /dev/null
@@ -1,13 +0,0 @@
-ALG:=twofish
-CONFIG_YES:=$(CONFIG_IKE_ALG_TWOFISH)
-DIR_TWOFISH:=$(LIBCRYPTO)/libtwofish
-ALG_DIRS-$(CONFIG_YES) := $(ALG_DIRS-$(CONFIG_YES)) $(DIR_TWOFISH)
-ALG_LIBS-$(CONFIG_YES) := $(ALG_LIBS-$(CONFIG_YES)) $(DIR_TWOFISH)/libtwofish.a
-ALG_SRCS-$(CONFIG_YES) := $(ALG_SRCS-$(CONFIG_YES)) ike_alg_$(ALG).c
-ALG_OBJS-$(CONFIG_YES) := $(ALG_OBJS-$(CONFIG_YES)) ike_alg_$(ALG).o
-
-$(DIR_TWOFISH)/libtwofish.a:
-	make -C $(DIR_TWOFISH) CFLAGS="$(CFLAGS)" libtwofish.a
-
-ike_alg_$(ALG).o: ike_alg_$(ALG).c
-	$(CC) -I $(LIBCRYPTO) -I$(DIR_TWOFISH) $(COPTS) $(ALLFLAGS) -c $<
diff --git a/src/pluto/alg/ike_alginit.c b/src/pluto/alg/ike_alginit.c
new file mode 100644
index 000000000..8784bf31b
--- /dev/null
+++ b/src/pluto/alg/ike_alginit.c
@@ -0,0 +1,7 @@
+extern int ike_alg_init(void); 		int ike_alg_init(void) {
+{ extern int ike_alg_aes_init (void); ike_alg_aes_init();}
+{ extern int ike_alg_blowfish_init (void); ike_alg_blowfish_init();}
+{ extern int ike_alg_serpent_init (void); ike_alg_serpent_init();}
+{ extern int ike_alg_sha2_init (void); ike_alg_sha2_init();}
+{ extern int ike_alg_twofish_init (void); ike_alg_twofish_init();}
+return 0;}
diff --git a/src/pluto/alg_info.c b/src/pluto/alg_info.c
index 4ac7f2ca9..e8c84b442 100644
--- a/src/pluto/alg_info.c
+++ b/src/pluto/alg_info.c
@@ -26,7 +26,7 @@
 
 #include <ctype.h>
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 #include <pfkeyv2.h>
 
 #include "alg_info.h"
diff --git a/src/pluto/ca.c b/src/pluto/ca.c
index c1e0261d8..d1be22e2f 100644
--- a/src/pluto/ca.c
+++ b/src/pluto/ca.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/certs.c b/src/pluto/certs.c
index 92b40605f..779646a98 100644
--- a/src/pluto/certs.c
+++ b/src/pluto/certs.c
@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/certs.h b/src/pluto/certs.h
index cca128965..ca5acd35a 100644
--- a/src/pluto/certs.h
+++ b/src/pluto/certs.h
@@ -24,14 +24,14 @@
 /* path definitions for private keys, end certs,
  * cacerts, attribute certs and crls
  */
-#define PRIVATE_KEY_PATH  "/etc/ipsec.d/private"
-#define HOST_CERT_PATH    "/etc/ipsec.d/certs"
-#define CA_CERT_PATH	  "/etc/ipsec.d/cacerts"
-#define A_CERT_PATH	  "/etc/ipsec.d/acerts"
-#define AA_CERT_PATH	  "/etc/ipsec.d/aacerts"
-#define OCSP_CERT_PATH	  "/etc/ipsec.d/ocspcerts"
-#define CRL_PATH	  "/etc/ipsec.d/crls"
-#define REQ_PATH	  "/etc/ipsec.d/reqs"
+#define PRIVATE_KEY_PATH  IPSEC_CONFDIR "/ipsec.d/private"
+#define HOST_CERT_PATH    IPSEC_CONFDIR "/ipsec.d/certs"
+#define CA_CERT_PATH	  IPSEC_CONFDIR "/ipsec.d/cacerts"
+#define A_CERT_PATH	  IPSEC_CONFDIR "/ipsec.d/acerts"
+#define AA_CERT_PATH	  IPSEC_CONFDIR "/ipsec.d/aacerts"
+#define OCSP_CERT_PATH	  IPSEC_CONFDIR "/ipsec.d/ocspcerts"
+#define CRL_PATH	  IPSEC_CONFDIR "/ipsec.d/crls"
+#define REQ_PATH	  IPSEC_CONFDIR "/ipsec.d/reqs"
 
 /* advance warning of imminent expiry of
  * cacerts, public keys, and crls
diff --git a/src/pluto/connections.c b/src/pluto/connections.c
index 6cf6a6a8b..f672e928b 100644
--- a/src/pluto/connections.c
+++ b/src/pluto/connections.c
@@ -29,7 +29,7 @@
 #include <sys/queue.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 #include "kameipsec.h"
 
 #include "constants.h"
@@ -58,7 +58,6 @@
 #include "whack.h"
 #include "alg_info.h"
 #include "ike_alg.h"
-#include "kernel_alg.h"
 #ifdef NAT_TRAVERSAL
 #include "nat_traversal.h"
 #endif
diff --git a/src/pluto/constants.c b/src/pluto/constants.c
index 27e4db1e0..32b1b778f 100644
--- a/src/pluto/constants.c
+++ b/src/pluto/constants.c
@@ -25,7 +25,7 @@
 #include <netinet/in.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/constants.h b/src/pluto/constants.h
index b66d002ee..f3a240238 100644
--- a/src/pluto/constants.h
+++ b/src/pluto/constants.h
@@ -63,9 +63,11 @@ typedef unsigned long long lset_t;
 #define LDISJOINT(a, b)  (((a) & (b)) == LEMPTY)
 
 /* Control and lock pathnames */
-
+#ifndef IPSEC_PIDDIR
+# define IPSEC_PIDDIR "/var/run"
+#endif
 #ifndef DEFAULT_CTLBASE
-# define DEFAULT_CTLBASE "/var/run/pluto"
+# define DEFAULT_CTLBASE IPSEC_PIDDIR "/pluto"
 #endif
 
 #define CTL_SUFFIX ".ctl"	/* for UNIX domain socket pathname */
diff --git a/src/pluto/crl.c b/src/pluto/crl.c
index 8d4b3bd7b..05e8d1402 100644
--- a/src/pluto/crl.c
+++ b/src/pluto/crl.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/crypto.c b/src/pluto/crypto.c
index 24939bd04..8d6fff288 100644
--- a/src/pluto/crypto.c
+++ b/src/pluto/crypto.c
@@ -21,7 +21,7 @@
 
 #include <freeswan.h>
 #define HEADER_DES_LOCL_H   /* stupid trick to force prototype decl in <des.h> */
-#include <crypto/des.h>
+#include <libdes/des.h>
 
 #include <errno.h>
 
diff --git a/src/pluto/dnskey.c b/src/pluto/dnskey.c
index 9aca1938d..23863b0a2 100644
--- a/src/pluto/dnskey.c
+++ b/src/pluto/dnskey.c
@@ -30,7 +30,7 @@
 #include <sys/queue.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "adns.h"	/* needs <resolv.h> */
diff --git a/src/pluto/foodgroups.c b/src/pluto/foodgroups.c
index 52e32f0fb..c92bdb3d4 100644
--- a/src/pluto/foodgroups.c
+++ b/src/pluto/foodgroups.c
@@ -35,7 +35,7 @@
 /* Food group config files are found in directory fg_path */
 
 #ifndef POLICYGROUPSDIR
-#define POLICYGROUPSDIR "/etc/ipsec.d/policies"
+#define POLICYGROUPSDIR IPSEC_CONFDIR "/ipsec.d/policies"
 #endif
 
 const char *policygroups_dir = POLICYGROUPSDIR;
diff --git a/src/pluto/id.c b/src/pluto/id.c
index 4e306d3a7..4e75ec2e9 100644
--- a/src/pluto/id.c
+++ b/src/pluto/id.c
@@ -28,7 +28,7 @@
 #include <sys/queue.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/ike_alg.c b/src/pluto/ike_alg.c
index 47393079a..43cb24ea2 100644
--- a/src/pluto/ike_alg.c
+++ b/src/pluto/ike_alg.c
@@ -21,7 +21,7 @@
 #include <sys/queue.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/ipsec_doi.c b/src/pluto/ipsec_doi.c
index fe5c846a7..a4e86a901 100644
--- a/src/pluto/ipsec_doi.c
+++ b/src/pluto/ipsec_doi.c
@@ -29,7 +29,7 @@
 #include <sys/time.h>		/* for gettimeofday */
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/kernel.c b/src/pluto/kernel.c
index d2070c0d4..bee185cc3 100644
--- a/src/pluto/kernel.c
+++ b/src/pluto/kernel.c
@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #ifdef KLIPS
 #include <signal.h>
diff --git a/src/pluto/kernel_alg.c b/src/pluto/kernel_alg.c
index 920a879d7..91dfaff59 100644
--- a/src/pluto/kernel_alg.c
+++ b/src/pluto/kernel_alg.c
@@ -27,7 +27,7 @@
 #include <pfkey.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/keys.c b/src/pluto/keys.c
index 21092383a..faa3ae38d 100644
--- a/src/pluto/keys.c
+++ b/src/pluto/keys.c
@@ -34,7 +34,7 @@
 #endif
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/keys.h b/src/pluto/keys.h
index d47d8b0a2..acee84432 100644
--- a/src/pluto/keys.h
+++ b/src/pluto/keys.h
@@ -23,7 +23,7 @@
 #include "certs.h"
 
 #ifndef SHARED_SECRETS_FILE
-# define SHARED_SECRETS_FILE  "/etc/ipsec.secrets"
+# define SHARED_SECRETS_FILE  IPSEC_CONFDIR "/ipsec.secrets"
 #endif
 
 const char *shared_secrets_file;
diff --git a/src/pluto/log.h b/src/pluto/log.h
index 0bf8219aa..a4eae9d1c 100644
--- a/src/pluto/log.h
+++ b/src/pluto/log.h
@@ -18,8 +18,8 @@
 
 #define LOG_WIDTH   1024    /* roof of number of chars in log line */
 
-#ifndef PERPERRLOGDIR
-#define PERPERRLOGDIR "/var/log/pluto/peer"
+#ifndef PERPEERLOGDIR
+#define PERPEERLOGDIR "/var/log/pluto/peer"
 #endif
 
 /* our versions of assert: log result */
diff --git a/src/pluto/nat_traversal.c b/src/pluto/nat_traversal.c
index 2f5ba3cb4..c95ec6353 100644
--- a/src/pluto/nat_traversal.c
+++ b/src/pluto/nat_traversal.c
@@ -28,7 +28,7 @@
 #include <sys/queue.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 #include <pfkeyv2.h>
 #include <pfkey.h>
 #include "constants.h"
diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c
index f31b96c7f..a338be446 100644
--- a/src/pluto/ocsp.c
+++ b/src/pluto/ocsp.c
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/pem.c b/src/pluto/pem.c
index e8d381741..db6d0d7e3 100644
--- a/src/pluto/pem.c
+++ b/src/pluto/pem.c
@@ -28,7 +28,7 @@
 
 #include <freeswan.h>
 #define HEADER_DES_LOCL_H   /* stupid trick to force prototype decl in <des.h> */
-#include <crypto/des.h>
+#include <libdes/des.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/pgp.c b/src/pluto/pgp.c
index 015319aaf..307303f6b 100644
--- a/src/pluto/pgp.c
+++ b/src/pluto/pgp.c
@@ -19,7 +19,7 @@
 #include <time.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/pkcs7.c b/src/pluto/pkcs7.c
index 0691a80d6..3068c0c94 100644
--- a/src/pluto/pkcs7.c
+++ b/src/pluto/pkcs7.c
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <crypto/des.h>
+#include <libdes/des.h>
 
 #include <freeswan.h>
 
diff --git a/src/pluto/rcv_info.c b/src/pluto/rcv_info.c
deleted file mode 100644
index 1f6127830..000000000
--- a/src/pluto/rcv_info.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* info/policy communicating routines
- * Copyright (C) 2003       Michael Richardson <mcr@freeswan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * RCSID $Id: rcv_info.c,v 1.2 2004/04/01 18:44:38 as Exp $
- */
-
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <resolv.h>
-#include <arpa/nameser.h>	/* missing from <resolv.h> on old systems */
-#include <sys/queue.h>
-
-#include <freeswan.h>
-
-#include "constants.h"
-#include "defs.h"
-#include "id.h"
-#include "connections.h"
-#include "foodgroups.h"
-#include "whack.h"	/* needs connections.h */
-#include "packet.h"
-#include "demux.h"	/* needs packet.h */
-#include "state.h"
-#include "ipsec_doi.h"	/* needs demux.h and state.h */
-#include "kernel.h"
-#include "rcv_whack.h"
-#include "log.h"
-#include "keys.h"
-#include "adns.h"	/* needs <resolv.h> */
-#include "dnskey.h"	/* needs keys.h and adns.h */
-#include "server.h"
-
-#include "freeswan/ipsec_policy.h"
-#include "rcv_info.h"
-
-/* global */
-int info_fd = -1;
-
-static void
-info_lookuphostpair(struct ipsec_policy_cmd_query *ipcq)
-{
-    struct connection *c;
-    struct state *p1st, *p2st;
-
-
-    /* default result: no crypto */
-    ipcq->strength  = IPSEC_PRIVACY_NONE;
-    ipcq->bandwidth = IPSEC_QOS_WIRESPEED;
-    ipcq->credential_count = 0;
-
-#ifdef DEBUG
-    {
-	char sstr[ADDRTOT_BUF], dstr[ADDRTOT_BUF];
-
-	addrtot(&ipcq->query_local,  0, sstr, sizeof(sstr));
-	addrtot(&ipcq->query_remote, 0, dstr, sizeof(dstr));
-	DBG_log("info request for %s -> %s", sstr, dstr);
-    }
-#endif
-
-    /* okay, look up what connection handles this ip pair */
-
-    c = find_connection_for_clients(NULL,
-				    &ipcq->query_local,
-				    &ipcq->query_remote);
-    if (c == NULL)
-    {
-	/* try reversing it */
-	c = find_connection_for_clients(NULL,
-					&ipcq->query_remote,
-					&ipcq->query_local);
-	if (c != NULL)
-	{
-	    ip_address tmp;
-	    tmp = ipcq->query_local;
-	    ipcq->query_local = ipcq->query_remote;
-	    ipcq->query_remote = tmp;
-	}
-    }
-    
-    if (c == NULL)
-    {
-#ifdef DEBUG
-	DBG_log("no connection found");
-#endif
-	return;	/* no crypto */
-    }
-
-    if (c->newest_ipsec_sa == SOS_NOBODY)
-    {
-	ip_subnet us, them;
-
-	DBG_log("connection %s found, no ipsec state, looking again", c->name);
-	addrtosubnet(&ipcq->query_local, &us);
-	addrtosubnet(&ipcq->query_remote, &them);
-	c = find_client_connection(c, &us, &them);
-
-	if (c == NULL)
-	    return;	/* no crypto */
-    }
-
-    DBG_log("connection %s[%ld] with state %u"
-	, c->name, c->instance_serial
-	, (unsigned int)c->newest_ipsec_sa);
-
-    if (c->newest_ipsec_sa == SOS_NOBODY)
-	return;	/* no crypto */
-
-    /* we found a connection, try to lookup the state */
-    p2st = state_with_serialno(c->newest_ipsec_sa);
-
-    p1st = find_phase1_state(c, ISAKMP_SA_ESTABLISHED_STATES);
-
-    if (p1st == NULL || p2st == NULL)
-    {
-	DBG_log("connection %s[%ld] has missing states %s %s"
-	    , c->name, c->instance_serial
-	    , (p1st ? "phase1" : "")
-	    , (p2st ? "phase1" : ""));
-	return;	/* no crypto */
-    }
-
-    /* if we have AH present, then record minimal info */
-    if (p2st->st_ah.present)
-    {
-	ipcq->strength = IPSEC_PRIVACY_INTEGRAL;
-	ipcq->auth_detail = p2st->st_esp.attrs.auth;
-    }
-
-    if (p2st->st_esp.present)
-    {
-	/*
-	 * XXX-mcr Please do not shout at me about relative strengths
-	 *         here. I'm not a cryptographer. I just diddle bits.
-	 */
-	switch (p2st->st_esp.attrs.transid)
-	{
-	case ESP_NULL:
-	    /* actually, do not change it if we set it from AH */
-	    break;
-
-	case ESP_DES:
-	case ESP_DES_IV64:
-	case ESP_DES_IV32:
-	case ESP_RC4:
-	    ipcq->strength = IPSEC_PRIVACY_ROT13;
-	    break;
-	    
-	case ESP_RC5:
-	case ESP_IDEA:
-	case ESP_CAST:
-	case ESP_BLOWFISH:
-	case ESP_3DES:
-	    ipcq->strength = IPSEC_PRIVACY_PRIVATE;
-	    ipcq->bandwidth = IPSEC_QOS_VOIP;
-	    break;
-
-	case ESP_3IDEA:
-	    ipcq->strength = IPSEC_PRIVACY_STRONG;
-	    ipcq->bandwidth = IPSEC_QOS_INTERACTIVE;
-	    break;
-
-	case ESP_AES:
-	    ipcq->strength = IPSEC_PRIVACY_STRONG;
-	    ipcq->bandwidth = IPSEC_QOS_FTP;
-	    break;
-	}
-	ipcq->esp_detail = p2st->st_esp.attrs.transid;
-    }
-
-    if (p2st->st_ipcomp.present)
-	ipcq->comp_detail = p2st->st_esp.attrs.transid;
-
-    /* now! the credentails that were used */
-    /* for the moment we only have 1 credential, the DNS name,
-     * because the DNS servers do not return the chain of SIGs yet
-     */
-
-    if(!c->spd.this.key_from_DNS_on_demand)
-    {
-	/* the key didn't come from the DNS in some way,
-	 * so it must have been loaded locally.
-	 */
-	ipcq->credential_count = 1;
-	ipcq->credentials[0].ii_type   = c->spd.this.id.kind;
-	ipcq->credentials[0].ii_format = CERT_RAW_RSA;
-    }
-	
-#if 0
-    switch (c->spd.id.kind)
-    {
-    case ID_IPV4_ADDR:
-    }
-    if (c->gw_info == NULL)
-    {
-	plog("rcv_info: connection %s had NULL gw_info.", c->name);
-	return
-    }
-#endif
-
-    ipcq->credential_count = 1;
-
-    /* pull credentials out of gw_info */
-    
-    switch (p1st->st_peer_pubkey->dns_auth_level)
-    {
-    case DAL_UNSIGNED:
-    case DAL_NOTSEC:
-	/* these seem to be the same for this purpose */
-	ipcq->credentials[0].ii_type   = p1st->st_peer_pubkey->id.kind;
-	ipcq->credentials[0].ii_type   = CERT_NONE;
-	idtoa(&p1st->st_peer_pubkey->id
-	    , ipcq->credentials[0].ii_credential.ipsec_dns_signed.fqdn
-	    , sizeof(ipcq->credentials[0].ii_credential.ipsec_dns_signed.fqdn));
-	break;
-	
-    case DAL_SIGNED:
-	ipcq->credentials[0].ii_type   = p1st->st_peer_pubkey->id.kind;
-	ipcq->credentials[0].ii_format = CERT_DNS_SIGNED_KEY;
-	idtoa(&p1st->st_peer_pubkey->id
-	    , ipcq->credentials[0].ii_credential.ipsec_dns_signed.fqdn
-	    , sizeof(ipcq->credentials[0].ii_credential.ipsec_dns_signed.fqdn));
-
-	if (p1st->st_peer_pubkey->dns_sig != NULL)
-	{
-	    strncat(ipcq->credentials[0].ii_credential.ipsec_dns_signed.dns_sig
-		, p1st->st_peer_pubkey->dns_sig
-		, sizeof(ipcq->credentials[0].ii_credential.ipsec_dns_signed.dns_sig));
-	}
-	break;
-
-    case DAL_LOCAL:
-	ipcq->credentials[0].ii_type   = p1st->st_peer_pubkey->id.kind;
-	ipcq->credentials[0].ii_format = CERT_RAW_RSA;
-	idtoa(&p1st->st_peer_pubkey->id
-	    , ipcq->credentials[0].ii_credential.ipsec_raw_key.id_name
-	    , sizeof(ipcq->credentials[0].ii_credential.ipsec_raw_key.id_name));
-	break;
-    }
-}
-
-/*
- * Handle an info/policy request. 
- *
- * For now, we close the socket after answering the request.
- *
- */
-void
-info_handle(int infoctlfd)
-{
-	struct sockaddr_un info_client_addr;
-	int info_addr_len = sizeof(info_client_addr);
-	/* Note: actual value in n should fit in int.  To print, cast to int. */
-	int infofd;
-	err_t err;
-	struct ipsec_policy_cmd_query ipcq;
-
-	infofd = accept(infoctlfd, (struct sockaddr *)&info_client_addr
-	    , &info_addr_len);
-
-	if (infofd < 0)
-	{
-	    log_errno((e, "accept() failed in info_handle()"));
-	    return;
-	}
-
-	err = ipsec_policy_readmsg(infofd, (unsigned char *)&ipcq, sizeof(ipcq));
-
-	if (err != NULL)
-	{
-	    log_errno((e, "readmsg said: %s", err));
-	    close(infofd);
-	    return;
-	}
-
-	switch (ipcq.head.ipm_msg_type)
-	{
-	case IPSEC_CMD_QUERY_HOSTPAIR:
-	    info_lookuphostpair(&ipcq);
-	    write(infofd, &ipcq, ipcq.head.ipm_msg_len);
-	    break;
-	    
-	default:
-	    plog("got unimplemented msg type: %d", ipcq.head.ipm_msg_type);
-	    break;
-	}
-
-	/* for now, close the socket */
-	close(infofd);
-}
diff --git a/src/pluto/rcv_info.h b/src/pluto/rcv_info.h
deleted file mode 100644
index b5eaef219..000000000
--- a/src/pluto/rcv_info.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* whack communicating routines
- * Copyright (C) 2003               Michael Richardson <mcr@freeswan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * RCSID $Id: rcv_info.h,v 1.1 2004/03/15 20:35:29 as Exp $
- */
-
-#include "freeswan/ipsec_policy.h"
-extern void info_handle(int infoctlfd);
diff --git a/src/pluto/server.c b/src/pluto/server.c
index 30251138e..2defbc042 100644
--- a/src/pluto/server.c
+++ b/src/pluto/server.c
@@ -54,7 +54,6 @@
 #include "packet.h"
 #include "demux.h"  /* needs packet.h */
 #include "rcv_whack.h"
-#include "rcv_info.h"
 #include "keys.h"
 #include "adns.h"	/* needs <resolv.h> */
 #include "dnskey.h"	/* needs keys.h and adns.h */
diff --git a/src/pluto/smartcard.c b/src/pluto/smartcard.c
index f1994f1cf..744f8a6f3 100644
--- a/src/pluto/smartcard.c
+++ b/src/pluto/smartcard.c
@@ -30,7 +30,7 @@
 #include <dlfcn.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 
diff --git a/src/pluto/spdb.c b/src/pluto/spdb.c
index 0544a1da2..6515ec7ff 100644
--- a/src/pluto/spdb.c
+++ b/src/pluto/spdb.c
@@ -23,7 +23,7 @@
 #include <sys/queue.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/pluto/x509.c b/src/pluto/x509.c
index c1b4cb6e3..2521244f7 100644
--- a/src/pluto/x509.c
+++ b/src/pluto/x509.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_policy.h>
+#include <ipsec_policy.h>
 
 #include "constants.h"
 #include "defs.h"
diff --git a/src/scepclient/Makefile b/src/scepclient/Makefile
deleted file mode 100644
index dec36c888..000000000
--- a/src/scepclient/Makefile
+++ /dev/null
@@ -1,184 +0,0 @@
-# Makefile for the scepclient
-# Copyright (C) 2005 Jan Hutter, Martin Willi
-# Hochschule fuer Technik Rapperswil
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-FREESWANSRCDIR=../..
-include ${FREESWANSRCDIR}/Makefile.inc
-
-PLUTODIR=../pluto
-OPENACDIR=../openac
-
-PROGRAM=scepclient
-EXTRA8PROC=${PROGRAM}.8
-
-LIBS=${FREESWANLIB} $(LIBDESLITE) -lgmp
-CFLAGS+= -DDEBUG -DNO_PLUTO
-
-# This compile option activates the leak detective
-ifeq ($(USE_LEAK_DETECTIVE),true)
-  CFLAGS+= -DLEAK_DETECTIVE
-endif
-
-# This compile option activates dynamic URL fetching using libcurl
-ifeq ($(USE_LIBCURL),true)
-  CFLAGS+= -DLIBCURL
-  LIBS+= -lcurl
-endif
-
-X509_OBJS= asn1.o ca.o certs.o constants.o crl.o defs.o fetch.o id.o keys.o \
-           lex.o md2.o md5.o mp_defs.o ocsp.o oid.o pem.o pgp.o pkcs1.o pkcs7.o \
-           rnd.o sha1.o smartcard.o x509.o
-
-OBJS= rsakey.o pkcs10.o loglite.o scep.o ${X509_OBJS}
-
-include ../Makefile.program
-
-loglite.o :	$(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-	
-rsakey.o :	rsakey.c rsakey.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-pkcs10.o : 	pkcs10.c pkcs10.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-scep.o :	scep.c scep.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-# X.509 library
-
-asn1.o : 	$(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-ca.o : 		$(PLUTODIR)/ca.c $(PLUTODIR)/ca.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-crl.o :		$(PLUTODIR)/crl.c $(PLUTODIR)/crl.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-certs.o :	$(PLUTODIR)/certs.c $(PLUTODIR)/certs.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-constants.o :	$(PLUTODIR)/constants.c $(PLUTODIR)/constants.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-defs.o :	$(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-fetch.o :	$(PLUTODIR)/fetch.c $(PLUTODIR)/fetch.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-id.o :		$(PLUTODIR)/id.c $(PLUTODIR)/id.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-keys.o :	$(PLUTODIR)/keys.c $(PLUTODIR)/keys.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-lex.o :		$(PLUTODIR)/lex.c $(PLUTODIR)/lex.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-md2.o :		$(PLUTODIR)/md2.c $(PLUTODIR)/md2.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-md5.o :		$(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-mp_defs.o :	$(PLUTODIR)/mp_defs.c $(PLUTODIR)/mp_defs.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-ocsp.o :	$(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-oid.o :		$(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-pem.o :		$(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-pgp.o :		$(PLUTODIR)/pgp.c $(PLUTODIR)/pgp.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-pkcs1.o :	$(PLUTODIR)/pkcs1.c $(PLUTODIR)/pkcs1.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-pkcs7.o :	$(PLUTODIR)/pkcs7.c $(PLUTODIR)/pkcs7.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-rnd.o :		$(PLUTODIR)/rnd.c $(PLUTODIR)/rnd.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-sha1.o :	$(PLUTODIR)/sha1.c $(PLUTODIR)/sha1.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-smartcard.o :	$(PLUTODIR)/smartcard.c $(PLUTODIR)/smartcard.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-x509.o :	$(PLUTODIR)/x509.c $(PLUTODIR)/x509.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-doxygen : 
-		doxygen doxyconfig.DoxyFile
-
-# Stolen from pluto/Makefile
-
-gatherdeps:
-		@ls | grep '\.c$$' | sed -e 's/\(.*\)\.c$$/\1.o: \1.c/'
-		@echo
-		@ls | grep '\.c$$' | xargs grep '^#[    ]*include[      ]*"' | \
-                sed -e 's/\.c:#[        ]*include[      ]*"/.o: /' -e 's/".*//'
-
-# Dependencies generated by "make gatherdeps":
-
-pkcs10.o: pkcs10.c
-rsakey.o: rsakey.c
-scep.o: scep.c
-scepclient.o: scepclient.c
-
-pkcs10.o: ../pluto/constants.h
-pkcs10.o: ../pluto/defs.h
-pkcs10.o: ../pluto/oid.h
-pkcs10.o: ../pluto/asn1.h
-pkcs10.o: ../pluto/pkcs1.h
-pkcs10.o: ../pluto/log.h
-pkcs10.o: ../pluto/x509.h
-pkcs10.o: pkcs10.h
-rsakey.o: ../pluto/constants.h
-rsakey.o: ../pluto/defs.h
-rsakey.o: ../pluto/mp_defs.h
-rsakey.o: ../pluto/log.h
-rsakey.o: ../pluto/asn1.h
-rsakey.o: ../pluto/pkcs1.h
-rsakey.o: rsakey.h
-scep.o: ../pluto/constants.h
-scep.o: ../pluto/defs.h
-scep.o: ../pluto/rnd.h
-scep.o: ../pluto/oid.h
-scep.o: ../pluto/asn1.h
-scep.o: ../pluto/pkcs1.h
-scep.o: ../pluto/fetch.h
-scep.o: ../pluto/log.h
-scep.o: scep.h
-scepclient.o: ../pluto/constants.h
-scepclient.o: ../pluto/defs.h
-scepclient.o: ../pluto/log.h
-scepclient.o: ../pluto/oid.h
-scepclient.o: ../pluto/asn1.h
-scepclient.o: ../pluto/pkcs1.h
-scepclient.o: ../pluto/pkcs7.h
-scepclient.o: ../pluto/certs.h
-scepclient.o: ../pluto/fetch.h
-scepclient.o: ../pluto/rnd.h
-scepclient.o: rsakey.h
-scepclient.o: pkcs10.h
-scepclient.o: scep.h
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
new file mode 100644
index 000000000..0031b0348
--- /dev/null
+++ b/src/scepclient/Makefile.am
@@ -0,0 +1,93 @@
+ipsec_PROGRAMS = scepclient
+scepclient_SOURCES = rsakey.c rsakey.h pkcs10.c pkcs10.h scep.c scep.h scepclient.c
+
+INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto -I$(top_srcdir)/src/whack -I$(top_srcdir)/src/libcrypto
+AM_CFLAGS = -DDEBUG -DNO_PLUTO -DIPSEC_CONFDIR=\"${confdir}\"
+scepclient_LDADD = asn1.o ca.o crl.o certs.o constants.o defs.o fetch.o id.o \
+                   keys.o lex.o md2.o md5.o mp_defs.o ocsp.o oid.o pem.o pgp.o \
+                   pkcs1.o pkcs7.o rnd.o sha1.o smartcard.o x509.o loglite.o \
+                   $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
+                   -lgmp
+
+dist_man_MANS = scepclient.8
+
+PLUTODIR=$(top_srcdir)/src/pluto
+OPENACDIR=$(top_srcdir)/src/openac
+
+
+loglite.o:	$(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+asn1.o :	$(PLUTODIR)/asn1.c $(PLUTODIR)/asn1.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+ca.o :		$(PLUTODIR)/ca.c $(PLUTODIR)/ca.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+certs.o :	$(PLUTODIR)/certs.c $(PLUTODIR)/certs.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+constants.o :	$(PLUTODIR)/constants.c $(PLUTODIR)/constants.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+crl.o : 	$(PLUTODIR)/crl.c $(PLUTODIR)/crl.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+defs.o : 	$(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+mp_defs.o :	$(PLUTODIR)/mp_defs.c $(PLUTODIR)/mp_defs.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+fetch.o : 	$(PLUTODIR)/fetch.c $(PLUTODIR)/fetch.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+id.o : 		$(PLUTODIR)/id.c $(PLUTODIR)/id.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+keys.o :	$(PLUTODIR)/keys.c $(PLUTODIR)/keys.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+lex.o :		$(PLUTODIR)/lex.c $(PLUTODIR)/lex.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+md2.o :		$(PLUTODIR)/md2.c $(PLUTODIR)/md2.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+md5.o :		$(PLUTODIR)/md5.c $(PLUTODIR)/md5.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+ocsp.o :	$(PLUTODIR)/ocsp.c $(PLUTODIR)/ocsp.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+oid.o :		$(PLUTODIR)/oid.c $(PLUTODIR)/oid.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+pem.o :		$(PLUTODIR)/pem.c $(PLUTODIR)/pem.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+pgp.o :		$(PLUTODIR)/pgp.c $(PLUTODIR)/pgp.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+pkcs1.o :	$(PLUTODIR)/pkcs1.c $(PLUTODIR)/pkcs1.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+pkcs7.o :	$(PLUTODIR)/pkcs7.c $(PLUTODIR)/pkcs7.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+rnd.o :		$(PLUTODIR)/rnd.c $(PLUTODIR)/rnd.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+sha1.o :	$(PLUTODIR)/sha1.c $(PLUTODIR)/sha1.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+smartcard.o :	$(PLUTODIR)/smartcard.c $(PLUTODIR)/smartcard.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+x509.o :	$(PLUTODIR)/x509.c $(PLUTODIR)/x509.h
+		$(COMPILE) $(INCLUDES) -c -o $@ $<
+
+# This compile option activates dynamic URL fetching using libcurl
+if USE_LIBCURL
+  scepclient_LDADD += -lcurl
+endif
diff --git a/src/starter/Makefile b/src/starter/Makefile
deleted file mode 100644
index a0ff51bfa..000000000
--- a/src/starter/Makefile
+++ /dev/null
@@ -1,193 +0,0 @@
-# ipsec starter Makefile
-# Copyright (C) 2001 Mathieu Lafon - Arkoon Network Security
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# RCSID $Id: Makefile,v 1.14 2006/02/17 19:34:02 as Exp $
-
-FREESWANSRCDIR?=$(shell cd ../..; pwd)
-include ${FREESWANSRCDIR}/Makefile.inc
-
-LD=$(CC)
-RM=rm
-LEX=flex
-BISON=bison
-GPERF=gperf
-
-FREESWANDIR=../..
-FREESWANLIB=$(FREESWANDIR)/lib/libfreeswan/libfreeswan.a
-PLUTODIR=../pluto
-OPENACDIR=../openac
-
-DEFINES+= -DVIRTUAL_IP -DDEBUG
-
-# This compile option activates the leak detective
-ifeq ($(USE_LEAK_DETECTIVE),true)
-  DEFINES+= -DLEAK_DETECTIVE
-endif
-
-INCLUDES=-I${FREESWANDIR}/linux/include
-CFLAGS=$(DEFINES) $(INCLUDES) -Wall
-CFLAGS+=-DIPSEC_EXECDIR=\"${FINALLIBEXECDIR}\" -DIPSEC_CONFDDIR=\"${FINALCONFDDIR}\"
-CFLAGS+=-DIPSEC_CONFDIR=\"${FINALCONFDIR}\"
-LDFLAGS=
-
-PLUTO_OBJS=defs.o
-
-OBJS=starter.o parser.tab.o lex.yy.o keywords.o args.o invokepluto.o \
-     starterwhack.o netkey.o interfaces.o exec.o cmp.o confread.o \
-     loglite.o ${PLUTO_OBJS}
-
-# Build charon-only objs
-OBJS+= invokecharon.o starterstroke.o
-
-DISTSRC=$(OBJS:.o=.c)
-DISTSRC+=cmp.h confread.h confwrite.h exec.h files.h interfaces.h netkey.h
-DISTSRC+=parser.h args.h invokepluto.h starterwhack.h keywords.h keywords.txt
-
-LIBS=$(FREESWANLIB)
-
-PROGRAM=starter
-
-include ../Makefile.program
-
-all:	starter
-
-starter:	$(OBJS) $(FREESWANLIB)
-		$(LD) $(LDFLAGS) -o starter $(OBJS) $(LIBS)
-
-lex.yy.c:	parser.tab.c parser.l parser.y parser.h
-		$(LEX) parser.l
-
-parser.tab.c:	parser.l parser.y parser.h
-		$(BISON) -v -d parser.y
-
-keywords.c:	keywords.txt keywords.h
-		$(GPERF) -C -G -t < keywords.txt > keywords.c
-
-.c.o:
-		$(CC) $(CFLAGS) -c $<
-
-loglite.o :	$(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-# pluto library
-
-defs.o : 	$(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
-		$(CC) $(CFLAGS) -c -o $@ $<
-
-clean::
-		$(RM) -f starter $(OBJS) parser.tab.* lex.yy.*
-
-# Stolen from pluto/Makefile
-
-gatherdeps:
-		@ls | grep '\.c$$' | sed -e 's/\(.*\)\.c$$/\1.o: \1.c/'
-		@echo
-		@ls | grep '\.c$$' | xargs grep '^#[    ]*include[      ]*"' | \
-                sed -e 's/\.c:#[        ]*include[      ]*"/.o: /' -e 's/".*//'
-
-# Dependencies generated by "make gatherdeps":
-
-aargs.o: args.c
-cmp.o: cmp.c
-confread.o: confread.c
-exec.o: exec.c
-interfaces.o: interfaces.c
-invokecharon.o: invokecharon.c
-invokepluto.o: invokepluto.c
-keywords.o: keywords.c
-lex.yy.o: lex.yy.c
-netkey.o: netkey.c
-parser.tab.o: parser.tab.c
-starter.o: starter.c
-starterstroke.o: starterstroke.c
-starterwhack.o: starterwhack.c
-
-args.o: ../pluto/constants.h
-args.o: ../pluto/defs.h
-args.o: ../pluto/log.h
-args.o: keywords.h
-args.o: parser.h
-args.o: confread.h
-args.o: args.h
-cmp.o: ../pluto/constants.h
-cmp.o: ../pluto/defs.h
-cmp.o: confread.h
-cmp.o: args.h
-cmp.o: interfaces.h
-cmp.o: cmp.h
-confread.o: ../pluto/constants.h
-confread.o: ../pluto/defs.h
-confread.o: ../pluto/log.h
-confread.o: keywords.h
-confread.o: parser.h
-confread.o: confread.h
-confread.o: args.h
-confread.o: interfaces.h
-exec.o: ../pluto/constants.h
-exec.o: ../pluto/defs.h
-exec.o: ../pluto/log.h
-exec.o: exec.h
-interfaces.o: ../pluto/constants.h
-interfaces.o: ../pluto/defs.h
-interfaces.o: ../pluto/log.h
-interfaces.o: interfaces.h
-interfaces.o: exec.h
-interfaces.o: files.h
-invokecharon.o: ../pluto/constants.h
-invokecharon.o: ../pluto/defs.h
-invokecharon.o: ../pluto/log.h
-invokecharon.o: confread.h
-invokecharon.o: invokecharon.h
-invokecharon.o: files.h
-invokepluto.o: ../pluto/constants.h
-invokepluto.o: ../pluto/defs.h
-invokepluto.o: ../pluto/log.h
-invokepluto.o: confread.h
-invokepluto.o: invokepluto.h
-invokepluto.o: files.h
-invokepluto.o: starterwhack.h
-keywords.o: keywords.h
-lex.yy.o: parser.tab.h
-netkey.o: ../pluto/constants.h
-netkey.o: ../pluto/defs.h
-netkey.o: ../pluto/log.h
-netkey.o: files.h
-parser.tab.o: ../pluto/constants.h
-parser.tab.o: ../pluto/defs.h
-parser.tab.o: ../pluto/log.h
-parser.tab.o: parser.h
-starter.o: ../pluto/constants.h
-starter.o: ../pluto/defs.h
-starter.o: ../pluto/log.h
-starter.o: confread.h
-starter.o: files.h
-starter.o: starterwhack.h
-starter.o: invokepluto.h
-starter.o: invokecharon.h
-starter.o: netkey.h
-starter.o: cmp.h
-starter.o: interfaces.h
-starterstroke.o: ../pluto/constants.h
-starterstroke.o: ../pluto/defs.h
-starterstroke.o: ../pluto/log.h
-starterstroke.o: ../charon/stroke/stroke.h
-starterstroke.o: starterstroke.h
-starterstroke.o: confread.h
-starterstroke.o: files.h
-starterwhack.o: ../pluto/constants.h
-starterwhack.o: ../pluto/defs.h
-starterwhack.o: ../pluto/log.h
-starterwhack.o: ../pluto/whack.h
-starterwhack.o: starterwhack.h
-starterwhack.o: confread.h
-starterwhack.o: files.h
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
new file mode 100644
index 000000000..1c050e40e
--- /dev/null
+++ b/src/starter/Makefile.am
@@ -0,0 +1,32 @@
+ipsec_PROGRAMS = starter
+starter_SOURCES = y.tab.c netkey.c y.tab.h parser.h args.h netkey.h \
+starterwhack.c starterwhack.h starterstroke.c invokepluto.c confread.c \
+starterstroke.h interfaces.c invokepluto.h confread.h  interfaces.h args.c \
+keywords.c files.h keywords.h cmp.c starter.c cmp.h exec.c invokecharon.c \
+exec.h invokecharon.h lex.yy.c
+
+INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto -I$(top_srcdir)/src/whack -I$(top_srcdir)/src/stroke
+AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${confdir}\" -DIPSEC_PIDDIR=\"${piddir}\" -DDEBUG
+starter_LDADD = loglite.o defs.o $(top_srcdir)/src/libfreeswan/libfreeswan.a
+EXTRA_DIST = parser.l parser.y keywords.txt
+
+PLUTODIR=$(top_srcdir)/src/pluto
+OPENACDIR=$(top_srcdir)/src/openac
+
+# TODO: get gperf from ./configure
+GPERF=gperf
+
+lex.yy.c:	y.tab.c parser.l parser.y parser.h
+		$(LEX) parser.l
+
+y.tab.c:	parser.l parser.y parser.h
+		$(YACC) -v -d parser.y
+
+keywords.c:	keywords.txt keywords.h
+		$(GPERF) -C -G -t < keywords.txt > keywords.c
+
+loglite.o:	$(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
+		$(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $<
+
+defs.o:		$(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
+		$(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $<
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 051ce0057..465652c02 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -71,9 +71,7 @@ struct starter_end {
 	char 		*updown;
 	u_int16_t	port;
 	u_int8_t	protocol;
-#ifdef VIRTUAL_IP
 	char		*virt;
-#endif
 };
 
 typedef struct also also_t;
diff --git a/src/starter/files.h b/src/starter/files.h
index 61f03b84e..39b89bc2d 100644
--- a/src/starter/files.h
+++ b/src/starter/files.h
@@ -17,36 +17,26 @@
 #ifndef _STARTER_FILES_H_
 #define _STARTER_FILES_H_
 
-#ifndef DEFAULT_CTLBASE
-#define DEFAULT_CTLBASE "/var/run/pluto"
-#endif
-#define CTL_SUFFIX      ".ctl"
-#define PID_SUFFIX      ".pid"
-
-#define MY_PID_FILE     "/var/run/starter.pid"
+#define STARTER_PID_FILE IPSEC_PIDDIR "/starter.pid"
 
 #define DEV_RANDOM      "/dev/random"
 #define DEV_URANDOM     "/dev/urandom"
+#define PROC_NETKEY	"/proc/net/pfkey"
+#define PROC_MODULES	"/proc/modules"
 
-#define PROC_NETKEY         "/proc/net/pfkey"
-#define PROC_IPSECVERSION   "/proc/net/ipsec_version"
-#define PROC_SYSFLAGS       "/proc/sys/net/ipsec"
-#define PROC_MODULES        "/proc/modules"
+#define CONFIG_FILE     IPSEC_CONFDIR "/ipsec.conf"
+#define SECRETS_FILE	IPSEC_CONFDIR "/ipsec.secrets"
 
-#define CONFIG_FILE     IPSEC_CONFDIR"/ipsec.conf"
-#define SECRETS_FILE	IPSEC_CONFDIR"/ipsec.secrets"
+#define PLUTO_CMD       IPSEC_DIR "/pluto"
+#define PLUTO_CTL_FILE  IPSEC_PIDDIR "/pluto.ctl"
+#define PLUTO_PID_FILE  IPSEC_PIDDIR "/pluto.pid"
 
-#define PLUTO_CMD       IPSEC_EXECDIR"/pluto"
-#define PLUTO_CTL_FILE  DEFAULT_CTLBASE CTL_SUFFIX
-#define PLUTO_PID_FILE  DEFAULT_CTLBASE PID_SUFFIX
+#define CHARON_CMD	IPSEC_DIR "/charon"
+#define CHARON_CTL_FILE IPSEC_PIDDIR "/charon.ctl"
+#define CHARON_PID_FILE IPSEC_PIDDIR "/charon.pid"
 
-#define CHARON_CMD		IPSEC_EXECDIR"/charon"
-#define CHARON_BASE		"/var/run/charon"
-#define CHARON_CTL_FILE CHARON_BASE CTL_SUFFIX
-#define CHARON_PID_FILE CHARON_BASE PID_SUFFIX
-
-#define DYNIP_DIR       "/var/run/dynip"
-#define INFO_FILE       "/var/run/ipsec.info"
+#define DYNIP_DIR       IPSEC_PIDDIR "/dynip"
+#define INFO_FILE       IPSEC_PIDDIR "/ipsec.info"
 
 #endif /* _STARTER_FILES_H_ */
 
diff --git a/src/starter/interfaces.c b/src/starter/interfaces.c
index 9926ea059..a7c8efd44 100644
--- a/src/starter/interfaces.c
+++ b/src/starter/interfaces.c
@@ -23,11 +23,11 @@
 #include <errno.h>
 
 #include <freeswan.h>
-#include <freeswan/ipsec_tunnel.h>
+#include <ipsec_tunnel.h>
 
-#include "../pluto/constants.h"
-#include "../pluto/defs.h"
-#include "../pluto/log.h"
+#include <constants.h>
+#include <defs.h>
+#include <log.h>
 
 #include "interfaces.h"
 #include "exec.h"
diff --git a/src/starter/lex.yy.c b/src/starter/lex.yy.c
index 20d2edb08..f8e6569f1 100644
--- a/src/starter/lex.yy.c
+++ b/src/starter/lex.yy.c
@@ -504,7 +504,7 @@ char *yytext;
 #include <stdlib.h>
 #include <glob.h>
 
-#include "parser.tab.h"
+#include "y.tab.h"
 
 #define MAX_INCLUDE_DEPTH  20
 
@@ -928,7 +928,7 @@ return INCLUDE;
 case 10:
 YY_RULE_SETUP
 #line 169 "parser.l"
-return VERSION;
+return FILE_VERSION;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
diff --git a/src/starter/parser.l b/src/starter/parser.l
index 8d1cc4c31..1469f94bc 100644
--- a/src/starter/parser.l
+++ b/src/starter/parser.l
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <glob.h>
 
-#include "parser.tab.h"
+#include "y.tab.h"
 
 #define MAX_INCLUDE_DEPTH  20
 
@@ -166,7 +166,7 @@ setup			return SETUP;
 conn			return CONN;
 ca			return CA;
 include			return INCLUDE;
-version			return VERSION;
+version			return FILE_VERSION;
 
 [^\"= \t\n]+	{
 					yylval.s = strdup(yytext);
diff --git a/src/starter/parser.y b/src/starter/parser.y
index 159bbc651..db984fae3 100644
--- a/src/starter/parser.y
+++ b/src/starter/parser.y
@@ -54,7 +54,7 @@ extern kw_entry_t *in_word_set (char *str, unsigned int len);
 %}
 
 %union { char *s; };
-%token EQUAL FIRST_SPACES EOL CONFIG SETUP CONN CA INCLUDE VERSION
+%token EQUAL FIRST_SPACES EOL CONFIG SETUP CONN CA INCLUDE FILE_VERSION
 %token <s> STRING
 
 %%
@@ -69,7 +69,7 @@ config_file:
     ;
 
 section_or_include:
-    VERSION STRING EOL
+    FILE_VERSION STRING EOL
     {
 	free($2);
     }
diff --git a/src/starter/starter.c b/src/starter/starter.c
index 2806622e4..ee7eae3bd 100644
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -200,7 +200,7 @@ int main (int argc, char **argv)
 	signal(SIGALRM, fsig);
 	signal(SIGUSR1, fsig);
 
-	plog("Starting strongSwan IPsec %s [starter]...", ipsec_version_code());
+	plog("Starting strongSwan %s IPsec [starter]...", ipsec_version_code());
 
 	/* verify that we can start */
 	if (getuid() != 0)
@@ -253,9 +253,9 @@ int main (int argc, char **argv)
 
 	last_reload = time(NULL);
 
-	if (stat(MY_PID_FILE, &stb) == 0)
+	if (stat(STARTER_PID_FILE, &stb) == 0)
 	{
-		plog("starter is already running (%s exists) -- no fork done", MY_PID_FILE);
+		plog("starter is already running (%s exists) -- no fork done", STARTER_PID_FILE);
 		exit(0);
 	}
 
@@ -289,7 +289,7 @@ int main (int argc, char **argv)
 
     /* save pid file in /var/run/starter.pid */
     {
-		FILE *fd = fopen(MY_PID_FILE, "w");
+		FILE *fd = fopen(STARTER_PID_FILE, "w");
 
 		if (fd)
 		{
@@ -311,7 +311,7 @@ int main (int argc, char **argv)
 				starter_stop_charon();
 			starter_netkey_cleanup();
 			confread_free(cfg);
-			unlink(MY_PID_FILE);
+			unlink(STARTER_PID_FILE);
 			unlink(INFO_FILE);
 #ifdef LEAK_DETECTIVE
 			report_leaks();
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index 15e646269..9ef4b7577 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -26,11 +26,11 @@
 
 #include <freeswan.h>
 
-#include "../pluto/constants.h"
-#include "../pluto/defs.h"
-#include "../pluto/log.h"
+#include <constants.h>
+#include <defs.h>
+#include <log.h>
 
-#include "../charon/stroke/stroke.h"
+#include <stroke.h>
 
 #include "starterstroke.h"
 #include "confread.h"
@@ -92,7 +92,7 @@ send_stroke_msg (stroke_msg_t *msg)
     }
     if (byte_count < 0)
     {
-	plog(stderr, "read() failed: %s", strerror(errno));
+	plog("read() failed: %s", strerror(errno));
     }
 
     close(sock);
diff --git a/src/starter/starterwhack.c b/src/starter/starterwhack.c
index a42d91991..38cff4aa2 100644
--- a/src/starter/starterwhack.c
+++ b/src/starter/starterwhack.c
@@ -23,10 +23,10 @@
 
 #include <freeswan.h>
 
-#include "../pluto/constants.h"
-#include "../pluto/defs.h"
-#include "../pluto/log.h"
-#include "../pluto/whack.h"
+#include <constants.h>
+#include <defs.h>
+#include <log.h>
+#include <whack.h>
 
 #include "starterwhack.h"
 #include "confread.h"
@@ -69,17 +69,13 @@ send_whack_msg (whack_message_t *msg)
     ||  !pack_str(&msg->left.ca,      &str_next, &str_roof)
     ||  !pack_str(&msg->left.groups,  &str_next, &str_roof)
     ||  !pack_str(&msg->left.updown,  &str_next, &str_roof)
-#ifdef VIRTUAL_IP
     ||  !pack_str(&msg->left.virt,    &str_next, &str_roof)
-#endif
     ||  !pack_str(&msg->right.id,     &str_next, &str_roof)
     ||  !pack_str(&msg->right.cert,   &str_next, &str_roof)
     ||  !pack_str(&msg->right.ca,     &str_next, &str_roof)
     ||  !pack_str(&msg->right.groups, &str_next, &str_roof)
     ||  !pack_str(&msg->right.updown, &str_next, &str_roof)
-#ifdef VIRTUAL_IP
     || !pack_str(&msg->right.virt,    &str_next, &str_roof)
-#endif
     || !pack_str(&msg->keyid,         &str_next, &str_roof)
     || !pack_str(&msg->myid,          &str_next, &str_roof)
     || !pack_str(&msg->cacert,        &str_next, &str_roof)
diff --git a/src/starter/parser.output b/src/starter/y.output
similarity index 91%
rename from src/starter/parser.output
rename to src/starter/y.output
index ddb01e89a..c479e1f19 100644
--- a/src/starter/parser.output
+++ b/src/starter/y.output
@@ -5,7 +5,7 @@ Grammar
     1 config_file: config_file section_or_include
     2            | /* empty */
 
-    3 section_or_include: VERSION STRING EOL
+    3 section_or_include: FILE_VERSION STRING EOL
 
     4 @1: /* empty */
 
@@ -44,7 +44,7 @@ SETUP (262) 5
 CONN (263) 7
 CA (264) 9
 INCLUDE (265) 11
-VERSION (266) 3
+FILE_VERSION (266) 3
 STRING (267) 3 7 9 11 15 16
 
 
@@ -84,13 +84,13 @@ state 1
     0 $accept: config_file . $end
     1 config_file: config_file . section_or_include
 
-    $end     shift, and go to state 2
-    EOL      shift, and go to state 3
-    CONFIG   shift, and go to state 4
-    CONN     shift, and go to state 5
-    CA       shift, and go to state 6
-    INCLUDE  shift, and go to state 7
-    VERSION  shift, and go to state 8
+    $end          shift, and go to state 2
+    EOL           shift, and go to state 3
+    CONFIG        shift, and go to state 4
+    CONN          shift, and go to state 5
+    CA            shift, and go to state 6
+    INCLUDE       shift, and go to state 7
+    FILE_VERSION  shift, and go to state 8
 
     section_or_include  go to state 9
 
@@ -139,7 +139,7 @@ state 7
 
 state 8
 
-    3 section_or_include: VERSION . STRING EOL
+    3 section_or_include: FILE_VERSION . STRING EOL
 
     STRING  shift, and go to state 14
 
@@ -183,7 +183,7 @@ state 13
 
 state 14
 
-    3 section_or_include: VERSION STRING . EOL
+    3 section_or_include: FILE_VERSION STRING . EOL
 
     EOL  shift, and go to state 19
 
@@ -224,7 +224,7 @@ state 18
 
 state 19
 
-    3 section_or_include: VERSION STRING EOL .
+    3 section_or_include: FILE_VERSION STRING EOL .
 
     $default  reduce using rule 3 (section_or_include)
 
diff --git a/src/starter/parser.tab.c b/src/starter/y.tab.c
similarity index 99%
rename from src/starter/parser.tab.c
rename to src/starter/y.tab.c
index 7b2349e76..b2e5059fa 100644
--- a/src/starter/parser.tab.c
+++ b/src/starter/y.tab.c
@@ -64,7 +64,7 @@
      CONN = 263,
      CA = 264,
      INCLUDE = 265,
-     VERSION = 266,
+     FILE_VERSION = 266,
      STRING = 267
    };
 #endif
@@ -77,7 +77,7 @@
 #define CONN 263
 #define CA 264
 #define INCLUDE 265
-#define VERSION 266
+#define FILE_VERSION 266
 #define STRING 267
 
 
@@ -162,7 +162,7 @@ extern kw_entry_t *in_word_set (char *str, unsigned int len);
 #line 56 "parser.y"
 typedef union YYSTYPE { char *s; } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 166 "parser.tab.c"
+#line 166 "y.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -174,7 +174,7 @@ typedef union YYSTYPE { char *s; } YYSTYPE;
 
 
 /* Line 219 of yacc.c.  */
-#line 178 "parser.tab.c"
+#line 178 "y.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -409,7 +409,7 @@ static const unsigned char yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "EQUAL", "FIRST_SPACES", "EOL", "CONFIG",
-  "SETUP", "CONN", "CA", "INCLUDE", "VERSION", "STRING", "$accept",
+  "SETUP", "CONN", "CA", "INCLUDE", "FILE_VERSION", "STRING", "$accept",
   "config_file", "section_or_include", "@1", "@2", "@3", "@4",
   "kw_section", "statement_kw", 0
 };
@@ -1172,7 +1172,7 @@ yyreduce:
 #line 73 "parser.y"
     {
 	free((yyvsp[-1].s));
-    ;}
+    }
     break;
 
   case 5:
@@ -1180,7 +1180,7 @@ yyreduce:
     {
 	_parser_kw = &(_parser_cfg->config_setup);
 	_parser_kw_last = NULL;
-    ;}
+    }
     break;
 
   case 7:
@@ -1200,7 +1200,7 @@ yyreduce:
 	_parser_cfg->conn_last = section;
 	_parser_kw_last = NULL;
 	free((yyvsp[-1].s));
-    ;}
+    }
     break;
 
   case 9:
@@ -1219,7 +1219,7 @@ yyreduce:
 	_parser_cfg->ca_last = section;
 	_parser_kw_last = NULL;
 	free((yyvsp[-1].s));
-    ;}
+    }
     break;
 
   case 11:
@@ -1228,7 +1228,7 @@ yyreduce:
 	extern void _parser_y_include (const char *f);
 	_parser_y_include((yyvsp[0].s));
 	free((yyvsp[0].s));
-    ;}
+    }
     break;
 
   case 16:
@@ -1256,14 +1256,14 @@ yyreduce:
 	}
 	free((yyvsp[-2].s));
 	free((yyvsp[0].s));
-    ;}
+    }
     break;
 
   case 17:
 #line 155 "parser.y"
     {
 	free((yyvsp[-1].s));
-      ;}
+      }
     break;
 
 
@@ -1271,7 +1271,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 1275 "parser.tab.c"
+#line 1275 "y.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
diff --git a/src/starter/parser.tab.h b/src/starter/y.tab.h
similarity index 96%
rename from src/starter/parser.tab.h
rename to src/starter/y.tab.h
index 1ded28fdb..e02fe09e7 100644
--- a/src/starter/parser.tab.h
+++ b/src/starter/y.tab.h
@@ -37,7 +37,7 @@
      CONN = 263,
      CA = 264,
      INCLUDE = 265,
-     VERSION = 266,
+     FILE_VERSION = 266,
      STRING = 267
    };
 #endif
@@ -50,7 +50,7 @@
 #define CONN 263
 #define CA 264
 #define INCLUDE 265
-#define VERSION 266
+#define FILE_VERSION 266
 #define STRING 267
 
 
@@ -60,7 +60,7 @@
 #line 56 "parser.y"
 typedef union YYSTYPE { char *s; } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 64 "parser.tab.h"
+#line 64 "y.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
diff --git a/src/stroke/Makefile.am b/src/stroke/Makefile.am
new file mode 100644
index 000000000..611f2a808
--- /dev/null
+++ b/src/stroke/Makefile.am
@@ -0,0 +1,4 @@
+ipsec_PROGRAMS = stroke
+
+stroke_SOURCES = stroke.c stroke.h
+stroke_INCLUDES = -I$(top_srcdir)/src/libstrongswan
diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c
index 7a734a05f..f53d88f06 100644
--- a/src/stroke/stroke.c
+++ b/src/stroke/stroke.c
@@ -238,7 +238,7 @@ static void exit_usage(char *error)
 
 int main(int argc, char *argv[])
 {
-	int res;
+	int res = 0;
 	char *op;
 	
 	if (argc < 2)
diff --git a/src/whack/Makefile.am b/src/whack/Makefile.am
new file mode 100644
index 000000000..7eabef588
--- /dev/null
+++ b/src/whack/Makefile.am
@@ -0,0 +1,5 @@
+ipsec_PROGRAMS = whack
+
+whack_SOURCES = whack.c whack.h
+INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto
+LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a
diff --git a/src/whack/whack.c b/src/whack/whack.c
index a3b983771..98867eab5 100644
--- a/src/whack/whack.c
+++ b/src/whack/whack.c
@@ -1334,7 +1334,6 @@ main(int argc, char **argv)
 	    if (end_seen & LELEM(END_CLIENTWITHIN - END_FIRST))
 		diag("--client conflicts with --clientwithin");
 	    tunnel_af_used_by = long_opts[long_index].name;
-#ifdef VIRTUAL_IP
 	    if ((strlen(optarg) >= 6 && strncmp(optarg,"vhost:",6) == 0)
 	    ||  (strlen(optarg) >= 5 && strncmp(optarg,"vnet:",5) == 0))
 	    {
@@ -1345,10 +1344,6 @@ main(int argc, char **argv)
 		diagq(ttosubnet(optarg, 0, msg.tunnel_addr_family, &msg.right.client), optarg);
 		msg.right.has_client = TRUE;
 	    }
-#else
-	    diagq(ttosubnet(optarg, 0, msg.tunnel_addr_family, &msg.right.client), optarg);
-	    msg.right.has_client = TRUE;
-#endif
 	    msg.policy |= POLICY_TUNNEL;	/* client => tunnel */
 	    continue;
 
@@ -1744,17 +1739,13 @@ main(int argc, char **argv)
     || !pack_str(&msg.left.ca)		/* string  4 */
     || !pack_str(&msg.left.groups)	/* string  5 */
     || !pack_str(&msg.left.updown)	/* string  6 */
-#ifdef VIRTUAL_IP
     || !pack_str(&msg.left.virt)
-#endif
     || !pack_str(&msg.right.id)		/* string  7 */
     || !pack_str(&msg.right.cert)	/* string  8 */
     || !pack_str(&msg.right.ca)		/* string  9 */
     || !pack_str(&msg.right.groups)	/* string 10 */
     || !pack_str(&msg.right.updown)	/* string 11 */
-#ifdef VIRTUAL_IP
     || !pack_str(&msg.right.virt)
-#endif
     || !pack_str(&msg.keyid)		/* string 12 */
     || !pack_str(&msg.myid)		/* string 13 */
     || !pack_str(&msg.cacert)		/* string 14 */
diff --git a/src/whack/whack.h b/src/whack/whack.h
index a62853f61..96e4cff98 100644
--- a/src/whack/whack.h
+++ b/src/whack/whack.h
@@ -19,6 +19,8 @@
 
 #include <freeswan.h>
 
+#include <smartcard.h>
+
 /* Since the message remains on one host, native representation is used.
  * Think of this as horizontal microcode: all selected operations are
  * to be done (in the order declared here).
@@ -67,9 +69,7 @@ struct whack_end {
     u_int16_t host_port;	/* host order */
     u_int16_t port;		/* host order */
     u_int8_t protocol;
-#ifdef VIRTUAL_IP
     char *virt;
-#endif
  };
 
 typedef struct whack_message whack_message_t;
diff --git a/utils/manlink b/utils/manlink
deleted file mode 100755
index 84e6031b2..000000000
--- a/utils/manlink
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-#
-# $Id: manlink,v 1.1 2004/03/15 20:35:27 as Exp $
-#
-# make list of alternate names for manpages
-
-PATH=/bin:/usr/bin ; export PATH
-usage="$0 manpage ..."
-
-for m
-do
-    bm=`basename $m`
-	if test ! -f $m
-	then
-		echo "$0: cannot find \`$m'" >&2
-		exit 1
-	fi
-	suf=$(expr $bm : '.*\([.][^.][^.]*\)$')
-
-	# a .\"+ line rules
-	them=$(awk '/^\.\\"\+[ 	]/ { for (i = 2; i <= NF; i++) print $i }' $m)
-
-	# otherwise, try to intuit the list of names from the NAME section
-	if test " $them" = " "
-	then
-		them=$(	awk '/^\.SH[ \t]+NAME/,/^\.SH[ \t]+[^N]/' $m |
-			egrep -v '^\.' | tr '	,' '  ' |
-			sed -n '/  *\\*-  *.*/s///p' | tr -s ' ' '\012' |
-			egrep -v '^ipsec$' )
-	fi
-
-	# do it
-	for f in $them
-	do
-		case $f in
-		ipsec*)	ff="$f"		;;	# ipsec.8, ipsec.conf.5, etc.
-		*)	ff="ipsec_$f"	;;
-		esac
-		case $ff in
-		*.[1-8])			;;
-		*)		ff="$ff$suf"	;;
-		esac
-		#echo "Q: $bm FF: $ff" >&2
-		if [ " $ff" != " $bm" ] && [ " $ff" != " ipsec_$bm" ]
-		then
-   		    echo $bm $ff
-		fi
-	done
-done
-
-#
-# $Log: manlink,v $
-# Revision 1.1  2004/03/15 20:35:27  as
-# added files from freeswan-2.04-x509-1.5.3
-#
-# Revision 1.8  2002/09/17 20:17:16  sam
-#
-# The "make doc" fix broke "make install" silently; some man page symlinks
-# were being linked incorrectly. This resulted in files which passed the make
-# install test but linked to nothing.
-#
-# Revision 1.7  2002/08/07 06:23:35  sam
-#
-#  	freeswan/packaging/utils/manlink
-#
-# Revision 1.6  2002/05/06 21:20:24  mcr
-# 	manlink -n idea is a fail. It depended upon being able to
-# 	read the man page at the installed location, which isn't going
-# 	to work consistently. manlink now just generates a list of links
-# 	that should be made, leaving the Makefile script to decide what
-# 	to do with them. Further, it now processes the files found in the
-# 	repository, rather than the ones installed.
-#
-#