projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace pointers to cipher_t/digest_t in connection_t with structs.
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
f54b476
..
a1d3423
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,9
+1,14
@@
## Produce this file with automake to get Makefile.in
## Produce this file with automake to get Makefile.in
-sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
+sbin_PROGRAMS = tincd tinc
+check_PROGRAMS = sptps_test sptps_keypair
+EXTRA_PROGRAMS = $(check_PROGRAMS)
CLEANFILES = version_git.h
CLEANFILES = version_git.h
+.PHONY: extra
+extra: $(EXTRA_PROGRAMS)
+
.PHONY: version-stamp
version-stamp:
.PHONY: version-stamp
version-stamp:
@@
-18,11
+23,10
@@
version.c: ${srcdir}/version.c
endif
if LINUX
endif
if LINUX
-
sbin
_PROGRAMS += sptps_speed
+
EXTRA
_PROGRAMS += sptps_speed
endif
ed25519_SOURCES = \
endif
ed25519_SOURCES = \
- ed25519/add_scalar.c \
ed25519/ed25519.h \
ed25519/fe.c ed25519/fe.h \
ed25519/fixedint.h \
ed25519/ed25519.h \
ed25519/fe.c ed25519/fe.h \
ed25519/fixedint.h \
@@
-40,10
+44,20
@@
chacha_poly1305_SOURCES = \
chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
+if CONFIGURE_LZ4_BUILTIN
+lz4_SOURCES = lib/lz4/lz4.c lib/lz4/lz4.h
+else
+lz4_SOURCES =
+endif
+
tincd_SOURCES = \
tincd_SOURCES = \
+ address_cache.c address_cache.h \
+ autoconnect.c autoconnect.h \
buffer.c buffer.h \
cipher.h \
buffer.c buffer.h \
cipher.h \
+ compression.h \
conf.c conf.h \
conf.c conf.h \
+ conf_net.c conf_net.h \
connection.c connection.h \
control.c control.h \
control_common.h \
connection.c connection.h \
control.c control.h \
control_common.h \
@@
-58,8
+72,10
@@
tincd_SOURCES = \
edge.c edge.h \
ethernet.h \
event.c event.h \
edge.c edge.h \
ethernet.h \
event.c event.h \
+ fd_device.c \
graph.c graph.h \
graph.c graph.h \
- hash.c hash.h \
+ hash.h \
+ keys.c keys.h \
have.h \
ipv4.h \
ipv6.h \
have.h \
ipv4.h \
ipv6.h \
@@
-99,13
+115,18
@@
tincd_SOURCES = \
ed25519/ecdh.c \
ed25519/ecdsa.c \
$(ed25519_SOURCES) \
ed25519/ecdh.c \
ed25519/ecdsa.c \
$(ed25519_SOURCES) \
- $(chacha_poly1305_SOURCES)
+ $(chacha_poly1305_SOURCES) \
+ $(lz4_SOURCES)
tinc_SOURCES = \
dropin.c dropin.h \
fsck.c fsck.h \
tinc_SOURCES = \
dropin.c dropin.h \
fsck.c fsck.h \
+ ifconfig.c ifconfig.h \
info.c info.h \
invitation.c invitation.h \
info.c info.h \
invitation.c invitation.h \
+ conf.c conf.h \
+ keys.c keys.h \
+ splay_tree.c splay_tree.h \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
list.c list.h \
names.c names.h \
netutl.c netutl.h \
@@
-185,10
+206,6
@@
if MINGW
tincd_SOURCES += mingw/device.c mingw/common.h
endif
tincd_SOURCES += mingw/device.c mingw/common.h
endif
-if CYGWIN
-tincd_SOURCES += cygwin/device.c
-endif
-
if UML
tincd_SOURCES += uml_device.c
endif
if UML
tincd_SOURCES += uml_device.c
endif
@@
-199,13
+216,13
@@
endif
if OPENSSL
tincd_SOURCES += \
if OPENSSL
tincd_SOURCES += \
- openssl/cipher.c \
+ openssl/cipher.c
openssl/cipher.h
\
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/rsa.c
tinc_SOURCES += \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/rsa.c
tinc_SOURCES += \
- openssl/cipher.c \
+ openssl/cipher.c
openssl/cipher.h
\
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
openssl/crypto.c \
openssl/digest.c openssl/digest.h \
openssl/prf.c \
@@
-265,19
+282,31
@@
sptps_speed_SOURCES += \
endif
endif
endif
endif
+if WITH_LEGACY_PROTOCOL
+tinc_SOURCES += digest.c
+tincd_SOURCES += digest.c cipher.c
+sptps_test_SOURCES += digest.c
+sptps_speed_SOURCES += digest.c
+endif
+
if MINIUPNPC
tincd_SOURCES += upnp.h upnp.c
tincd_LDADD = $(MINIUPNPC_LIBS)
tincd_LDFLAGS = -pthread
endif
if MINIUPNPC
tincd_SOURCES += upnp.h upnp.c
tincd_LDADD = $(MINIUPNPC_LIBS)
tincd_LDFLAGS = -pthread
endif
+if MINGW
+sptps_test_LDFLAGS = -pthread
+endif
+
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
sptps_speed_LDADD = -lrt
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
sptps_speed_LDADD = -lrt
-LIBS = @LIBS@ -lm
+LIBS = @LIBS@ -lm
$(CODE_COVERAGE_LIBS)
if TUNEMU
LIBS += -lpcap
endif
if TUNEMU
LIBS += -lpcap
endif
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote.
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DRUNSTATEDIR=\"$(runstatedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote. $(CODE_COVERAGE_CFLAGS)
+AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)