X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2FMakefile.am;h=53dd68da886e523284eaee74e9ef2fc4fa356a9d;hp=a6489dfdf98b3480c6a85ccb2794c98d310d7f53;hb=2802b3a49797a0f58d6a8f4d9945d54acc64d996;hpb=01d251986260faf306927aa91daff705ee0523d6

diff --git a/src/Makefile.am b/src/Makefile.am
index a6489dfd..53dd68da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,18 +3,16 @@
 sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
 
 ## Make sure version.c is always rebuilt with the latest git information
-.PHONY: $(srcdir)/version.c version_git.h
+.PHONY: ${srcdir}/version.c version_git.h
 version_git.h:
-	echo >$@
-	-(cd $(srcdir) && git describe) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@
-$(srcdir)/version.c: version_git.h
+	$(AM_V_GEN)echo >$@
+	@-(cd $(srcdir) && git describe >/dev/null) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@ ||:
+${srcdir}/version.c: version_git.h
 
 if LINUX
 sbin_PROGRAMS += sptps_speed
 endif
 
-DEFAULT_INCLUDES =
-
 ed25519_SOURCES = \
 	ed25519/add_scalar.c \
 	ed25519/ed25519.h \
@@ -55,8 +53,6 @@ tincd_SOURCES = \
 	fake-gai-errnos.h \
 	fake-getaddrinfo.c fake-getaddrinfo.h \
 	fake-getnameinfo.c fake-getnameinfo.h \
-	getopt.c getopt.h \
-	getopt1.c \
 	graph.c graph.h \
 	hash.c hash.h \
 	have.h \
@@ -102,8 +98,6 @@ tincd_SOURCES = \
 
 tinc_SOURCES = \
 	dropin.c dropin.h \
-	getopt.c getopt.h \
-	getopt1.c \
 	fsck.c fsck.h \
 	info.c info.h \
 	invitation.c invitation.h \
@@ -151,7 +145,22 @@ sptps_speed_SOURCES = \
 	$(chacha_poly1305_SOURCES)
 
 ## Conditionally compile device drivers
-	
+
+if !GETOPT
+tincd_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+tinc_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+sptps_test_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+sptps_keypair_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+endif
+
 if LINUX
 tincd_SOURCES += linux/device.c
 endif
@@ -251,6 +260,12 @@ sptps_speed_SOURCES += \
 endif
 endif
 
+if MINIUPNPC
+tincd_SOURCES += upnp.h upnp.c
+tincd_LDADD = $(MINIUPNPC_LIBS)
+tincd_LDFLAGS = -pthread
+endif
+
 tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
 sptps_speed_LDADD = -lrt