projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't enable -fstack-protector-all.
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
27d2330
..
64c845d
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-2,7
+2,9
@@
sbin_PROGRAMS = tincd tinc sptps_test
sbin_PROGRAMS = tincd tinc sptps_test
-EXTRA_DIST = linux bsd solaris cygwin mingw openssl gcrypt
+if LINUX
+sbin_PROGRAMS += sptps_speed
+endif
DEFAULT_INCLUDES =
DEFAULT_INCLUDES =
@@
-57,6
+59,7
@@
tincd_SOURCES = \
route.c route.h \
rsa.h \
rsagen.h \
route.c route.h \
rsa.h \
rsagen.h \
+ script.c script.h \
splay_tree.c splay_tree.h \
sptps.c sptps.h \
subnet.c subnet.h \
splay_tree.c splay_tree.h \
sptps.c sptps.h \
subnet.c subnet.h \
@@
-75,6
+78,7
@@
tinc_SOURCES = \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
+ script.c script.h \
sptps.c sptps.h \
subnet_parse.c subnet.h \
tincctl.c tincctl.h \
sptps.c sptps.h \
subnet_parse.c subnet.h \
tincctl.c tincctl.h \
@@
-87,6
+91,12
@@
sptps_test_SOURCES = \
sptps_test.c \
utils.c utils.h
sptps_test.c \
utils.c utils.h
+sptps_speed_SOURCES = \
+ logger.c logger.h \
+ sptps.c sptps.h \
+ sptps_speed.c \
+ utils.c utils.h
+
## Conditionally compile device drivers
if LINUX
## Conditionally compile device drivers
if LINUX
@@
-96,7
+106,7
@@
endif
if BSD
tincd_SOURCES += bsd/device.c
if TUNEMU
if BSD
tincd_SOURCES += bsd/device.c
if TUNEMU
-tincd_SOURCES += bsd/tunemu.c
+tincd_SOURCES += bsd/tunemu.c
bsd/tunemu.h
endif
endif
endif
endif
@@
-105,7
+115,7
@@
tincd_SOURCES += solaris/device.c
endif
if MINGW
endif
if MINGW
-tincd_SOURCES += mingw/device.c
+tincd_SOURCES += mingw/device.c
mingw/common.h
endif
if CYGWIN
endif
if CYGWIN
@@
-124,7
+134,7
@@
if OPENSSL
tincd_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
tincd_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
- openssl/digest.c \
+ openssl/digest.c
openssl/digest.h
\
openssl/ecdh.c \
openssl/ecdsa.c \
openssl/prf.c \
openssl/ecdh.c \
openssl/ecdsa.c \
openssl/prf.c \
@@
-132,7
+142,7
@@
tincd_SOURCES += \
tinc_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
tinc_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
- openssl/digest.c \
+ openssl/digest.c
openssl/digest.h
\
openssl/ecdh.c \
openssl/ecdsa.c \
openssl/ecdsagen.c \
openssl/ecdh.c \
openssl/ecdsa.c \
openssl/ecdsagen.c \
@@
-142,17
+152,25
@@
tinc_SOURCES += \
sptps_test_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
sptps_test_SOURCES += \
openssl/cipher.c \
openssl/crypto.c \
- openssl/digest.c \
+ openssl/digest.c
openssl/digest.h
\
openssl/ecdh.c \
openssl/ecdsa.c \
openssl/prf.c
openssl/ecdh.c \
openssl/ecdsa.c \
openssl/prf.c
+sptps_speed_SOURCES += \
+ openssl/cipher.c \
+ openssl/crypto.c \
+ openssl/digest.c openssl/digest.h \
+ openssl/ecdh.c \
+ openssl/ecdsa.c \
+ openssl/ecdsagen.c \
+ openssl/prf.c
endif
if GCRYPT
tincd_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
endif
if GCRYPT
tincd_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
- gcrypt/digest.c \
+ gcrypt/digest.c
gcrypt/digest.h
\
gcrypt/ecdh.c \
gcrypt/ecdsa.c \
gcrypt/prf.c \
gcrypt/ecdh.c \
gcrypt/ecdsa.c \
gcrypt/prf.c \
@@
-160,7
+178,7
@@
tincd_SOURCES += \
tinc_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
tinc_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
- gcrypt/digest.c \
+ gcrypt/digest.c
gcrypt/digest.h
\
gcrypt/ecdh.c \
gcrypt/ecdsa.c \
gcrypt/ecdsagen.c \
gcrypt/ecdh.c \
gcrypt/ecdsa.c \
gcrypt/ecdsagen.c \
@@
-170,21
+188,19
@@
tinc_SOURCES += \
sptps_test_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
sptps_test_SOURCES += \
gcrypt/cipher.c \
gcrypt/crypto.c \
- gcrypt/digest.c \
+ gcrypt/digest.c
gcrypt/digest.h
\
gcrypt/ecdh.c \
gcrypt/ecdsa.c \
gcrypt/prf.c
endif
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
gcrypt/ecdh.c \
gcrypt/ecdsa.c \
gcrypt/prf.c
endif
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
+sptps_speed_LDADD = -lrt
-LIBS = @LIBS@
@LIBGCRYPT_LIBS@
+LIBS = @LIBS@
if TUNEMU
LIBS += -lpcap
endif
AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
if TUNEMU
LIBS += -lpcap
endif
AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
-
-dist-hook:
- rm -f `find . -type l`