X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=7be46d97a9002b1c5d63bf78c3cc7f455e1b5881;hb=92fdabc439bdb5e16f64a4bf2ed1deda54f7c544;hp=0e954181f39dc990182092b97e7fcad6aabfca3b;hpb=ed09fa4e03c907736b2be0a831d10863ce4cae84;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e954181..7be46d97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,10 @@
 ## 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 = sptps_test sptps_keypair
+
+CLEANFILES = version_git.h
 
 .PHONY: version-stamp
 version-stamp:
@@ -10,12 +14,16 @@ version_git.h: version-stamp
 	@-(cd $(srcdir) && git describe 2>/dev/null >/dev/null) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@ ||:
 ${srcdir}/version.c: version_git.h
 
+## Now a hack to appease some versions of BSD make that don't understand that "./foo" is the same as "foo".
+if BSD
+version.c: ${srcdir}/version.c
+endif
+
 if LINUX
-sbin_PROGRAMS += sptps_speed
+EXTRA_PROGRAMS += sptps_speed
 endif
 
 ed25519_SOURCES = \
-	ed25519/add_scalar.c \
 	ed25519/ed25519.h \
 	ed25519/fe.c ed25519/fe.h \
 	ed25519/fixedint.h \
@@ -34,6 +42,7 @@ chacha_poly1305_SOURCES = \
 	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
 tincd_SOURCES = \
+	autoconnect.c autoconnect.h \
 	buffer.c buffer.h \
 	cipher.h \
 	conf.c conf.h \
@@ -51,9 +60,7 @@ tincd_SOURCES = \
 	edge.c edge.h \
 	ethernet.h \
 	event.c event.h \
-	fake-gai-errnos.h \
-	fake-getaddrinfo.c fake-getaddrinfo.h \
-	fake-getnameinfo.c fake-getnameinfo.h \
+	fd_device.c \
 	graph.c graph.h \
 	hash.c hash.h \
 	have.h \
@@ -100,6 +107,7 @@ tincd_SOURCES = \
 tinc_SOURCES = \
 	dropin.c dropin.h \
 	fsck.c fsck.h \
+	ifconfig.c ifconfig.h \
 	info.c info.h \
 	invitation.c invitation.h \
 	list.c list.h \