aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorCalvin Rose <calsrose@gmail.com>2019-06-08 09:05:38 -0400
committerCalvin Rose <calsrose@gmail.com>2019-06-08 09:05:38 -0400
commitf00a2770efdd51cf5f23bcf50d3802bb9e5ee029 (patch)
tree175dda06bbde6e0f2b0a9df9093e268dc31811a4
parentAdd static library to meson build. (diff)
Follow meson guidlines for static/shared libs
Use only one library definition for faster builds.
-rw-r--r--meson.build11
1 files changed, 2 insertions, 9 deletions
diff --git a/meson.build b/meson.build
index 05a404b8..cf7748ca 100644
--- a/meson.build
+++ b/meson.build
@@ -124,12 +124,7 @@ core_image = custom_target('core_image',
output : 'core_image.gen.c',
command : [janet_boot, '@OUTPUT@', 'JANET_PATH', janet_path, 'JANET_HEADERPATH', header_path])
-libjanet = shared_library('janet', core_src, core_image,
- include_directories : incdir,
- dependencies : [m_dep, dl_dep],
- install : true)
-
-libjanet_static = static_library('janet', core_src, core_image,
+libjanet = library('janet', core_src, core_image,
include_directories : incdir,
dependencies : [m_dep, dl_dep],
install : true)
@@ -186,10 +181,8 @@ endforeach
run_target('repl', command : [janet_nativeclient])
# For use as meson subproject (wrap)
-janet_shared_dep = declare_dependency(include_directories : incdir,
+janet_dep = declare_dependency(include_directories : incdir,
link_with : libjanet)
-janet_static_dep = declare_dependency(include_directories : incdir,
- link_with : libjanet_static)
# Installation
install_man('janet.1')