From f2684e9166e34d0df5122616811e0c6642d38c41 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 1 Dec 2021 19:18:35 +0100 Subject: [PATCH] build: use file object instead of strigns for source files See https://github.com/profanity-im/profanity/pull/1619#pullrequestreview-820629048 --- src/meson.build | 147 ++++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/src/meson.build b/src/meson.build index dd340c72..6bb639ab 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,76 +1,77 @@ # main sources -core_sources_c = [ 'src/main.c', - 'src/profanity.c', - 'src/log.c', - 'src/common.c', - 'src/database.c', - 'src/xmpp/contact.c', - 'src/xmpp/stanza.c', - 'src/xmpp/chat_session.c', - 'src/xmpp/muc.c', - 'src/xmpp/jid.c', - 'src/xmpp/chat_state.c', - 'src/xmpp/resource.c', - 'src/xmpp/roster_list.c', - 'src/xmpp/capabilities.c', - 'src/xmpp/session.c', - 'src/xmpp/connection.c', - 'src/xmpp/iq.c', - 'src/xmpp/message.c', - 'src/xmpp/presence.c', - 'src/xmpp/roster.c', - 'src/xmpp/bookmark.c', - 'src/xmpp/blocking.c', - 'src/xmpp/form.c', - 'src/xmpp/avatar.c', - 'src/xmpp/ox.c', - 'src/event/common.c', - 'src/event/client_events.c', - 'src/event/server_events.c', - 'src/ui/window.c', - 'src/ui/core.c', - 'src/ui/console.c', - 'src/ui/titlebar.c', - 'src/ui/statusbar.c', - 'src/ui/inputwin.c', - 'src/ui/screen.c', - 'src/ui/notifier.c', - 'src/ui/window_list.c', - 'src/ui/occupantswin.c', - 'src/ui/rosterwin.c', - 'src/ui/chatwin.c', - 'src/ui/mucwin.c', - 'src/ui/privwin.c', - 'src/ui/confwin.c', - 'src/ui/xmlwin.c', - 'src/ui/buffer.c', - 'src/ui/tray.c', - 'src/command/cmd_defs.c', - 'src/command/cmd_funcs.c', - 'src/command/cmd_ac.c', - 'src/tools/parser.c', - 'src/tools/http_common.c', - 'src/tools/http_upload.c', - 'src/tools/http_download.c', - 'src/tools/bookmark_ignore.c', - 'src/tools/autocomplete.c', - 'src/tools/clipboard.c', - 'src/config/files.c', - 'src/config/conflists.c', - 'src/config/account.c', - 'src/config/accounts.c', - 'src/config/tlscerts.c', - 'src/config/preferences.c', - 'src/config/theme.c', - 'src/config/color.c', - 'src/config/scripts.c', - 'src/plugins/plugins.c', - 'src/plugins/api.c', - 'src/plugins/callbacks.c', - 'src/plugins/autocompleters.c', - 'src/plugins/themes.c', - 'src/plugins/settings.c', - 'src/plugins/disco.c', +core_sources_c = [ files( 'main.c', + 'profanity.c', + 'log.c', + 'common.c', + 'database.c', + 'xmpp/contact.c', + 'xmpp/stanza.c', + 'xmpp/chat_session.c', + 'xmpp/muc.c', + 'xmpp/jid.c', + 'xmpp/chat_state.c', + 'xmpp/resource.c', + 'xmpp/roster_list.c', + 'xmpp/capabilities.c', + 'xmpp/session.c', + 'xmpp/connection.c', + 'xmpp/iq.c', + 'xmpp/message.c', + 'xmpp/presence.c', + 'xmpp/roster.c', + 'xmpp/bookmark.c', + 'xmpp/blocking.c', + 'xmpp/form.c', + 'xmpp/avatar.c', + 'xmpp/ox.c', + 'event/common.c', + 'event/client_events.c', + 'event/server_events.c', + 'ui/window.c', + 'ui/core.c', + 'ui/console.c', + 'ui/titlebar.c', + 'ui/statusbar.c', + 'ui/inputwin.c', + 'ui/screen.c', + 'ui/notifier.c', + 'ui/window_list.c', + 'ui/occupantswin.c', + 'ui/rosterwin.c', + 'ui/chatwin.c', + 'ui/mucwin.c', + 'ui/privwin.c', + 'ui/confwin.c', + 'ui/xmlwin.c', + 'ui/buffer.c', + 'ui/tray.c', + 'command/cmd_defs.c', + 'command/cmd_funcs.c', + 'command/cmd_ac.c', + 'tools/parser.c', + 'tools/http_common.c', + 'tools/http_upload.c', + 'tools/http_download.c', + 'tools/bookmark_ignore.c', + 'tools/autocomplete.c', + 'tools/clipboard.c', + 'config/files.c', + 'config/conflists.c', + 'config/account.c', + 'config/accounts.c', + 'config/tlscerts.c', + 'config/preferences.c', + 'config/theme.c', + 'config/color.c', + 'config/scripts.c', + 'plugins/plugins.c', + 'plugins/api.c', + 'plugins/callbacks.c', + 'plugins/autocompleters.c', + 'plugins/themes.c', + 'plugins/settings.c', + 'plugins/disco.c', + ), config_h ] @@ -80,7 +81,7 @@ incdir = include_directories('.', 'command', 'config', 'ui', 'plugins', 'xmpp') # optional sources if pgp_dep.found() - sources += 'src/pgp/gpg.c' + sources += files('pgp/gpg.c') endif otr_internal_dep = declare_dependency()