Allow using key & configuration parser from tincd in tinc.

[tinc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a98c033..306bbc4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,10 +41,19 @@ chacha_poly1305_SOURCES = \
        chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
        chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
+if CONFIGURE_LZ4_BUILTIN
+lz4_SOURCES = lib/lz4/lz4.c lib/lz4/lz4.h
+else
+lz4_SOURCES =
+endif
+
 tincd_SOURCES = \
+       address_cache.c address_cache.h \
+       autoconnect.c autoconnect.h \
        buffer.c buffer.h \
        cipher.h \
        conf.c conf.h \
+       conf_net.c conf_net.h \
        connection.c connection.h \
        control.c control.h \
        control_common.h \
@@ -62,6 +71,7 @@ tincd_SOURCES = \
        fd_device.c \
        graph.c graph.h \
        hash.c hash.h \
+       keys.c keys.h \
        have.h \
        ipv4.h \
        ipv6.h \
@@ -101,7 +111,8 @@ tincd_SOURCES = \
        ed25519/ecdh.c \
        ed25519/ecdsa.c \
        $(ed25519_SOURCES) \
-       $(chacha_poly1305_SOURCES)
+       $(chacha_poly1305_SOURCES) \
+       $(lz4_SOURCES)
 
 tinc_SOURCES = \
        dropin.c dropin.h \
@@ -109,6 +120,9 @@ tinc_SOURCES = \
        ifconfig.c ifconfig.h \
        info.c info.h \
        invitation.c invitation.h \
+       conf.c conf.h \
+       keys.c keys.h \
+       splay_tree.c splay_tree.h \
        list.c list.h \
        names.c names.h \
        netutl.c netutl.h \
@@ -188,10 +202,6 @@ if MINGW
 tincd_SOURCES += mingw/device.c mingw/common.h
 endif
 
-if CYGWIN
-tincd_SOURCES += cygwin/device.c
-endif
-
 if UML
 tincd_SOURCES += uml_device.c
 endif
@@ -274,13 +284,18 @@ tincd_LDADD = $(MINIUPNPC_LIBS)
 tincd_LDFLAGS = -pthread
 endif
 
+if MINGW
+sptps_test_LDFLAGS = -pthread
+endif
+
 tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
 sptps_speed_LDADD = -lrt
 
-LIBS = @LIBS@ -lm
+LIBS = @LIBS@ -lm $(CODE_COVERAGE_LIBS)
 
 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)