- added ipsec.conf template and man page back

- removed old Makefiles
- added new strongswan KDevelop project & startup hack

12 files changed, 21 insertions, 371 deletions

diff --git a/src/libcrypto/Makefile.am b/src/libcrypto/Makefile.am
index 68720f486..61686cd5e 100644
--- a/src/libcrypto/Makefile.am
+++ b/src/libcrypto/Makefile.am
@@ -1,45 +1,11 @@
 noinst_LIBRARIES = libcrypto.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
+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.clibdes/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.clibdes/des_locl.h libdes/des_ver.h libdes/des.h
 
 INCLUDES = -I$(top_srcdir)/src/libcrypto/include
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 85e6e97b6..81681bc10 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -1,69 +1,18 @@
 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 
+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 
 
 libstrongswan_la_LIBADD = -lgmp -lpthread
 
diff --git a/src/libstrongswan/Makefile.lib b/src/libstrongswan/Makefile.lib
deleted file mode 100644
index 80a44ff69..000000000
--- a/src/libstrongswan/Makefile.lib
+++ /dev/null
@@ -1,31 +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.
-#
-
-LIB_DIR= $(MAIN_DIR)lib/
-
-include $(MAIN_DIR)lib/utils/Makefile.utils
-include $(MAIN_DIR)lib/crypto/Makefile.transforms
-include $(MAIN_DIR)lib/asn1/Makefile.asn1
-
-LIB_OBJS+= $(BUILD_DIR)types.o
-$(BUILD_DIR)types.o :			$(LIB_DIR)types.c $(LIB_DIR)types.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)definitions.o
-$(BUILD_DIR)definitions.o :		$(LIB_DIR)definitions.c $(LIB_DIR)definitions.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)library.o
-$(BUILD_DIR)library.o :			$(LIB_DIR)library.c $(LIB_DIR)library.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/libstrongswan/asn1/Makefile.asn1 b/src/libstrongswan/asn1/Makefile.asn1
deleted file mode 100644
index 3a5450d50..000000000
--- a/src/libstrongswan/asn1/Makefile.asn1
+++ /dev/null
@@ -1,29 +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.
-#
-
-ASN1_DIR= $(LIB_DIR)asn1/
-
-
-LIB_OBJS+= $(BUILD_DIR)oid.o
-$(BUILD_DIR)oid.o :							$(ASN1_DIR)oid.c $(ASN1_DIR)oid.h
-											$(CC) $(CFLAGS) -c -o $@ $<
-LIB_OBJS+= $(BUILD_DIR)asn1.o
-$(BUILD_DIR)asn1.o :						$(ASN1_DIR)asn1.c $(ASN1_DIR)asn1.h
-											$(CC) $(CFLAGS) -c -o $@ $<
-LIB_OBJS+= $(BUILD_DIR)pem.o
-$(BUILD_DIR)pem.o :							$(ASN1_DIR)pem.c $(ASN1_DIR)pem.h
-											$(CC) $(CFLAGS) -c -o $@ $<
-LIB_OBJS+= $(BUILD_DIR)ttodata.o
-$(BUILD_DIR)ttodata.o :						$(ASN1_DIR)ttodata.c $(ASN1_DIR)ttodata.h
-											$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/libstrongswan/crypto/Makefile.transforms b/src/libstrongswan/crypto/Makefile.transforms
deleted file mode 100644
index af0b147da..000000000
--- a/src/libstrongswan/crypto/Makefile.transforms
+++ /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.
-#
-
-CRYPTO_DIR= $(LIB_DIR)crypto/
-
-include $(CRYPTO_DIR)crypters/Makefile.crypters
-include $(CRYPTO_DIR)hashers/Makefile.hashers
-include $(CRYPTO_DIR)prfs/Makefile.prfs
-include $(CRYPTO_DIR)signers/Makefile.signers
-include $(CRYPTO_DIR)rsa/Makefile.rsa
-
-LIB_OBJS+= $(BUILD_DIR)diffie_hellman.o
-$(BUILD_DIR)diffie_hellman.o :	$(CRYPTO_DIR)diffie_hellman.c $(CRYPTO_DIR)diffie_hellman.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)hmac.o
-$(BUILD_DIR)hmac.o :			$(CRYPTO_DIR)hmac.c $(CRYPTO_DIR)hmac.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)prf_plus.o
-$(BUILD_DIR)prf_plus.o :		$(CRYPTO_DIR)prf_plus.c $(CRYPTO_DIR)prf_plus.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)x509.o
-$(BUILD_DIR)x509.o :			$(CRYPTO_DIR)x509.c $(CRYPTO_DIR)x509.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/libstrongswan/crypto/crypters/Makefile.crypters b/src/libstrongswan/crypto/crypters/Makefile.crypters
deleted file mode 100644
index 612477de8..000000000
--- a/src/libstrongswan/crypto/crypters/Makefile.crypters
+++ /dev/null
@@ -1,23 +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.
-#
-
-CRYPTERS_DIR= $(CRYPTO_DIR)crypters/
-
-LIB_OBJS+= $(BUILD_DIR)crypter.o
-$(BUILD_DIR)crypter.o :			$(CRYPTERS_DIR)crypter.c $(CRYPTERS_DIR)crypter.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-LIB_OBJS+= $(BUILD_DIR)aes_cbc_crypter.o
-$(BUILD_DIR)aes_cbc_crypter.o :	$(CRYPTERS_DIR)aes_cbc_crypter.c $(CRYPTERS_DIR)aes_cbc_crypter.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/libstrongswan/crypto/hashers/Makefile.hashers b/src/libstrongswan/crypto/hashers/Makefile.hashers
deleted file mode 100644
index e05d41af3..000000000
--- a/src/libstrongswan/crypto/hashers/Makefile.hashers
+++ /dev/null
@@ -1,27 +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.
-#
-
-HASHERS_DIR= $(CRYPTO_DIR)hashers/
-
-LIB_OBJS+= $(BUILD_DIR)hasher.o
-$(BUILD_DIR)hasher.o :			$(HASHERS_DIR)hasher.c $(HASHERS_DIR)hasher.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-LIB_OBJS+= $(BUILD_DIR)sha1_hasher.o
-$(BUILD_DIR)sha1_hasher.o :		$(HASHERS_DIR)sha1_hasher.c $(HASHERS_DIR)sha1_hasher.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-LIB_OBJS+= $(BUILD_DIR)md5_hasher.o
-$(BUILD_DIR)md5_hasher.o :		$(HASHERS_DIR)md5_hasher.c $(HASHERS_DIR)md5_hasher.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/libstrongswan/crypto/prfs/Makefile.prfs b/src/libstrongswan/crypto/prfs/Makefile.prfs
deleted file mode 100644
index a98894346..000000000
--- a/src/libstrongswan/crypto/prfs/Makefile.prfs
+++ /dev/null
@@ -1,23 +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.
-#
-
-PRFS_DIR= $(CRYPTO_DIR)prfs/
-
-LIB_OBJS+= $(BUILD_DIR)prf.o
-$(BUILD_DIR)prf.o :				$(PRFS_DIR)prf.c $(PRFS_DIR)prf.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-LIB_OBJS+= $(BUILD_DIR)hmac_prf.o
-$(BUILD_DIR)hmac_prf.o :			$(PRFS_DIR)hmac_prf.c $(PRFS_DIR)hmac_prf.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/libstrongswan/crypto/rsa/Makefile.rsa b/src/libstrongswan/crypto/rsa/Makefile.rsa
deleted file mode 100644
index 1a0204c83..000000000
--- a/src/libstrongswan/crypto/rsa/Makefile.rsa
+++ /dev/null
@@ -1,23 +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.
-#
-
-RSA_DIR= $(CRYPTO_DIR)rsa/
-
-LIB_OBJS+= $(BUILD_DIR)rsa_private_key.o
-$(BUILD_DIR)rsa_private_key.o :			$(RSA_DIR)rsa_private_key.c $(RSA_DIR)rsa_private_key.h
-										$(CC) $(CFLAGS) -c -o $@ $<
-										
-LIB_OBJS+= $(BUILD_DIR)rsa_public_key.o
-$(BUILD_DIR)rsa_public_key.o :			$(RSA_DIR)rsa_public_key.c $(RSA_DIR)rsa_public_key.h
-										$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/libstrongswan/crypto/signers/Makefile.signers b/src/libstrongswan/crypto/signers/Makefile.signers
deleted file mode 100644
index 8f161a09d..000000000
--- a/src/libstrongswan/crypto/signers/Makefile.signers
+++ /dev/null
@@ -1,23 +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.
-#
-
-SIGNERS_DIR= $(CRYPTO_DIR)signers/
-
-LIB_OBJS+= $(BUILD_DIR)signer.o
-$(BUILD_DIR)signer.o :			$(SIGNERS_DIR)signer.c $(SIGNERS_DIR)signer.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-								
-LIB_OBJS+= $(BUILD_DIR)hmac_signer.o
-$(BUILD_DIR)hmac_signer.o :		$(SIGNERS_DIR)hmac_signer.c $(SIGNERS_DIR)hmac_signer.h
-								$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/src/libstrongswan/utils/Makefile.utils b/src/libstrongswan/utils/Makefile.utils
deleted file mode 100644
index c04f3b1df..000000000
--- a/src/libstrongswan/utils/Makefile.utils
+++ /dev/null
@@ -1,51 +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.
-#
-
-UTILS_DIR= $(LIB_DIR)utils/
-
-LIB_OBJS+= $(BUILD_DIR)leak_detective.o
-$(BUILD_DIR)leak_detective.o :	$(UTILS_DIR)leak_detective.c $(UTILS_DIR)leak_detective.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)lexparser.o
-$(BUILD_DIR)lexparser.o :		$(UTILS_DIR)lexparser.c $(UTILS_DIR)lexparser.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)linked_list.o
-$(BUILD_DIR)linked_list.o :		$(UTILS_DIR)linked_list.c $(UTILS_DIR)linked_list.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)logger.o
-$(BUILD_DIR)logger.o :			$(UTILS_DIR)logger.c $(UTILS_DIR)logger.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)logger_manager.o
-$(BUILD_DIR)logger_manager.o :	$(UTILS_DIR)logger_manager.c $(UTILS_DIR)logger_manager.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)randomizer.o
-$(BUILD_DIR)randomizer.o :		$(UTILS_DIR)randomizer.c $(UTILS_DIR)randomizer.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)tester.o
-$(BUILD_DIR)tester.o :			$(UTILS_DIR)tester.c $(UTILS_DIR)tester.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)identification.o
-$(BUILD_DIR)identification.o :	$(UTILS_DIR)identification.c $(UTILS_DIR)identification.h
-								$(CC) $(CFLAGS) -c -o $@ $<
-
-LIB_OBJS+= $(BUILD_DIR)host.o
-$(BUILD_DIR)host.o :			$(UTILS_DIR)host.c $(UTILS_DIR)host.h
-								$(CC) $(CFLAGS) -c -o $@ $<
\ No newline at end of file
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 1c050e40e..48aa47f9b 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES = -I$(top_srcdir)/src/libfreeswan -I$(top_srcdir)/src/pluto -I$(top_src
 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
+man_MANS = ipsec.conf.5
+sysconf_DATA = ipsec.conf
 
 PLUTODIR=$(top_srcdir)/src/pluto
 OPENACDIR=$(top_srcdir)/src/openac