X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=8decac759ff1526939407cb202613857cd5a5fa5;hb=HEAD;hp=bfbee5141ec0136b7f8cceb2395009627d56342d;hpb=ec912e45a8c8757b044354d4e8a6416491fe6ba6;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index bfbee514..fad47bff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,20 +26,23 @@ chacha_poly1305_SOURCES = \
 	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
 utcp_SOURCES = \
-	utcp/utcp.c utcp/utcp.h \
-	utcp/utcp_priv.h
+	utcp.c utcp.h \
+	utcp_priv.h
 
 lib_LTLIBRARIES = libmeshlink.la
+EXTRA_PROGRAMS = utcp-test
 
 pkginclude_HEADERS = meshlink++.h meshlink.h
 
 libmeshlink_la_LDFLAGS = -export-symbols $(srcdir)/meshlink.sym
 
 libmeshlink_la_SOURCES = \
+	adns.c adns.h \
 	buffer.c buffer.h \
 	conf.c conf.h \
 	connection.c connection.h \
 	crypto.c crypto.h \
+	discovery.c discovery.h \
 	dropin.c dropin.h \
 	ecdh.h \
 	ecdsa.h \
@@ -51,6 +54,7 @@ libmeshlink_la_SOURCES = \
 	have.h \
 	list.c list.h \
 	logger.c logger.h \
+	mdns.c mdns.h \
 	meshlink.c meshlink.h meshlink.sym \
 	meshlink_internal.h \
 	meshlink_queue.h \
@@ -62,6 +66,7 @@ libmeshlink_la_SOURCES = \
 	netutl.c netutl.h \
 	node.c node.h \
 	submesh.c submesh.h \
+	packmsg.h \
 	prf.c prf.h \
 	protocol.c protocol.h \
 	protocol_auth.c \
@@ -81,20 +86,14 @@ libmeshlink_la_SOURCES = \
 	$(chacha_poly1305_SOURCES) \
 	$(utcp_SOURCES)
 
+utcp_test_SOURCES = \
+	utcp-test.c \
+	$(utcp_SOURCES)
+
 EXTRA_libmeshlink_la_DEPENDENCIES = $(srcdir)/meshlink.sym
 
 libmeshlink_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote.
 libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS)
 
-if CATTA
-libmeshlink_la_SOURCES += \
-	discovery.c discovery.h
-
-libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/include/
-
-if MINGW
-libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/src/compat/windows/include/
-endif
-
-libmeshlink_la_LIBADD = ${top_builddir}/catta/src/libcatta.la
-endif
+utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote.
+utcp_test_LDFLAGS = $(PTHREAD_LIBS)