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

diff --git a/src/Makefile.am b/src/Makefile.am
index 2cd0df4e..60709fb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,21 +1,46 @@
 ## Produce this file with automake to get Makefile.in
 
-sbin_PROGRAMS = tincd genauth
+sbin_PROGRAMS = tincd tincctl
 
-genauth_SOURCES = genauth.c
-tincd_SOURCES = conf.c encr.c net.c netutl.c protocol.c tincd.c
+EXTRA_DIST = linux bsd solaris cygwin mingw raw_socket uml_socket openssl gcrypt
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/cipher -I$(top_srcdir)/lib
+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 \
+	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
 
-noinst_HEADERS = conf.h encr.h net.h netutl.h protocol.h
+tincctl_SOURCES = \
+	utils.c getopt.c getopt1.c dropin.c \
+	list.c tincctl.c rsagen.c
 
-LIBS = @LIBS@
+if TUNEMU
+tincd_SOURCES += bsd/tunemu.c
+endif
 
-tincd_LDADD = $(top_builddir)/cipher/libcipher.la \
-	$(top_builddir)/lib/libvpn.a
+if CURSES
+tincctl_SOURCES += top.c
+tincctl_LDADD = $(CURSES_LIBS)
+endif
 
-genauth_LDADD = $(top_builddir)/lib/libvpn.a
+nodist_tincd_SOURCES = device.c
 
-localedir = $(datadir)/locale
+DEFAULT_INCLUDES =
 
-CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"@sysconfdir@\" -DLOCALEDIR=\"$(localedir)\"
+INCLUDES = @INCLUDES@ -I$(top_builddir)
+
+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
+
+LIBS = @LIBS@ @LIBGCRYPT_LIBS@
+
+if TUNEMU
+LIBS += -lpcap
+endif
+
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+
+dist-hook:
+	rm -f `find . -type l`