X-Git-Url: http://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2FMakefile.am;h=794e420209c44a7d3ef2ef67313bde6e9b442188;hp=1c1d8e0ad7f319c7a28718e67b919c7ffcffe674;hb=7a54fe5e884e98ade91af527c67f9c5df1452a50;hpb=20dd1c21dc6d238200e62a1111a7d0d145168548

diff --git a/src/Makefile.am b/src/Makefile.am
index 1c1d8e0a..794e4202 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,25 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
+sbin_PROGRAMS = tincd tinc
+EXTRA_PROGRAMS = sptps_test sptps_keypair
 
-## Make sure version.c is always rebuilt with the latest git information
-.PHONY: ${srcdir}/version.c version_git.h
-version_git.h:
+CLEANFILES = version_git.h
+
+.PHONY: version-stamp
+version-stamp:
+
+version_git.h: version-stamp
 	$(AM_V_GEN)echo >$@
-	@-(cd $(srcdir) && git describe >/dev/null) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@ ||:
+	@-(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 = \
@@ -50,9 +59,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 \
@@ -99,6 +106,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 \
@@ -152,7 +160,7 @@ tincd_SOURCES += \
 	getopt1.c
 tinc_SOURCES += \
 	getopt.c getopt.h \
-	getopt1.cendif
+	getopt1.c
 sptps_test_SOURCES += \
 	getopt.c getopt.h \
 	getopt1.c