X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=4e7de25132c2a61c3ff6022a03831b3d29d245e6;hb=a9b80226e10b0a957604ad55edd945f49bc5f334;hp=2bd1b6bff2dd8a490b6050d504e77e7297f8d943;hpb=98a72d686983178f71cd2bf336c1f3d5c647f1e7;p=meshlink

diff --git a/src/Makefile.am b/src/Makefile.am
index 2bd1b6bf..4e7de251 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,55 +1,109 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tincctl sptps_test
+sbin_PROGRAMS = tincd tinc sptps_test
 
 EXTRA_DIST = linux bsd solaris cygwin mingw openssl gcrypt
 
 tincd_SOURCES = \
-	utils.c getopt.c getopt1.c list.c splay_tree.c dropin.c fake-getaddrinfo.c fake-getnameinfo.c \
+	utils.c getopt.c getopt1.c list.c splay_tree.c dropin.c fake-getaddrinfo.c fake-getnameinfo.c hash.c \
 	buffer.c conf.c connection.c control.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 sptps.c subnet.c subnet_parse.c tincd.c \
-	dummy_device.c raw_socket_device.c multicast_device.c
+	protocol_key.c protocol_subnet.c route.c sptps.c subnet.c subnet_parse.c event.c tincd.c \
+	dummy_device.c raw_socket_device.c multicast_device.c names.c
+
+tinc_SOURCES = \
+	utils.c getopt.c getopt1.c dropin.c \
+	info.c list.c subnet_parse.c tincctl.c top.c names.c
+
+sptps_test_SOURCES = \
+	logger.c sptps.c sptps_test.c utils.c
+
+## Conditionally compile device drivers
 	
-if UML
-tincd_SOURCES += uml_device.c
+if LINUX
+tincd_SOURCES += linux/device.c
 endif
 
-if VDE
-tincd_SOURCES += vde_device.c
+if BSD
+tincd_SOURCES += bsd/device.c
+if TUNEMU
+tincd_SOURCES += bsd/tunemu.c
+endif
 endif
 
-nodist_tincd_SOURCES = \
-	device.c cipher.c crypto.c ecdh.c ecdsa.c digest.c prf.c rsa.c
+if SOLARIS
+tincd_SOURCES += solaris/device.c
+endif
 
-tincctl_SOURCES = \
-	utils.c getopt.c getopt1.c dropin.c \
-	info.c list.c subnet_parse.c tincctl.c top.c
+if MINGW
+tincd_SOURCES += mingw/device.c
+endif
 
-nodist_tincctl_SOURCES = \
-	ecdsagen.c rsagen.c
+if CYGWIN
+tincd_SOURCES += cygwin/device.c
+endif
 
-sptps_test_SOURCES = \
-	logger.c cipher.c crypto.c ecdh.c ecdsa.c digest.c prf.c \
-	sptps.c sptps_test.c utils.c
+if UML
+tincd_SOURCES += uml_device.c
+endif
 
-if TUNEMU
-tincd_SOURCES += bsd/tunemu.c
+if VDE
+tincd_SOURCES += vde_device.c
 endif
 
-tincctl_LDADD = $(CURSES_LIBS)
+if OPENSSL
+tincd_SOURCES += \
+	openssl/cipher.c \
+	openssl/crypto.c \
+	openssl/ecdh.c \
+	openssl/ecdsa.c \
+	openssl/digest.c \
+	openssl/prf.c \
+	openssl/rsa.c
+tinc_SOURCES += \
+	openssl/ecdsa.c \
+	openssl/ecdsagen.c \
+	openssl/rsa.c \
+	openssl/rsagen.c
+sptps_test_SOURCES += \
+	openssl/cipher.c \
+	openssl/crypto.c \
+	openssl/ecdh.c \
+	openssl/ecdsa.c \
+	openssl/digest.c \
+	openssl/prf.c
+endif
 
-DEFAULT_INCLUDES =
+if GCRYPT
+tincd_SOURCES += \
+	gcrypt/cipher.c \
+	gcrypt/crypto.c \
+	gcrypt/ecdh.c \
+	gcrypt/ecdsa.c \
+	gcrypt/digest.c \
+	gcrypt/prf.c \
+	gcrypt/rsa.c
+tinc_SOURCES += \
+	gcrypt/ecdsa.c \
+	gcrypt/ecdsagen.c \
+	gcrypt/rsa.c \
+	gcrypt/rsagen.c
+sptps_test_SOURCES += \
+	gcrypt/cipher.c \
+	gcrypt/crypto.c \
+	gcrypt/ecdh.c \
+	gcrypt/ecdsa.c \
+	gcrypt/digest.c \
+	gcrypt/prf.c
+endif
 
-INCLUDES = @INCLUDES@ -I$(top_builddir)
+tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
 
 noinst_HEADERS = \
 	xalloc.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h ipv6.h ipv4.h ethernet.h \
 	buffer.h conf.h connection.h control.h control_common.h device.h edge.h graph.h info.h logger.h meta.h net.h netutl.h node.h process.h \
-	protocol.h route.h subnet.h sptps.h tincctl.h top.h bsd/tunemu.h
-
-nodist_noinst_HEADERS = \
-	cipher.h crypto.h ecdh.h ecdsa.h digest.h prf.h rsa.h ecdsagen.h rsagen.h
+	protocol.h route.h subnet.h sptps.h tincctl.h top.h hash.h event.h names.h have.h system.h \
+	cipher.h crypto.h digest.h ecdh.h ecdsa.h ecdsagen.h prf.h rsa.h rsagen.h
 
 LIBS = @LIBS@ @LIBGCRYPT_LIBS@