X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=25df72f47a4a3272db97bdeceb05bd5988ac5105;hb=b29ef536f45f237d39680b8c21b7067a829a0f0a;hp=27d2330b063edd374fe893b20a9466c8f67d3d55;hpb=2df534808d75c5898a819a7a4063c7a6f2445bd4;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 27d2330b..25df72f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,36 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tinc sptps_test
+sbin_PROGRAMS = sptps_test
 
-EXTRA_DIST = linux bsd solaris cygwin mingw openssl gcrypt
+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 \
 	connection.c connection.h \
-	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 \
@@ -37,8 +50,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 \
 	net_setup.c \
@@ -46,93 +57,29 @@ tincd_SOURCES = \
 	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 route.h \
 	rsa.h \
 	rsagen.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.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 \
-	sptps.c sptps.h \
-	subnet_parse.c subnet.h \
-	tincctl.c tincctl.h \
-	top.c top.h \
-	utils.c utils.h
-
-sptps_test_SOURCES = \
-	logger.c logger.h \
-	sptps.c sptps.h \
-	sptps_test.c \
-	utils.c utils.h
+libmeshlink_la_CFLAGS = -fPIC
 
-## 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
-endif
-endif
-
-if SOLARIS
-tincd_SOURCES += solaris/device.c
-endif
-
-if MINGW
-tincd_SOURCES += mingw/device.c
-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/ecdh.c \
-	openssl/ecdsa.c \
-	openssl/prf.c \
-	openssl/rsa.c
-tinc_SOURCES += \
-	openssl/cipher.c \
-	openssl/crypto.c \
-	openssl/digest.c \
+	openssl/digest.c openssl/digest.h \
 	openssl/ecdh.c \
 	openssl/ecdsa.c \
 	openssl/ecdsagen.c \
@@ -142,49 +89,21 @@ tinc_SOURCES += \
 sptps_test_SOURCES += \
 	openssl/cipher.c \
 	openssl/crypto.c \
-	openssl/digest.c \
+	openssl/digest.c openssl/digest.h \
 	openssl/ecdh.c \
 	openssl/ecdsa.c \
 	openssl/prf.c
-endif
-
-if GCRYPT
-tincd_SOURCES += \
-	gcrypt/cipher.c \
-	gcrypt/crypto.c \
-	gcrypt/digest.c \
-	gcrypt/ecdh.c \
-	gcrypt/ecdsa.c \
-	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/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/prf.c
-endif
-
-tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
+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
 
-LIBS = @LIBS@ @LIBGCRYPT_LIBS@
+sptps_speed_LDADD = -lrt
 
-if TUNEMU
-LIBS += -lpcap
-endif
+LIBS = @LIBS@
 
 AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
-
-dist-hook:
-	rm -f `find . -type l`