mirror of
https://github.com/irssi/irssi.git
synced 2026-08-19 16:42:30 +02:00
replace shared_module with shared_library
according to mesonbuild irc chat
This commit is contained in:
parent
df8aa42778
commit
989ddd8429
14 changed files with 37 additions and 23 deletions
|
|
@ -17,12 +17,13 @@ libfe_irc_dcc_a = static_library('fe_irc_dcc',
|
||||||
def_sysconfdir,
|
def_sysconfdir,
|
||||||
],
|
],
|
||||||
dependencies : dep)
|
dependencies : dep)
|
||||||
shared_module('fe_irc_dcc',
|
shared_library('fe_irc_dcc',
|
||||||
name_suffix : module_suffix,
|
name_suffix : module_suffix,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
|
link_with : dl_cross_irc_dcc + dl_cross_irc_core + dl_cross_irssi_main,
|
||||||
link_whole : libfe_irc_dcc_a)
|
link_whole : libfe_irc_dcc_a,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
files(
|
files(
|
||||||
|
|
|
||||||
|
|
@ -28,12 +28,13 @@ libfe_common_irc_a = static_library('fe_common_irc',
|
||||||
def_themesdir,
|
def_themesdir,
|
||||||
],
|
],
|
||||||
dependencies : dep)
|
dependencies : dep)
|
||||||
shared_module('fe_common_irc',
|
shared_library('fe_common_irc',
|
||||||
name_suffix : module_suffix,
|
name_suffix : module_suffix,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
||||||
link_whole : libfe_common_irc_a)
|
link_whole : libfe_common_irc_a,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
files(
|
files(
|
||||||
|
|
|
||||||
|
|
@ -12,12 +12,13 @@ libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
|
||||||
def_sysconfdir,
|
def_sysconfdir,
|
||||||
],
|
],
|
||||||
dependencies : dep)
|
dependencies : dep)
|
||||||
shared_module('fe_irc_notifylist',
|
shared_library('fe_irc_notifylist',
|
||||||
name_suffix : module_suffix,
|
name_suffix : module_suffix,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_with : dl_cross_irc_notifylist + dl_cross_irssi_main,
|
link_with : dl_cross_irc_notifylist + dl_cross_irssi_main,
|
||||||
link_whole : libfe_irc_notifylist_a)
|
link_whole : libfe_irc_notifylist_a,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
files(
|
files(
|
||||||
|
|
|
||||||
|
|
@ -39,12 +39,13 @@ libirc_core_a = static_library('irc_core',
|
||||||
def_sysconfdir,
|
def_sysconfdir,
|
||||||
],
|
],
|
||||||
dependencies : dep)
|
dependencies : dep)
|
||||||
libirc_core_sm = shared_module('irc_core',
|
libirc_core_sm = shared_library('irc_core',
|
||||||
name_suffix : module_suffix,
|
name_suffix : module_suffix,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_whole : libirc_core_a,
|
link_whole : libirc_core_a,
|
||||||
link_with : dl_cross_irssi_main)
|
link_with : dl_cross_irssi_main,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
dl_cross_irc_core = []
|
dl_cross_irc_core = []
|
||||||
if need_dl_cross_link
|
if need_dl_cross_link
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# this file is part of irssi
|
# this file is part of irssi
|
||||||
|
|
||||||
libirc_dcc_sm = shared_module('irc_dcc',
|
libirc_dcc_sm = shared_library('irc_dcc',
|
||||||
files(
|
files(
|
||||||
'dcc-autoget.c',
|
'dcc-autoget.c',
|
||||||
'dcc-chat.c',
|
'dcc-chat.c',
|
||||||
|
|
@ -17,7 +17,8 @@ libirc_dcc_sm = shared_module('irc_dcc',
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
||||||
dependencies : dep)
|
dependencies : dep,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
dl_cross_irc_dcc = []
|
dl_cross_irc_dcc = []
|
||||||
if need_dl_cross_link
|
if need_dl_cross_link
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,13 @@ libirc_flood_a = static_library('irc_flood',
|
||||||
include_directories : rootinc,
|
include_directories : rootinc,
|
||||||
implicit_include_directories : false,
|
implicit_include_directories : false,
|
||||||
dependencies : dep)
|
dependencies : dep)
|
||||||
shared_module('irc_flood',
|
shared_library('irc_flood',
|
||||||
name_suffix : module_suffix,
|
name_suffix : module_suffix,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
||||||
link_whole : libirc_flood_a)
|
link_whole : libirc_flood_a,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
files('module.h'),
|
files('module.h'),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# this file is part of irssi
|
# this file is part of irssi
|
||||||
|
|
||||||
libirc_notifylist_sm = shared_module('irc_notifylist',
|
libirc_notifylist_sm = shared_library('irc_notifylist',
|
||||||
files(
|
files(
|
||||||
'notify-commands.c',
|
'notify-commands.c',
|
||||||
'notify-ison.c',
|
'notify-ison.c',
|
||||||
|
|
@ -14,7 +14,8 @@ libirc_notifylist_sm = shared_module('irc_notifylist',
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
link_with : dl_cross_irc_core + dl_cross_irssi_main,
|
||||||
dependencies : dep)
|
dependencies : dep,
|
||||||
|
override_options : ['b_lundef=false'])
|
||||||
|
|
||||||
dl_cross_irc_notifylist = []
|
dl_cross_irc_notifylist = []
|
||||||
if need_dl_cross_link
|
if need_dl_cross_link
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# this file is part of irssi
|
# this file is part of irssi
|
||||||
|
|
||||||
shared_module('irc_proxy',
|
shared_library('irc_proxy',
|
||||||
files(
|
files(
|
||||||
'dump.c',
|
'dump.c',
|
||||||
'listen.c',
|
'listen.c',
|
||||||
|
|
@ -13,6 +13,7 @@ shared_module('irc_proxy',
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
dependencies : dep,
|
dependencies : dep,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
# noinst_headers = files(
|
# noinst_headers = files(
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# this file is part of irssi
|
# this file is part of irssi
|
||||||
|
|
||||||
shared_module('otr_core',
|
shared_library('otr_core',
|
||||||
files(
|
files(
|
||||||
'key.c',
|
'key.c',
|
||||||
'otr-fe.c',
|
'otr-fe.c',
|
||||||
|
|
@ -15,6 +15,7 @@ shared_module('otr_core',
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
dependencies : dep,
|
dependencies : dep,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
# noinst_headers = files(
|
# noinst_headers = files(
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
shared_module('Irssi',
|
shared_library('Irssi',
|
||||||
[ xsubpp.process(
|
[ xsubpp.process(
|
||||||
files(
|
files(
|
||||||
'Channel.xs',
|
'Channel.xs',
|
||||||
|
|
@ -27,6 +27,7 @@ shared_module('Irssi',
|
||||||
implicit_include_directories : true,
|
implicit_include_directories : true,
|
||||||
dependencies : dep + [ perl_dep ],
|
dependencies : dep + [ perl_dep ],
|
||||||
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
shared_module('Irc',
|
shared_library('Irc',
|
||||||
[ xsubpp.process(
|
[ xsubpp.process(
|
||||||
files(
|
files(
|
||||||
'Channel.xs',
|
'Channel.xs',
|
||||||
|
|
@ -28,6 +28,7 @@ shared_module('Irc',
|
||||||
implicit_include_directories : true,
|
implicit_include_directories : true,
|
||||||
dependencies : dep + [ perl_dep ],
|
dependencies : dep + [ perl_dep ],
|
||||||
link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
|
link_with : dl_cross_perl_core + dl_cross_irc_dcc + dl_cross_irc_notifylist + dl_cross_irc_core + dl_cross_irssi_main,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ irssi_core_pl_h = custom_target('irssi-core.pl.h',
|
||||||
# required as of Meson 0.58.0
|
# required as of Meson 0.58.0
|
||||||
generated_files_inc = include_directories('.')
|
generated_files_inc = include_directories('.')
|
||||||
|
|
||||||
libperl_core_sm = shared_module('perl_core',
|
libperl_core_sm = shared_library('perl_core',
|
||||||
files(
|
files(
|
||||||
'perl-common.c',
|
'perl-common.c',
|
||||||
'perl-core.c',
|
'perl-core.c',
|
||||||
|
|
@ -39,7 +39,7 @@ libperl_core_sm = shared_module('perl_core',
|
||||||
install_rpath : perl_rpath,
|
install_rpath : perl_rpath,
|
||||||
build_rpath : perl_rpath,
|
build_rpath : perl_rpath,
|
||||||
dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
|
dependencies : dep_cflagsonly + [ perl_dep ] + dl_cross_dep,
|
||||||
override_options : ['b_asneeded=false'],
|
override_options : ['b_asneeded=false', 'b_lundef=false'],
|
||||||
link_with : dl_cross_irssi_main,
|
link_with : dl_cross_irssi_main,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -48,7 +48,7 @@ if need_dl_cross_link
|
||||||
dl_cross_perl_core += libperl_core_sm
|
dl_cross_perl_core += libperl_core_sm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
shared_module('fe_perl',
|
shared_library('fe_perl',
|
||||||
files(
|
files(
|
||||||
'module-formats.c',
|
'module-formats.c',
|
||||||
'perl-fe.c',
|
'perl-fe.c',
|
||||||
|
|
@ -63,6 +63,7 @@ shared_module('fe_perl',
|
||||||
install_dir : moduledir,
|
install_dir : moduledir,
|
||||||
dependencies : dep,
|
dependencies : dep,
|
||||||
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('common')
|
subdir('common')
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
shared_module('TextUI',
|
shared_library('TextUI',
|
||||||
[ xsubpp.process(
|
[ xsubpp.process(
|
||||||
files(
|
files(
|
||||||
'Statusbar.xs',
|
'Statusbar.xs',
|
||||||
|
|
@ -24,6 +24,7 @@ shared_module('TextUI',
|
||||||
implicit_include_directories : true,
|
implicit_include_directories : true,
|
||||||
dependencies : dep + [ perl_dep ],
|
dependencies : dep + [ perl_dep ],
|
||||||
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
shared_module('UI',
|
shared_library('UI',
|
||||||
[ xsubpp.process(
|
[ xsubpp.process(
|
||||||
files(
|
files(
|
||||||
'Formats.xs',
|
'Formats.xs',
|
||||||
|
|
@ -22,6 +22,7 @@ shared_module('UI',
|
||||||
implicit_include_directories : true,
|
implicit_include_directories : true,
|
||||||
dependencies : dep + [ perl_dep ],
|
dependencies : dep + [ perl_dep ],
|
||||||
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
link_with : dl_cross_perl_core + dl_cross_irssi_main,
|
||||||
|
override_options : ['b_lundef=false'],
|
||||||
)
|
)
|
||||||
|
|
||||||
install_headers(
|
install_headers(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue