X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=23bbfbcd2e7a1d2c6009c56002e8666d76693269;hb=8733110dec28967d67a3c00d00cdfa608dbeb9c4;hp=04ef0f9fe7afe8293e5a4fe68a9db9770cbf333e;hpb=97355690b9cf8d8b56a316e01f73f8ff1fee68c8;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index 04ef0f9f..23bbfbcd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,25 +5,26 @@ sbin_PROGRAMS = tincd tincctl
 EXTRA_DIST = linux bsd solaris cygwin mingw raw_socket uml_socket openssl gcrypt
 
 tincd_SOURCES = \
-	xmalloc.c 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 \
+	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 subnet.c tincd.c
+
+nodist_tincd_SOURCES = \
+	device.c cipher.c crypto.c digest.c rsa.c		     
 
 tincctl_SOURCES = \
-	xmalloc.c utils.c getopt.c getopt1.c dropin.c \
-	tincctl.c rsagen.c
+	utils.c getopt.c getopt1.c dropin.c \
+	list.c tincctl.c top.c
+
+nodist_tincctl_SOURCES = \
+	rsagen.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
 
 DEFAULT_INCLUDES =
 
@@ -32,7 +33,7 @@ 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
+	protocol.h route.h rsa.h rsagen.h subnet.h tincctl.h top.h bsd/tunemu.h
 
 LIBS = @LIBS@ @LIBGCRYPT_LIBS@
 
@@ -40,7 +41,7 @@ if TUNEMU
 LIBS += -lpcap
 endif
 
-AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
+AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
 
 dist-hook:
 	rm -f `find . -type l`