projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor crypto RNG; add getrandom() support
[tinc]
/
src
/
meson.build
diff --git
a/src/meson.build
b/src/meson.build
index
af2410d
..
d96dd71
100644
(file)
--- a/
src/meson.build
+++ b/
src/meson.build
@@
-106,6
+106,7
@@
src_lib_common = [
'dropin.c',
'keys.c',
'list.c',
'dropin.c',
'keys.c',
'list.c',
+ 'logger.c',
'names.c',
'netutl.c',
'script.c',
'names.c',
'netutl.c',
'script.c',
@@
-115,7
+116,6
@@
src_lib_common = [
'utils.c',
'version.c',
'xoshiro.c',
'utils.c',
'version.c',
'xoshiro.c',
- 'logger.c',
]
src_tinc = [
]
src_tinc = [
@@
-163,6
+163,10
@@
deps_common = []
deps_tinc = []
deps_tincd = [cc.find_library('m', required: false)]
deps_tinc = []
deps_tincd = [cc.find_library('m', required: false)]
+if os_name != 'windows'
+ src_lib_common += 'random.c'
+endif
+
if os_name in ['linux', 'android']
subdir('linux')
elif os_name.endswith('bsd') or os_name in ['dragonfly', 'darwin']
if os_name in ['linux', 'android']
subdir('linux')
elif os_name.endswith('bsd') or os_name in ['dragonfly', 'darwin']
@@
-216,8
+220,10
@@
foreach type : check_types
endif
endforeach
endif
endforeach
+src_getopt = []
if not cdata.has('HAVE_GETOPT_H') or not cc.has_function('getopt_long', prefix: have_prefix, args: cc_defs)
if not cdata.has('HAVE_GETOPT_H') or not cc.has_function('getopt_long', prefix: have_prefix, args: cc_defs)
- src_lib_common += ['getopt.c', 'getopt1.c']
+ src_getopt = ['getopt.c', 'getopt1.c']
+ src_lib_common += src_getopt
endif
if not opt_miniupnpc.disabled()
endif
if not opt_miniupnpc.disabled()
@@
-328,6
+334,10
@@
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
if opt_crypto != 'nolegacy'
src_lib_crypto += ['cipher.c', 'digest.c']
endif
@@
-403,7
+413,7
@@
exe_tincd = executable(
exe_sptps_test = executable(
'sptps_test',
exe_sptps_test = executable(
'sptps_test',
- sources:
'sptps_test.c'
,
+ sources:
[src_getopt, 'sptps_test.c']
,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,
@@
-413,7
+423,7
@@
exe_sptps_test = executable(
exe_sptps_keypair = executable(
'sptps_keypair',
exe_sptps_keypair = executable(
'sptps_keypair',
- sources:
'sptps_keypair.c'
,
+ sources:
[src_getopt, 'sptps_keypair.c']
,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,
dependencies: deps_lib_common,
link_with: lib_common,
implicit_include_directories: false,