X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2FMakefile.am;h=146ff946aab9606a24e6a67815f474e23cd30918;hb=refs%2Fheads%2F1.0-gnutls;hp=c3cd6523c17ab2f672d0b0a408ba05ba763ee42c;hpb=de223b51b94c58d1674f1ef56e9d485ff48d366d;p=tinc

diff --git a/src/Makefile.am b/src/Makefile.am
index c3cd6523..146ff946 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Produce this file with automake to get Makefile.in
-# $Id: Makefile.am,v 1.4.4.32 2003/07/30 09:45:21 guus Exp $
+# $Id: Makefile.am,v 1.4.4.33 2003/08/02 15:13:08 guus Exp $
 
 sbin_PROGRAMS = tincd
 
@@ -11,6 +11,8 @@ tincd_SOURCES = conf.c connection.c edge.c event.c graph.c logger.c meta.c net.c
 
 nodist_tincd_SOURCES = device.c
 
+DEFAULT_INCLUDES =
+
 INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
 
 noinst_HEADERS = conf.h connection.h device.h edge.h event.h graph.h logger.h meta.h net.h netutl.h node.h process.h	\
@@ -19,15 +21,11 @@ noinst_HEADERS = conf.h connection.h device.h edge.h event.h graph.h logger.h me
 LIBS = @LIBS@ @LIBINTL@
 
 tincd_LDADD = \
-	$(top_builddir)/lib/libvpn.a
+	$(top_builddir)/lib/libvpn.a -lgnutls
 
 localedir = $(datadir)/locale
 
-AM_CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\"	\
-	-DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
+AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
 
 dist-hook:
 	rm -f `find . -type l`
-
-lint: $(tincd_SOURCES)
-	lclint -nullassign -nullret +trytorecover +posixlib -skipansiheaders -skipposixheaders +gnuextensions -I/usr/include -I/usr/lib/gcc-lib/i386-linux/2.95.2/include -I. -I/home/zarq/p/tinc/cvs/cabal/src -I.. -I.. -I/home/zarq/p/tinc/cvs/cabal/lib -I/home/zarq/p/tinc/cvs/cabal/intl -D_POSIX_SOURCE -D__ELF__ -Dunix -D__i386__ -Dlinux -DHAVE_CONFIG_H -DPKGLIBDIR=/usr/local/lib/tinc -DCONFDIR=\"/usr/local/etc\" -DLOCALEDIR=\"/usr/local/share/locale\" $^