X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=cae2ab95458666bd89d738bae7eab34890788914;hb=31ab43d8a0691e773db6992fa3b52ca24f7f8db4;hp=25df72f47a4a3272db97bdeceb05bd5988ac5105;hpb=1564f52f7643c554ec49a3e014bc9b9a8745c856;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 25df72f4..cae2ab95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = sptps_test
+sbin_PROGRAMS = sptps_test sptps_keypair
 
 if LINUX
 sbin_PROGRAMS += sptps_speed
@@ -8,45 +8,76 @@ endif
 
 DEFAULT_INCLUDES =
 
+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
+
+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_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
+	utils.c utils.h \
+	$(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
+	utils.c utils.h \
+	$(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 \
 	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 \
 	meta.c meta.h \
@@ -56,51 +87,39 @@ 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 \
 	protocol_key.c \
 	protocol_misc.c \
 	route.c route.h \
-	rsa.h \
-	rsagen.h \
 	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)
 
-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 \
-	openssl/rsa.c \
-	openssl/rsagen.c
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.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
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c
+sptps_keypair_SOURCES += \
+	ed25519/ecdsagen.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
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c
 
 sptps_speed_LDADD = -lrt