projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in shortest path implementation
[tinc]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index
02a4283
..
6399ddb
100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-119,6
+119,7
@@
src_lib_common = [
'conf.c',
'console.c',
'dropin.c',
'conf.c',
'console.c',
'dropin.c',
+ 'fs.c',
'keys.c',
'list.c',
'logger.c',
'keys.c',
'list.c',
'logger.c',
@@
-174,6
+175,13
@@
src_tincd = [
'subnet.c',
]
'subnet.c',
]
+src_event_select = files('event_select.c')
+
+if os_name != 'windows'
+ src_tincd += 'signal.c'
+endif
+
+cc_flags_tinc = cc_flags
cc_flags_tincd = cc_flags
deps_common = []
cc_flags_tincd = cc_flags
deps_common = []
@@
-204,6
+212,7
@@
endforeach
if cdata.has('HAVE_SYS_UN_H')
src_tincd += 'fd_device.c'
if cdata.has('HAVE_SYS_UN_H')
src_tincd += 'fd_device.c'
+ cdata.set('HAVE_FD_DEVICE', 1)
endif
confdata = configuration_data()
endif
confdata = configuration_data()
@@
-269,6
+278,9
@@
if not opt_curses.disabled()
if dep_curses.found()
cdata.set('HAVE_CURSES', 1)
deps_tinc += dep_curses
if dep_curses.found()
cdata.set('HAVE_CURSES', 1)
deps_tinc += dep_curses
+ if static
+ cc_flags_tinc += '-DNCURSES_STATIC'
+ endif
endif
endif
endif
endif
@@
-354,16
+366,17
@@
endif
subdir(opt_crypto)
subdir(opt_crypto)
-if opt_crypto != 'openssl'
- src_lib_crypto += 'crypto.c'
-endif
-
if opt_crypto != 'nolegacy'
src_lib_crypto += ['cipher.c', 'digest.c']
endif
subdir('include')
if opt_crypto != 'nolegacy'
src_lib_crypto += ['cipher.c', 'digest.c']
endif
subdir('include')
+have_sandbox = cdata.has('HAVE_SANDBOX')
+if not have_sandbox
+ src_lib_common += 'sandbox.c'
+endif
+
lib_crypto = static_library(
'tinc_crypto',
sources: src_lib_crypto,
lib_crypto = static_library(
'tinc_crypto',
sources: src_lib_crypto,
@@
-392,6
+405,7
@@
lib_tinc = static_library(
sources: src_tinc,
dependencies: deps_tinc,
link_with: lib_common,
sources: src_tinc,
dependencies: deps_tinc,
link_with: lib_common,
+ c_args: cc_flags_tinc,
implicit_include_directories: false,
include_directories: inc_conf,
build_by_default: false,
implicit_include_directories: false,
include_directories: inc_conf,
build_by_default: false,