X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=01e6ff2870b5bf4e907827ba1d011e931668f698;hb=47a69d3c93a292cf6fe8076e8fe8f3eb23d76da3;hp=2e91c23a4c274eb73feaec029786160e76417886;hpb=1797680356b8a9256fd233a126f0b4cae9d52b17;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 2e91c23a..01e6ff28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,9 @@ AM_CPPFLAGS = -Wall
 
 ed25519_SOURCES = \
 	ed25519/add_scalar.c \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c \
 	ed25519/ed25519.h \
 	ed25519/fe.c ed25519/fe.h \
 	ed25519/fixedint.h \
@@ -23,36 +26,34 @@ 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
+noinst_PROGRAMS = utcp-test
 
 pkginclude_HEADERS = meshlink++.h meshlink.h
 
-libmeshlink_la_LDFLAGS = -export-symbols-regex '^(meshlink_|devtool_)'
+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 \
 	ecdsagen.h \
 	edge.c edge.h \
 	event.c event.h \
-	fake-gai-errnos.h \
-	fake-getaddrinfo.c fake-getaddrinfo.h \
-	fake-getnameinfo.c fake-getnameinfo.h \
 	graph.c graph.h \
 	hash.c hash.h \
 	have.h \
 	list.c list.h \
 	logger.c logger.h \
-	meshlink.c meshlink.h \
+	meshlink.c meshlink.h meshlink.sym \
 	meshlink_internal.h \
 	meshlink_queue.h \
 	meta.c meta.h \
@@ -62,6 +63,8 @@ libmeshlink_la_SOURCES = \
 	net_socket.c \
 	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 \
@@ -75,20 +78,33 @@ libmeshlink_la_SOURCES = \
 	system.h \
 	utils.c utils.h \
 	xalloc.h \
+	xoshiro.c xoshiro.h \
 	devtools.c devtools.h \
 	$(ed25519_SOURCES) \
 	$(chacha_poly1305_SOURCES) \
 	$(utcp_SOURCES)
 
-libmeshlink_la_CFLAGS = -fPIC -I${top_srcdir}/catta/include/ -iquote.
+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)
+
+utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote.
+utcp_test_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 = -lpthread ${top_builddir}/catta/src/libcatta.la
-
-libmeshlink_la_SOURCES += \
-	ed25519/ecdh.c \
-	ed25519/ecdsa.c \
-	ed25519/ecdsagen.c
+libmeshlink_la_LIBADD = ${top_builddir}/catta/src/libcatta.la
+endif