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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1cb2b6ac..01e6ff28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,114 +1,110 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = sptps_test
+AM_CPPFLAGS = -Wall
 
-if LINUX
-sbin_PROGRAMS += sptps_speed
-endif
-
-DEFAULT_INCLUDES =
+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 \
+	ed25519/ge.c ed25519/ge.h \
+	ed25519/key_exchange.c \
+	ed25519/keypair.c \
+	ed25519/precomp_data.h \
+	ed25519/sc.c ed25519/sc.h \
+	ed25519/seed.c \
+	ed25519/sha512.c ed25519/sha512.h \
+	ed25519/sign.c \
+	ed25519/verify.c
 
-sptps_test_SOURCES = \
-	logger.c logger.h \
-	sptps.c sptps.h \
-	sptps_test.c \
-	utils.c utils.h
+chacha_poly1305_SOURCES = \
+	chacha-poly1305/chacha.c chacha-poly1305/chacha.h \
+	chacha-poly1305/chacha-poly1305.c chacha-poly1305/chacha-poly1305.h \
+	chacha-poly1305/poly1305.c chacha-poly1305/poly1305.h
 
-sptps_speed_SOURCES = \
-	logger.c logger.h \
-	sptps.c sptps.h \
-	sptps_speed.c \
-	utils.c utils.h
+utcp_SOURCES = \
+	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 $(srcdir)/meshlink.sym
 
 libmeshlink_la_SOURCES = \
-	libmeshlink.c libmeshlink.h \
+	adns.c adns.h \
 	buffer.c buffer.h \
-	cipher.h \
 	conf.c conf.h \
 	connection.c connection.h \
-	control.c control.h \
-	control_common.h \
-	crypto.h \
-	digest.h \
+	crypto.c crypto.h \
 	dropin.c dropin.h \
 	ecdh.h \
 	ecdsa.h \
 	ecdsagen.h \
 	edge.c edge.h \
-	ethernet.h \
 	event.c event.h \
-	fake-gai-errnos.h \
-	fake-getaddrinfo.c fake-getaddrinfo.h \
-	fake-getnameinfo.c fake-getnameinfo.h \
-	getopt.c getopt.h \
-	getopt1.c \
 	graph.c graph.h \
 	hash.c hash.h \
 	have.h \
-	ipv4.h \
-	ipv6.h \
 	list.c list.h \
 	logger.c logger.h \
+	meshlink.c meshlink.h meshlink.sym \
+	meshlink_internal.h \
+	meshlink_queue.h \
 	meta.c meta.h \
-	names.c names.h \
 	net.c net.h \
 	net_packet.c \
 	net_setup.c \
 	net_socket.c \
 	netutl.c netutl.h \
 	node.c node.h \
-	prf.h \
-	process.c process.h \
+	submesh.c submesh.h \
+	packmsg.h \
+	prf.c prf.h \
 	protocol.c protocol.h \
 	protocol_auth.c \
 	protocol_edge.c \
 	protocol_key.c \
 	protocol_misc.c \
 	route.c route.h \
-	rsa.h \
-	rsagen.h \
-	script.c script.h \
+	sockaddr.h \
 	splay_tree.c splay_tree.h \
 	sptps.c sptps.h \
 	system.h \
-	tincd.c \
 	utils.c utils.h \
-	xalloc.h
+	xalloc.h \
+	xoshiro.c xoshiro.h \
+	devtools.c devtools.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES) \
+	$(utcp_SOURCES)
 
-libmeshlink_la_CFLAGS = -fPIC
+utcp_test_SOURCES = \
+	utcp-test.c \
+	$(utcp_SOURCES)
 
-libmeshlink_la_LIBADD = -lpthread
+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 += \
-	openssl/cipher.c \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
-	openssl/ecdsagen.c \
-	openssl/prf.c \
-	openssl/rsa.c \
-	openssl/rsagen.c
-sptps_test_SOURCES += \
-	openssl/cipher.c \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
-	openssl/prf.c
-sptps_speed_SOURCES += \
-	openssl/cipher.c \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
-	openssl/ecdsagen.c \
-	openssl/prf.c
-
-sptps_speed_LDADD = -lrt
-
-LIBS = @LIBS@
-
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+	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