X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=dacfbfc9dbbcc219abeaffa53d03bd34c0e351a2;hb=17e54ea0bec4d3a3b9a760854dde6039c7a1c421;hp=52f38e48149016d659579b30ad370987a1a55f87;hpb=d28f33228635e78dac8f9e9bcaec92690f2ca10a;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index 52f38e48..dacfbfc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,16 +2,17 @@
 
 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
 endif
 
-DEFAULT_INCLUDES =
-
 ed25519_SOURCES = \
 	ed25519/add_scalar.c \
 	ed25519/ed25519.h \
@@ -101,6 +102,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 \
@@ -247,13 +249,19 @@ 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
 
-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.