X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=8f02c06d063a950f0db532cc5125ac95637bc2b1;hb=d8df6943acde5b3c813efd9b116ddf2d1d4ff00e;hp=bb78d4dd9d55692cf0ec13521012ebf467c14d6a;hpb=d6c50eb73ad49bd2eac67214995dff76b7a20661;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index bb78d4dd..8f02c06d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,41 +1,125 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tincctl
+sbin_PROGRAMS = sptps_test sptps_keypair
 
-EXTRA_DIST = linux/device.c bsd/device.c solaris/device.c cygwin/device.c mingw/device.c mingw/common.h raw_socket/device.c uml_socket/device.c
+if LINUX
+sbin_PROGRAMS += sptps_speed
+endif
 
-tincd_SOURCES = cipher.c conf.c connection.c control.c crypto.c digest.c edge.c graph.c logger.c meta.c net.c net_packet.c net_setup.c	\
-	net_socket.c netutl.c node.c process.c protocol.c protocol_auth.c protocol_edge.c protocol_misc.c	\
-	protocol_key.c protocol_subnet.c route.c rsa.c subnet.c tincd.c
+DEFAULT_INCLUDES =
 
-tincctl_SOURCES = tincctl.c rsagen.c
+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
 
-if TUNEMU
-tincd_SOURCES += bsd/tunemu.c
-endif
+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
 
-nodist_tincd_SOURCES = device.c
+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) \
+	$(chacha_poly1305_SOURCES)
 
-DEFAULT_INCLUDES =
+sptps_keypair_SOURCES = \
+	crypto.c crypto.h \
+	sptps_keypair.c \
+	utils.c utils.h \
+	$(ed25519_SOURCES)
 
-INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
+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) \
+	$(chacha_poly1305_SOURCES)
 
-noinst_HEADERS = cipher.h conf.h connection.h control.h crypto.h device.h digest.h edge.h graph.h logger.h meta.h net.h netutl.h node.h process.h	\
-	protocol.h route.h rsa.h rsagen.h subnet.h bsd/tunemu.h
+lib_LTLIBRARIES = libmeshlink.la
 
-LIBS = @LIBS@ @LIBGCRYPT_LIBS@
+libmeshlink_la_SOURCES = \
+	libmeshlink.c libmeshlink.h \
+	buffer.c buffer.h \
+	cipher.h \
+	conf.c conf.h \
+	connection.c connection.h \
+	crypto.c crypto.h \
+	dropin.c dropin.h \
+	ecdh.h \
+	ecdsa.h \
+	ecdsagen.h \
+	edge.c edge.h \
+	event.c event.h \
+	fake-gai-errnos.h \
+	fake-getaddrinfo.c fake-getaddrinfo.h \
+	fake-getnameinfo.c fake-getnameinfo.h \
+	graph.c graph.h \
+	hash.c hash.h \
+	have.h \
+	list.c list.h \
+	logger.c logger.h \
+	meta.c meta.h \
+	net.c net.h \
+	net_packet.c \
+	net_setup.c \
+	net_socket.c \
+	netutl.c netutl.h \
+	node.c node.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 \
+	splay_tree.c splay_tree.h \
+	sptps.c sptps.h \
+	system.h \
+	tincd.c \
+	utils.c utils.h \
+	xalloc.h \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
-if TUNEMU
-LIBS += -lpcap
-endif
+libmeshlink_la_CFLAGS = -fPIC
+
+libmeshlink_la_LIBADD = -lpthread
 
-tincd_LDADD = \
-	$(top_builddir)/lib/libvpn.a
+libmeshlink_la_SOURCES += \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c
+sptps_test_SOURCES += \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c
+sptps_keypair_SOURCES += \
+	ed25519/ecdsagen.c
+sptps_speed_SOURCES += \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c
 
-tincctl_LDADD = \
-	$(top_builddir)/lib/libvpn.a
+sptps_speed_LDADD = -lrt
 
-AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+LIBS = @LIBS@
 
-dist-hook:
-	rm -f `find . -type l`
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"