X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2FMakefile.am;h=c1f51f102ed8fa6cf6a695fffeb34815878932de;hp=60709fb73c5b9248892a6b8f1d8e23a5dfe72fee;hb=e70b5b5bd77bb66e8dd324c17d86d9bff151aa82;hpb=79e9a4f743b7b59fed968575f6b36171cf4a0063

diff --git a/src/Makefile.am b/src/Makefile.am
index 60709fb7..c1f51f10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,38 +1,77 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd tincctl
+sbin_PROGRAMS = tincd tinc sptps_test
 
-EXTRA_DIST = linux bsd solaris cygwin mingw raw_socket uml_socket openssl gcrypt
+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 \
-	buffer.c 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 \
+	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 rsa.c subnet.c tincd.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
 
-tincctl_SOURCES = \
+## Conditionally compile device drivers
+	
+if LINUX
+tincd_SOURCES += linux/device.c
+endif
+
+if BSD
+tincd_SOURCES += bsd/device.c
+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
+
+nodist_tincd_SOURCES = \
+	cipher.c crypto.c ecdh.c ecdsa.c digest.c prf.c rsa.c
+
+tinc_SOURCES = \
 	utils.c getopt.c getopt1.c dropin.c \
-	list.c tincctl.c rsagen.c
+	info.c list.c subnet_parse.c tincctl.c top.c names.c
+
+nodist_tinc_SOURCES = \
+	ecdsagen.c rsagen.c
+
+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 TUNEMU
 tincd_SOURCES += bsd/tunemu.c
 endif
 
-if CURSES
-tincctl_SOURCES += top.c
-tincctl_LDADD = $(CURSES_LIBS)
-endif
-
-nodist_tincd_SOURCES = device.c
+tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS)
 
 DEFAULT_INCLUDES =
 
-INCLUDES = @INCLUDES@ -I$(top_builddir)
+INCLUDES = @INCLUDES@
 
 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 cipher.h conf.h connection.h control.h control_common.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
+	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 hash.h event.h names.h
+
+nodist_noinst_HEADERS = \
+	cipher.h crypto.h ecdh.h ecdsa.h digest.h prf.h rsa.h ecdsagen.h rsagen.h
 
 LIBS = @LIBS@ @LIBGCRYPT_LIBS@