Merge branch 'master' into 1.1

[meshlink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 563149c686556f640c7ad8c39253c3574896b2eb..2bd1b6bff2dd8a490b6050d504e77e7297f8d943 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ nodist_tincd_SOURCES = \
 
 tincctl_SOURCES = \
        utils.c getopt.c getopt1.c dropin.c \
-       list.c tincctl.c top.c
+       info.c list.c subnet_parse.c tincctl.c top.c
 
 nodist_tincctl_SOURCES = \
        ecdsagen.c rsagen.c
@@ -45,8 +45,8 @@ INCLUDES = @INCLUDES@ -I$(top_builddir)
 
 noinst_HEADERS = \
        xalloc.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h ipv6.h ipv4.h ethernet.h \
-       buffer.h conf.h connection.h control.h control_common.h device.h edge.h graph.h logger.h meta.h net.h netutl.h node.h process.h \
-       protocol.h route.h subnet.h tincctl.h top.h bsd/tunemu.h
+       buffer.h conf.h connection.h control.h control_common.h device.h edge.h graph.h info.h logger.h meta.h net.h netutl.h node.h process.h \
+       protocol.h route.h subnet.h sptps.h tincctl.h top.h bsd/tunemu.h
 
 nodist_noinst_HEADERS = \
        cipher.h crypto.h ecdh.h ecdsa.h digest.h prf.h rsa.h ecdsagen.h rsagen.h