X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=6340a1a2a22b8da0054a195305042f951b70ed03;hb=185a8731839551fc9df7059ac374be5f5e35c086;hp=58d7b2deb6b60e62f0a225bd5fe0d0dc50de20c5;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 58d7b2de..6340a1a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,35 +1,44 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = sptps_test
-
-if LINUX
-sbin_PROGRAMS += sptps_speed
-endif
-
 DEFAULT_INCLUDES =
 
-sptps_test_SOURCES = \
-	logger.c logger.h \
-	sptps.c sptps.h \
-	sptps_test.c \
-	utils.c utils.h
+ed25519_SOURCES = \
+	ed25519/add_scalar.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_speed_SOURCES = \
-	logger.c logger.h \
-	sptps.c sptps.h \
-	sptps_speed.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
+
+utcp_SOURCES = \
+	utcp/utcp.c utcp/utcp.h
 
 lib_LTLIBRARIES = libmeshlink.la
 
+pkginclude_HEADERS = meshlink++.h meshlink.h
+
+libmeshlink_la_LDFLAGS = -export-symbols-regex '^(meshlink_|devtool_)'
+
 libmeshlink_la_SOURCES = \
-	libmeshlink.c libmeshlink.h \
+	meshlink.c meshlink.h \
 	buffer.c buffer.h \
 	cipher.h \
 	conf.c conf.h \
 	connection.c connection.h \
-	crypto.h \
-	digest.h \
+	crypto.c crypto.h \
+	discovery.c discovery.h \
 	dropin.c dropin.h \
 	ecdh.h \
 	ecdsa.h \
@@ -51,7 +60,7 @@ libmeshlink_la_SOURCES = \
 	net_socket.c \
 	netutl.c netutl.h \
 	node.c node.h \
-	prf.h \
+	prf.c prf.h \
 	protocol.c protocol.h \
 	protocol_auth.c \
 	protocol_edge.c \
@@ -61,40 +70,22 @@ libmeshlink_la_SOURCES = \
 	splay_tree.c splay_tree.h \
 	sptps.c sptps.h \
 	system.h \
-	tincd.c \
 	utils.c utils.h \
-	xalloc.h
+	xalloc.h \
+	devtools.c devtools.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES) \
+	$(utcp_SOURCES)
 
-libmeshlink_la_CFLAGS = -fPIC
+libmeshlink_la_CFLAGS = -fPIC -I../catta/include/
 
-libmeshlink_la_LIBADD = -lpthread
-
-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
-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
+if MINGW
+libmeshlink_la_CFLAGS += -I../catta/src/compat/windows/include/
+endif
 
-LIBS = @LIBS@
+libmeshlink_la_LIBADD = -lpthread ../catta/src/libcatta.la
 
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+libmeshlink_la_SOURCES += \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c