Follow meson guidlines for static/shared libs

Use only one library definition for faster builds.
This commit is contained in:
Calvin Rose 2019-06-08 09:05:38 -04:00
parent b83fe146fa
commit f00a2770ef
1 changed files with 2 additions and 9 deletions

View File

@ -124,12 +124,7 @@ core_image = custom_target('core_image',
output : 'core_image.gen.c', output : 'core_image.gen.c',
command : [janet_boot, '@OUTPUT@', 'JANET_PATH', janet_path, 'JANET_HEADERPATH', header_path]) command : [janet_boot, '@OUTPUT@', 'JANET_PATH', janet_path, 'JANET_HEADERPATH', header_path])
libjanet = shared_library('janet', core_src, core_image, libjanet = 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,
include_directories : incdir, include_directories : incdir,
dependencies : [m_dep, dl_dep], dependencies : [m_dep, dl_dep],
install : true) install : true)
@ -186,10 +181,8 @@ endforeach
run_target('repl', command : [janet_nativeclient]) run_target('repl', command : [janet_nativeclient])
# For use as meson subproject (wrap) # For use as meson subproject (wrap)
janet_shared_dep = declare_dependency(include_directories : incdir, janet_dep = declare_dependency(include_directories : incdir,
link_with : libjanet) link_with : libjanet)
janet_static_dep = declare_dependency(include_directories : incdir,
link_with : libjanet_static)
# Installation # Installation
install_man('janet.1') install_man('janet.1')