summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-03-03 13:12:06 +0000
committerChristian Pointner <equinox@anytun.org>2009-03-03 13:12:06 +0000
commit0d47b5bbbcda1d3e8fd4e94a00f87b8ea033a7c7 (patch)
tree1b94e6127c79caa24d3c2bbac30f11475dd639aa /src
parentadded -4 and -6 to print usage (diff)
make distclean always works now
removed --ld-kdr from Makefile
Diffstat (limited to 'src')
-rw-r--r--src/Makefile7
-rw-r--r--src/man/anytun-config.8.txt12
-rw-r--r--src/man/anytun.8.txt12
3 files changed, 5 insertions, 26 deletions
diff --git a/src/Makefile b/src/Makefile
index cde77c6..be5ec6e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,9 @@
## along with anytun. If not, see <http://www.gnu.org/licenses/>.
##
+ifneq ($(MAKECMDGOALS),distclean)
include include.mk
+endif
OBJS := tunDevice.o \
packetSource.o \
@@ -54,7 +56,7 @@ OBJS := tunDevice.o \
anytunError.o \
options.o \
seqWindow.o \
- routingTreeNode.o \
+ routingTreeNode.o
SYNCOBJS := syncServer.o \
syncClient.o \
@@ -114,8 +116,9 @@ all: $(EXECUTABLE) #libAnysync.a
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$; echo '(re)building $@'
+ifneq ($(MAKECMDGOALS),distclean)
-include $(SRCS:%.cpp=%.d) $(SYNCSRCS:%.cpp=%.d) $(ANYCTRSRCS:%.cpp=%.d) $(ANYCONFSRCS:%.cpp=%.d) $(EXESRCS:%.cpp=%.d)
-
+endif
strip: $(EXECUTABLE)
strip -s $(EXECUTABLE)
diff --git a/src/man/anytun-config.8.txt b/src/man/anytun-config.8.txt
index b1e31a3..5c0c7a1 100644
--- a/src/man/anytun-config.8.txt
+++ b/src/man/anytun-config.8.txt
@@ -19,7 +19,6 @@ SYNOPSIS
[ *-m|--mux* <mux-id> ]
[ *-w|--window-size* <window size> ]
[ *-k|--kd-prf* <kd-prf type> ]
-[ *-l|--ld-kdr* <ld-kdr> ]
[ *-O|--anytun02-compat* ]
[ *-E|--passphrase* <pass phrase> ]
[ *-K|--key* <master key> ]
@@ -129,17 +128,6 @@ Possible values:
* *aes-ctr-192* - AES in counter mode with 192 Bits
* *aes-ctr-256* - AES in counter mode with 256 Bits
--l|--ld-kdr <ld-kdr>
-~~~~~~~~~~~~~~~~~~~~
-
-The log2 of the key derivation rate. This is used by the key
-derivation to determine how often a new session key has to be
-generated. A value of -1 means to generate only one key and use
-it forever. The default is 0 which means to calculate a new key
-for every packet. A value of 1 would tell the key derivation
-to generate a new key after 2 packets, for 2 its 4 packets and
-so on.
-
-O|--anytun02-compat
~~~~~~~~~~~~~~~~~~~~
diff --git a/src/man/anytun.8.txt b/src/man/anytun.8.txt
index 7890a50..e393b70 100644
--- a/src/man/anytun.8.txt
+++ b/src/man/anytun.8.txt
@@ -35,7 +35,6 @@ SYNOPSIS
[ *-s|--sender-id* <sender id> ]
[ *-w|--window-size* <window size> ]
[ *-k|--kd-prf* <kd-prf type> ]
-[ *-l|--ld-kdr* <ld-kdr> ]
[ *-O|--anytun02-compat* ]
[ *-E|--passphrase* <pass phrase> ]
[ *-K|--key* <master key> ]
@@ -299,17 +298,6 @@ Possible values:
* *aes-ctr-192* - AES in counter mode with 192 Bits
* *aes-ctr-256* - AES in counter mode with 256 Bits
--l|--ld-kdr <ld-kdr>
-~~~~~~~~~~~~~~~~~~~~
-
-The log2 of the key derivation rate. This is used by the key
-derivation to determine how often a new session key has to be
-generated. A value of -1 means to generate only one key and use
-it forever. The default is 0 which means to calculate a new key
-for every packet. A value of 1 would tell the key derivation
-to generate a new key after 2 packets, for 2 its 4 packets and
-so on.
-
-O|--anytun02-compat
~~~~~~~~~~~~~~~~~~~~