projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
a98c033
..
cb188d2
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-42,6
+42,8
@@
chacha_poly1305_SOURCES = \
chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
tincd_SOURCES = \
chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
tincd_SOURCES = \
+ address_cache.c address_cache.h \
+ autoconnect.c autoconnect.h \
buffer.c buffer.h \
cipher.h \
conf.c conf.h \
buffer.c buffer.h \
cipher.h \
conf.c conf.h \
@@
-277,10
+279,11
@@
endif
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
sptps_speed_LDADD = -lrt
tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
sptps_speed_LDADD = -lrt
-LIBS = @LIBS@ -lm
+LIBS = @LIBS@ -lm
$(CODE_COVERAGE_LIBS)
if TUNEMU
LIBS += -lpcap
endif
if TUNEMU
LIBS += -lpcap
endif
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote.
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DRUNSTATEDIR=\"$(runstatedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote. $(CODE_COVERAGE_CFLAGS)
+AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)