X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=08e56ff825c8124374d421e4fb2454a5a68debeb;hb=5217c16db4babd64580c2fd7aa36180bb9bd838c;hp=ec1da980fd5af774b43861eba5e3778e6b81979c;hpb=2f01744f82be542894fe2ceecbfb9ead93c9ffa5;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index ec1da980..08e56ff8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,12 @@
 
 sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
 
+## Make sure version.c is always rebuilt with the latest git information
+.PHONY: version.c version_git.h
+version_git.h:
+	echo "#define GIT_DESCRIPTION \"`cd $(@D) && git describe || echo UNKNOWN`\"" >$@
+version.c: version_git.h
+
 if LINUX
 sbin_PROGRAMS += sptps_speed
 endif
@@ -23,6 +29,11 @@ ed25519_SOURCES = \
 	ed25519/sign.c \
 	ed25519/verify.c
 
+chacha_poly1305_SOURCES = \
+	chacha-poly1305/chacha.c chacha-poly1305/chacha.h \
+	chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
+	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
+
 tincd_SOURCES = \
 	buffer.c buffer.h \
 	cipher.h \
@@ -83,7 +94,9 @@ tincd_SOURCES = \
 	tincd.c \
 	utils.c utils.h \
 	xalloc.h \
-	$(ed25519_SOURCES)
+	version.c version.h version_git.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 tinc_SOURCES = \
 	dropin.c dropin.h \
@@ -100,14 +113,17 @@ tinc_SOURCES = \
 	tincctl.c tincctl.h \
 	top.c top.h \
 	utils.c utils.h \
-	$(ed25519_SOURCES)
+	version.c version.h version_git.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 sptps_test_SOURCES = \
 	logger.c logger.h \
 	sptps.c sptps.h \
 	sptps_test.c \
 	utils.c utils.h \
-	$(ed25519_SOURCES)
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 sptps_keypair_SOURCES = \
 	sptps_keypair.c \
@@ -119,7 +135,8 @@ sptps_speed_SOURCES = \
 	sptps.c sptps.h \
 	sptps_speed.c \
 	utils.c utils.h \
-	$(ed25519_SOURCES)
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 ## Conditionally compile device drivers
 	
@@ -174,7 +191,6 @@ tinc_SOURCES += \
 	openssl/rsa.c \
 	openssl/rsagen.c
 sptps_test_SOURCES += \
-	openssl/cipher.c \
 	openssl/crypto.c \
 	openssl/digest.c openssl/digest.h \
 	ed25519/ecdh.c \
@@ -184,7 +200,6 @@ sptps_keypair_SOURCES += \
 	openssl/crypto.c \
 	ed25519/ecdsagen.c
 sptps_speed_SOURCES += \
-	openssl/cipher.c \
 	openssl/crypto.c \
 	openssl/digest.c openssl/digest.h \
 	ed25519/ecdh.c \