X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=e0733bebfdfb89cbc12acd15e52a716c464cac57;hb=8cacb36e31ca48e4ff9faa98d463893141068d3c;hp=794e420209c44a7d3ef2ef67313bde6e9b442188;hpb=7a54fe5e884e98ade91af527c67f9c5df1452a50;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index 794e4202..e0733beb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 ## Produce this file with automake to get Makefile.in
 
 sbin_PROGRAMS = tincd tinc
+check_PROGRAMS = sptps_test sptps_keypair
 EXTRA_PROGRAMS = sptps_test sptps_keypair
 
 CLEANFILES = version_git.h
@@ -23,7 +24,6 @@ EXTRA_PROGRAMS += sptps_speed
 endif
 
 ed25519_SOURCES = \
-	ed25519/add_scalar.c \
 	ed25519/ed25519.h \
 	ed25519/fe.c ed25519/fe.h \
 	ed25519/fixedint.h \
@@ -41,7 +41,15 @@ chacha_poly1305_SOURCES = \
 	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 = \
+	address_cache.c address_cache.h \
+	autoconnect.c autoconnect.h \
 	buffer.c buffer.h \
 	cipher.h \
 	conf.c conf.h \
@@ -101,7 +109,8 @@ tincd_SOURCES = \
 	ed25519/ecdh.c \
 	ed25519/ecdsa.c \
 	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
+	$(chacha_poly1305_SOURCES) \
+	$(lz4_SOURCES)
 
 tinc_SOURCES = \
 	dropin.c dropin.h \
@@ -188,10 +197,6 @@ if MINGW
 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
@@ -274,13 +279,18 @@ 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
 
-LIBS = @LIBS@ -lm
+LIBS = @LIBS@ -lm $(CODE_COVERAGE_LIBS)
 
 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)