fix meson deprecations

This commit is contained in:
Ailin Nemui 2022-02-14 16:54:58 +01:00
parent f4938a2804
commit 89bcff606f
12 changed files with 33 additions and 23 deletions

View File

@ -1,6 +1,6 @@
# this file is part of irssi # this file is part of irssi
libfe_irc_dcc_a = shared_module('fe_irc_dcc', libfe_irc_dcc_a = static_library('fe_irc_dcc',
files( files(
'fe-dcc-chat-messages.c', 'fe-dcc-chat-messages.c',
'fe-dcc-chat.c', 'fe-dcc-chat.c',
@ -12,13 +12,15 @@ libfe_irc_dcc_a = shared_module('fe_irc_dcc',
), ),
include_directories : rootinc, include_directories : rootinc,
implicit_include_directories : false, implicit_include_directories : false,
install : true,
install_dir : moduledir,
c_args : [ c_args : [
def_helpdir, def_helpdir,
def_sysconfdir, def_sysconfdir,
], ],
dependencies : dep) dependencies : dep)
shared_module('fe_irc_dcc',
install : true,
install_dir : moduledir,
link_whole : libfe_irc_dcc_a)
install_headers( install_headers(
files( files(

View File

@ -1,6 +1,6 @@
# this file is part of irssi # this file is part of irssi
libfe_common_irc_a = shared_module('fe_common_irc', libfe_common_irc_a = static_library('fe_common_irc',
files( files(
'fe-cap.c', 'fe-cap.c',
'fe-common-irc.c', 'fe-common-irc.c',
@ -25,13 +25,15 @@ libfe_common_irc_a = shared_module('fe_common_irc',
), ),
include_directories : rootinc, include_directories : rootinc,
implicit_include_directories : false, implicit_include_directories : false,
install : true,
install_dir : moduledir,
c_args : [ c_args : [
def_helpdir, def_helpdir,
def_themesdir, def_themesdir,
], ],
dependencies : dep) dependencies : dep)
shared_module('fe_common_irc',
install : true,
install_dir : moduledir,
link_whole : libfe_common_irc_a)
install_headers( install_headers(
files( files(

View File

@ -1,19 +1,21 @@
# this file is part of irssi # this file is part of irssi
libfe_irc_notifylist_a = shared_module('fe_irc_notifylist', libfe_irc_notifylist_a = static_library('fe_irc_notifylist',
files( files(
'fe-notifylist.c', 'fe-notifylist.c',
'module-formats.c', 'module-formats.c',
), ),
include_directories : rootinc, include_directories : rootinc,
implicit_include_directories : false, implicit_include_directories : false,
install : true,
install_dir : moduledir,
c_args : [ c_args : [
def_helpdir, def_helpdir,
def_sysconfdir, def_sysconfdir,
], ],
dependencies : dep) dependencies : dep)
shared_module('fe_irc_notifylist',
install : true,
install_dir : moduledir,
link_whole : libfe_irc_notifylist_a)
install_headers( install_headers(
files( files(

View File

@ -1,6 +1,6 @@
# this file is part of irssi # this file is part of irssi
libirc_core_a = shared_module('irc_core', libirc_core_a = static_library('irc_core',
files( files(
'bans.c', 'bans.c',
'channel-events.c', 'channel-events.c',
@ -33,13 +33,15 @@ libirc_core_a = shared_module('irc_core',
), ),
include_directories : rootinc, include_directories : rootinc,
implicit_include_directories : false, implicit_include_directories : false,
install : true,
install_dir : moduledir,
c_args : [ c_args : [
def_moduledir, def_moduledir,
def_sysconfdir, def_sysconfdir,
], ],
dependencies : dep) dependencies : dep)
shared_module('irc_core',
install : true,
install_dir : moduledir,
link_whole : libirc_core_a)
install_headers( install_headers(
files( files(

View File

@ -1,6 +1,6 @@
# this file is part of irssi # this file is part of irssi
libirc_dcc_a = shared_module('irc_dcc', shared_module('irc_dcc',
files( files(
'dcc-autoget.c', 'dcc-autoget.c',
'dcc-chat.c', 'dcc-chat.c',

View File

@ -1,15 +1,17 @@
# this file is part of irssi # this file is part of irssi
libirc_flood_a = shared_module('irc_flood', libirc_flood_a = static_library('irc_flood',
files( files(
'autoignore.c', 'autoignore.c',
'flood.c', 'flood.c',
), ),
include_directories : rootinc, include_directories : rootinc,
implicit_include_directories : false, implicit_include_directories : false,
dependencies : dep)
shared_module('irc_flood',
install : true, install : true,
install_dir : moduledir, install_dir : moduledir,
dependencies : dep) link_whole : libirc_flood_a)
install_headers( install_headers(
files('module.h'), files('module.h'),

View File

@ -1,6 +1,6 @@
# this file is part of irssi # this file is part of irssi
libirc_notifylist_a = shared_module('irc_notifylist', shared_module('irc_notifylist',
files( files(
'notify-commands.c', 'notify-commands.c',
'notify-ison.c', 'notify-ison.c',

View File

@ -1,5 +1,5 @@
libperl_Irssi_a = shared_module('Irssi', shared_module('Irssi',
[ xsubpp.process( [ xsubpp.process(
files( files(
'Channel.xs', 'Channel.xs',

View File

@ -1,4 +1,4 @@
libperl_Irssi_Irc_a = shared_module('Irc', shared_module('Irc',
[ xsubpp.process( [ xsubpp.process(
files( files(
'Channel.xs', 'Channel.xs',

View File

@ -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_a = shared_module('perl_core', libperl_core_sm = shared_module('perl_core',
files( files(
'perl-common.c', 'perl-common.c',
'perl-core.c', 'perl-core.c',
@ -44,10 +44,10 @@ libperl_core_a = shared_module('perl_core',
dl_cross_perl_core = [] dl_cross_perl_core = []
if need_dl_cross_link if need_dl_cross_link
dl_cross_perl_core += libperl_core_a dl_cross_perl_core += libperl_core_sm
endif endif
libfe_perl_a = shared_module('fe_perl', shared_module('fe_perl',
files( files(
'module-formats.c', 'module-formats.c',
'perl-fe.c', 'perl-fe.c',

View File

@ -1,4 +1,4 @@
libperl_Irssi_TextUI_a = shared_module('TextUI', shared_module('TextUI',
[ xsubpp.process( [ xsubpp.process(
files( files(
'Statusbar.xs', 'Statusbar.xs',

View File

@ -1,4 +1,4 @@
libperl_Irssi_UI_a = shared_module('UI', shared_module('UI',
[ xsubpp.process( [ xsubpp.process(
files( files(
'Formats.xs', 'Formats.xs',