X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=035717b8cc4434aeff4b21efb9ff51693619f0f4;hb=cda5a477c8138226d184a176256d559971b4f7ed;hp=5c8a841695adda536f442a20cc2caf24d8eb96e6;hpb=cfe9285adf391ab66faeb5def811fe08e47a221a;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c8a8416..035717b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,12 @@
 
 sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
 
-## Make sure version.c is always rebuilt
-.PHONY: version.c
-version.c:
+## Make sure version.c is always rebuilt with the latest git information
+.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
 
 if LINUX
 sbin_PROGRAMS += sptps_speed
@@ -101,6 +104,7 @@ tinc_SOURCES = \
 	dropin.c dropin.h \
 	getopt.c getopt.h \
 	getopt1.c \
+	fsck.c fsck.h \
 	info.c info.h \
 	invitation.c invitation.h \
 	list.c list.h \
@@ -203,7 +207,8 @@ sptps_speed_SOURCES += \
 	openssl/crypto.c \
 	openssl/digest.c openssl/digest.h \
 	openssl/prf.c
-elif GCRYPT
+else
+if GCRYPT
 tincd_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
@@ -244,14 +249,21 @@ sptps_speed_SOURCES += \
 	nolegacy/crypto.c \
 	nolegacy/prf.c
 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
 
-LIBS = @LIBS@
+LIBS = @LIBS@ -lm
 
 if TUNEMU
 LIBS += -lpcap
 endif
 
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote.