projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
a3b7202
..
bb78d4d
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,13
+1,18
@@
## Produce this file with automake to get Makefile.in
## Produce this file with automake to get Makefile.in
-# $Id: Makefile.am,v 1.4.4.33 2003/08/02 15:13:08 guus Exp $
-sbin_PROGRAMS = tincd
+sbin_PROGRAMS = tincd
tincctl
-EXTRA_DIST = linux/device.c
freebsd/device.c openbsd/device.c solaris/device.c netbsd/device.c darwin/device.c cygwin/device.c mingw/device.c raw
_socket/device.c
+EXTRA_DIST = linux/device.c
bsd/device.c solaris/device.c cygwin/device.c mingw/device.c mingw/common.h raw_socket/device.c uml
_socket/device.c
-tincd_SOURCES = c
onf.c connection.c edge.c event.c graph.c logger.c meta.c net.c net_packet.c net_setup.c
\
+tincd_SOURCES = c
ipher.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 \
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 subnet.c tincd.c
+ protocol_key.c protocol_subnet.c route.c rsa.c subnet.c tincd.c
+
+tincctl_SOURCES = tincctl.c rsagen.c
+
+if TUNEMU
+tincd_SOURCES += bsd/tunemu.c
+endif
nodist_tincd_SOURCES = device.c
nodist_tincd_SOURCES = device.c
@@
-15,17
+20,22
@@
DEFAULT_INCLUDES =
INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
INCLUDES = @INCLUDES@ -I$(top_builddir) -I$(top_srcdir)/lib
-noinst_HEADERS = c
onf.h connection.h device.h edge.h event.h graph.h logger.h meta.h net.h netutl.h node.h process.h
\
- protocol.h route.h
subnet
.h
+noinst_HEADERS = c
ipher.h conf.h connection.h control.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@ @LIBINTL@
+LIBS = @LIBS@ @LIBGCRYPT_LIBS@
+
+if TUNEMU
+LIBS += -lpcap
+endif
tincd_LDADD = \
$(top_builddir)/lib/libvpn.a
tincd_LDADD = \
$(top_builddir)/lib/libvpn.a
-localedir = $(datadir)/locale
+tincctl_LDADD = \
+ $(top_builddir)/lib/libvpn.a
-AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCAL
EDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstate
dir)\"
+AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCAL
STATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbin
dir)\"
dist-hook:
rm -f `find . -type l`
dist-hook:
rm -f `find . -type l`