X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=07f0bb77fbfd58f663b153f5d8db72051011216b;hb=274cadbe5860ba12d0b54811accd3cae6d524916;hp=7e3523585cceb24d0d3ef78eebada45d081a9c7f;hpb=980d8c0ec42ca45fad1b01444d2bb27bbb29dd68;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e352358..07f0bb77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,5 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = sptps_test sptps_keypair
-
-if LINUX
-sbin_PROGRAMS += sptps_speed
-endif
-
 DEFAULT_INCLUDES =
 
 ed25519_SOURCES = \
@@ -28,8 +22,13 @@ chacha_poly1305_SOURCES = \
 	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
+
 sptps_test_SOURCES = \
+	crypto.c crypto.h \
 	logger.c logger.h \
+	prf.c prf.h \
 	sptps.c sptps.h \
 	sptps_test.c \
 	utils.c utils.h \
@@ -37,12 +36,15 @@ sptps_test_SOURCES = \
 	$(chacha_poly1305_SOURCES)
 
 sptps_keypair_SOURCES = \
+	crypto.c crypto.h \
 	sptps_keypair.c \
 	utils.c utils.h \
 	$(ed25519_SOURCES)
 
 sptps_speed_SOURCES = \
+	crypto.c crypto.h \
 	logger.c logger.h \
+	prf.c prf.h \
 	sptps.c sptps.h \
 	sptps_speed.c \
 	utils.c utils.h \
@@ -51,14 +53,18 @@ sptps_speed_SOURCES = \
 
 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 \
@@ -90,39 +96,26 @@ libmeshlink_la_SOURCES = \
 	splay_tree.c splay_tree.h \
 	sptps.c sptps.h \
 	system.h \
-	tincd.c \
 	utils.c utils.h \
 	xalloc.h \
+	devtools.c devtools.h \
 	$(ed25519_SOURCES) \
-	$(chacha_poly1305_SOURCES)
+	$(chacha_poly1305_SOURCES) \
+	$(utcp_SOURCES)
 
-libmeshlink_la_CFLAGS = -fPIC
+libmeshlink_la_CFLAGS = -fPIC -I../catta/include/
 
-libmeshlink_la_LIBADD = -lpthread
+if MINGW
+libmeshlink_la_CFLAGS += -I../catta/src/compat/windows/include/
+endif
+
+libmeshlink_la_LIBADD = -lpthread ../catta/src/libcatta.la
 
 libmeshlink_la_SOURCES += \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
-	ed25519/ecdh.c \
-	ed25519/ecdsa.c \
-	ed25519/ecdsagen.c
-sptps_test_SOURCES += \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
-	ed25519/ecdh.c \
-	ed25519/ecdsa.c
-sptps_keypair_SOURCES += \
-	openssl/crypto.c \
-	ed25519/ecdsagen.c
-sptps_speed_SOURCES += \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
 	ed25519/ecdh.c \
 	ed25519/ecdsa.c \
 	ed25519/ecdsagen.c
 
-sptps_speed_LDADD = -lrt
-
 LIBS = @LIBS@
 
 AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"