X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=fab950898e554a590d433f40d2f284adb76c7d3b;hb=b3b89e46b1b84fa6cf1726fabe9e9c7bb0d3d831;hp=96643524d7d80d891240e22ae07de1d2283f4249;hpb=57991e264202ad83e2c1b663777b358bf5573652;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 96643524..fab95089 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,29 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tinc sptps_test
+sbin_PROGRAMS = sptps_test
+
+if LINUX
+sbin_PROGRAMS += sptps_speed
+endif
 
 DEFAULT_INCLUDES =
 
-tincd_SOURCES = \
+sptps_test_SOURCES = \
+	logger.c logger.h \
+	sptps.c sptps.h \
+	sptps_test.c \
+	utils.c utils.h
+
+sptps_speed_SOURCES = \
+	logger.c logger.h \
+	sptps.c sptps.h \
+	sptps_speed.c \
+	utils.c utils.h
+
+lib_LTLIBRARIES = libmeshlink.la
+
+libmeshlink_la_SOURCES = \
+	libmeshlink.c libmeshlink.h \
 	buffer.c buffer.h \
 	cipher.h \
 	conf.c conf.h \
@@ -12,10 +31,8 @@ tincd_SOURCES = \
 	control.c control.h \
 	control_common.h \
 	crypto.h \
-	device.h \
 	digest.h \
 	dropin.c dropin.h \
-	dummy_device.c \
 	ecdh.h \
 	ecdsa.h \
 	ecdsagen.h \
@@ -35,7 +52,6 @@ tincd_SOURCES = \
 	list.c list.h \
 	logger.c logger.h \
 	meta.c meta.h \
-	multicast_device.c \
 	names.c names.h \
 	net.c net.h \
 	net_packet.c \
@@ -51,7 +67,6 @@ tincd_SOURCES = \
 	protocol_key.c \
 	protocol_misc.c \
 	protocol_subnet.c \
-	raw_socket_device.c \
 	route.c route.h \
 	rsa.h \
 	rsagen.h \
@@ -65,123 +80,38 @@ tincd_SOURCES = \
 	utils.c utils.h \
 	xalloc.h
 
-tinc_SOURCES = \
-	dropin.c dropin.h \
-	getopt.c getopt.h \
-	getopt1.c \
-	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
+libmeshlink_la_CFLAGS = -fPIC
 
-sptps_test_SOURCES = \
-	logger.c logger.h \
-	sptps.c sptps.h \
-	sptps_test.c \
-	utils.c utils.h
-
-## Conditionally compile device drivers
-	
-if LINUX
-tincd_SOURCES += linux/device.c
-endif
+libmeshlink_la_LIBADD = -lpthread
 
-if BSD
-tincd_SOURCES += bsd/device.c
-if TUNEMU
-tincd_SOURCES += bsd/tunemu.c bsd/tunemu.h
-endif
-endif
-
-if SOLARIS
-tincd_SOURCES += solaris/device.c
-endif
-
-if MINGW
-tincd_SOURCES += mingw/device.c mingw/common.h
-endif
-
-if CYGWIN
-tincd_SOURCES += cygwin/device.c
-endif
-
-if UML
-tincd_SOURCES += uml_device.c
-endif
-
-if VDE
-tincd_SOURCES += vde_device.c
-endif
-
-if OPENSSL
-tincd_SOURCES += \
+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
-tinc_SOURCES += \
+	openssl/rsa.c \
+	openssl/rsagen.c
+sptps_test_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
-sptps_test_SOURCES += \
+	openssl/prf.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
-endif
 
-if GCRYPT
-tincd_SOURCES += \
-	gcrypt/cipher.c \
-	gcrypt/crypto.c \
-	gcrypt/digest.c gcrypt/digest.h \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
-	gcrypt/prf.c \
-	gcrypt/rsa.c
-tinc_SOURCES += \
-	gcrypt/cipher.c \
-	gcrypt/crypto.c \
-	gcrypt/digest.c gcrypt/digest.h \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
-	gcrypt/ecdsagen.c \
-	gcrypt/prf.c \
-	gcrypt/rsa.c \
-	gcrypt/rsagen.c
-sptps_test_SOURCES += \
-	gcrypt/cipher.c \
-	gcrypt/crypto.c \
-	gcrypt/digest.c gcrypt/digest.h \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
-	gcrypt/prf.c
-endif
+sptps_speed_LDADD = -lrt
 
-tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
-
-LIBS = @LIBS@ @LIBGCRYPT_LIBS@
-
-if TUNEMU
-LIBS += -lpcap
-endif
+LIBS = @LIBS@
 
 AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"