X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=a2a9305ac54e32f219be1439581d728b5fb66f13;hb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;hp=083b2728641049205bee646a06c5159c0eb0e6a1;hpb=f619a7412c1aeebcdeb98cb95244a9eed5d9b537;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 083b2728..a2a9305a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,35 +23,52 @@ ed25519_SOURCES = \
 	ed25519/sign.c \
 	ed25519/verify.c
 
+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
+
 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 \
-	$(ed25519_SOURCES)
+	$(ed25519_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 \
-	$(ed25519_SOURCES)
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 lib_LTLIBRARIES = libmeshlink.la
 
+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 \
@@ -73,7 +90,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 \
@@ -83,41 +100,30 @@ libmeshlink_la_SOURCES = \
 	splay_tree.c splay_tree.h \
 	sptps.c sptps.h \
 	system.h \
-	tincd.c \
 	utils.c utils.h \
 	xalloc.h \
-	$(ed25519_SOURCES)
+	devtools.c devtools.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES) \
+	$(utcp_SOURCES)
 
-libmeshlink_la_CFLAGS = -fPIC
+libmeshlink_la_CFLAGS = -fPIC -I../avahi/
 
-libmeshlink_la_LIBADD = -lpthread
+libmeshlink_la_LIBADD = -lpthread -luuid ../avahi/avahi-core/.libs/libavahi-core.a ../avahi/avahi-common/.libs/libavahi-common.a
 
 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 \
 	ed25519/ecdh.c \
 	ed25519/ecdsa.c \
-	openssl/prf.c
+	ed25519/ecdsagen.c
+sptps_test_SOURCES += \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c
 sptps_keypair_SOURCES += \
-	openssl/crypto.c \
 	ed25519/ecdsagen.c
 sptps_speed_SOURCES += \
-	openssl/cipher.c \
-	openssl/crypto.c \
-	openssl/digest.c openssl/digest.h \
 	ed25519/ecdh.c \
 	ed25519/ecdsa.c \
-	ed25519/ecdsagen.c \
-	openssl/prf.c
+	ed25519/ecdsagen.c
 
 sptps_speed_LDADD = -lrt