X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2FMakefile.am;h=bd9115bf7e19de563132f3053168b8ecec3dc8c2;hp=57e0b694d0f7b8b25b978ab66720fe487cb00b45;hb=9527622abc75ef41498de70ed6ded6bf5b38cfac;hpb=ced4c1a327b321a6d73028a3a15b41b0be64d910

diff --git a/src/Makefile.am b/src/Makefile.am
index 57e0b694..bd9115bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,74 +1,168 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tinc sptps_test
+sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
 
-EXTRA_DIST = linux bsd solaris cygwin mingw openssl gcrypt
+## Make sure version.c is always rebuilt with the latest git information
+.PHONY: ${srcdir}/version.c version_git.h
+version_git.h:
+	$(AM_V_GEN)echo >$@
+	@-(cd $(srcdir) && git describe >/dev/null) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@ ||:
+${srcdir}/version.c: version_git.h
+
+if LINUX
+sbin_PROGRAMS += sptps_speed
+endif
+
+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/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
 
 tincd_SOURCES = \
-	buffer.c \
-	conf.c \
-	connection.c \
-	control.c \
-	dropin.c \
+	buffer.c buffer.h \
+	cipher.h \
+	conf.c conf.h \
+	connection.c connection.h \
+	control.c control.h \
+	control_common.h \
+	crypto.h \
+	device.h \
+	digest.h \
+	dropin.c dropin.h \
 	dummy_device.c \
-	edge.c \
-	event.c \
-	fake-getaddrinfo.c \
-	fake-getnameinfo.c \
-	getopt.c \
-	getopt1.c \
-	graph.c \
-	hash.c \
-	list.c \
-	logger.c \
-	meta.c \
+	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 \
+	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 \
 	multicast_device.c \
-	names.c \
-	net.c \
+	names.c names.h \
+	net.c net.h \
 	net_packet.c \
 	net_setup.c \
 	net_socket.c \
-	netutl.c \
-	node.c \
-	process.c \
-	protocol.c \
+	netutl.c netutl.h \
+	node.c node.h \
+	prf.h \
+	process.c process.h \
+	protocol.c protocol.h \
 	protocol_auth.c \
 	protocol_edge.c \
 	protocol_key.c \
 	protocol_misc.c \
 	protocol_subnet.c \
 	raw_socket_device.c \
-	route.c \
-	splay_tree.c \
-	sptps.c \
-	subnet.c \
+	route.c route.h \
+	rsa.h \
+	rsagen.h \
+	script.c script.h \
+	splay_tree.c splay_tree.h \
+	sptps.c sptps.h \
+	subnet.c subnet.h \
 	subnet_parse.c \
+	system.h \
 	tincd.c \
-	utils.c
+	utils.c utils.h \
+	xalloc.h \
+	version.c version.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 tinc_SOURCES = \
-	dropin.c \
-	getopt.c \
+	dropin.c dropin.h \
+	getopt.c getopt.h \
 	getopt1.c \
-	info.c \
-	invitation.c \
-	list.c \
-	names.c \
-	netutl.c \
-	sptps.c \
-	subnet_parse.c \
-	tincctl.c \
-	top.c \
-	utils.c
+	fsck.c fsck.h \
+	info.c info.h \
+	invitation.c invitation.h \
+	list.c list.h \
+	names.c names.h \
+	netutl.c netutl.h \
+	script.c script.h \
+	sptps.c sptps.h \
+	subnet_parse.c subnet.h \
+	tincctl.c tincctl.h \
+	top.c top.h \
+	utils.c utils.h \
+	version.c version.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 sptps_test_SOURCES = \
-	logger.c \
-	sptps.c \
+	logger.c logger.h \
+	sptps.c sptps.h \
 	sptps_test.c \
-	utils.c
+	utils.c utils.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
+
+sptps_keypair_SOURCES = \
+	sptps_keypair.c \
+	utils.c utils.h \
+	ed25519/ecdsagen.c \
+	$(ed25519_SOURCES)
+
+sptps_speed_SOURCES = \
+	logger.c logger.h \
+	sptps.c sptps.h \
+	sptps_speed.c \
+	utils.c utils.h \
+	ed25519/ecdh.c \
+	ed25519/ecdsa.c \
+	ed25519/ecdsagen.c \
+	$(ed25519_SOURCES) \
+	$(chacha_poly1305_SOURCES)
 
 ## Conditionally compile device drivers
-	
+
+if !GETOPT
+tincd_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+tinc_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.cendif
+sptps_test_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+sptps_keypair_SOURCES += \
+	getopt.c getopt.h \
+	getopt1.c
+endif
+
 if LINUX
 tincd_SOURCES += linux/device.c
 endif
@@ -76,7 +170,7 @@ endif
 if BSD
 tincd_SOURCES += bsd/device.c
 if TUNEMU
-tincd_SOURCES += bsd/tunemu.c
+tincd_SOURCES += bsd/tunemu.c bsd/tunemu.h
 endif
 endif
 
@@ -85,7 +179,7 @@ tincd_SOURCES += solaris/device.c
 endif
 
 if MINGW
-tincd_SOURCES += mingw/device.c
+tincd_SOURCES += mingw/device.c mingw/common.h
 endif
 
 if CYGWIN
@@ -104,116 +198,83 @@ if OPENSSL
 tincd_SOURCES += \
 	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
+	openssl/digest.c openssl/digest.h \
 	openssl/prf.c \
 	openssl/rsa.c
 tinc_SOURCES += \
 	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
-	openssl/ecdsagen.c \
+	openssl/digest.c openssl/digest.h \
 	openssl/prf.c \
 	openssl/rsa.c \
 	openssl/rsagen.c
 sptps_test_SOURCES += \
-	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
-	openssl/ecdh.c \
-	openssl/ecdsa.c \
+	openssl/digest.c openssl/digest.h \
 	openssl/prf.c
-endif
-
+sptps_keypair_SOURCES += \
+	openssl/crypto.c
+sptps_speed_SOURCES += \
+	openssl/crypto.c \
+	openssl/digest.c openssl/digest.h \
+	openssl/prf.c
+else
 if GCRYPT
 tincd_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
-	gcrypt/digest.c \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
+	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/prf.c \
 	gcrypt/rsa.c
 tinc_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
-	gcrypt/digest.c \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
-	gcrypt/ecdsagen.c \
+	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/prf.c \
 	gcrypt/rsa.c \
 	gcrypt/rsagen.c
 sptps_test_SOURCES += \
 	gcrypt/cipher.c \
 	gcrypt/crypto.c \
-	gcrypt/digest.c \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
+	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/prf.c
+sptps_keypair_SOURCES += \
+	openssl/crypto.c
+sptps_speed_SOURCES += \
+	openssl/crypto.c \
+	openssl/digest.c openssl/digest.h \
+	openssl/prf.c
+else
+tincd_SOURCES += \
+	nolegacy/crypto.c \
+	nolegacy/prf.c
+tinc_SOURCES += \
+	nolegacy/crypto.c \
+	nolegacy/prf.c
+sptps_test_SOURCES += \
+	nolegacy/crypto.c \
+	nolegacy/prf.c
+sptps_keypair_SOURCES += \
+	nolegacy/crypto.c
+sptps_speed_SOURCES += \
+	nolegacy/crypto.c \
+	nolegacy/prf.c
+endif
 endif
 
-tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
+if MINIUPNPC
+tincd_SOURCES += upnp.h upnp.c
+tincd_LDADD = $(MINIUPNPC_LIBS)
+tincd_LDFLAGS = -pthread
+endif
 
-noinst_HEADERS = \
-	buffer.h \
-	cipher.h \
-	conf.h \
-	connection.h \
-	control.h \
-	control_common.h \
-	crypto.h \
-	device.h \
-	digest.h \
-	dropin.h \
-	ecdh.h \
-	ecdsa.h \
-	ecdsagen.h \
-	edge.h \
-	ethernet.h \
-	event.h \
-	fake-gai-errnos.h \
-	fake-getaddrinfo.h \
-	fake-getnameinfo.h \
-	getopt.h \
-	graph.h \
-	hash.h \
-	have.h \
-	info.h \
-	ipv4.h \
-	ipv6.h \
-	list.h \
-	logger.h \
-	meta.h \
-	names.h \
-	net.h \
-	netutl.h \
-	node.h \
-	prf.h \
-	process.h \
-	protocol.h \
-	route.h \
-	rsa.h \
-	rsagen.h
-	splay_tree.h \
-	sptps.h \
-	subnet.h \
-	system.h \
-	tincctl.h \
-	top.h \
-	utils.h \
-	xalloc.h
+tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
+sptps_speed_LDADD = -lrt
 
-LIBS = @LIBS@ @LIBGCRYPT_LIBS@
+LIBS = @LIBS@ -lm
 
 if TUNEMU
 LIBS += -lpcap
 endif
 
-AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
-
-dist-hook:
-	rm -f `find . -type l`
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\" -iquote.