Mon, 22 Aug 2016 02:41:38 -0400
Add plugins to meson build.
--- a/libpurple/meson.build Mon Aug 22 01:21:17 2016 -0400 +++ b/libpurple/meson.build Mon Aug 22 02:41:38 2016 -0400 @@ -2,7 +2,6 @@ # subdir('data/gconf') endif -#subdir('plugins') #subdir('protocols') purple_coresources = [ @@ -546,3 +545,4 @@ subdir('tests') subdir('example') +subdir('plugins')
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/plugins/keyrings/meson.build Mon Aug 22 02:41:38 2016 -0400 @@ -0,0 +1,46 @@ +if PLUGINS + internalkeyring_plugin = library('internalkeyring', 'internalkeyring.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + if ENABLE_SECRETSERVICE + secretsservice_plugin = library('secretservice', 'secretservice.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [secretservice, gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + endif + + if ENABLE_GNOMEKEYRING + gnomekeyring_plugin = library('gnomekeyring', 'gnomekeyring.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gnome_keyring, gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + endif + + if IS_WIN32 + wincred_plugin = library('wincred', 'wincred.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + endif + + if ENABLE_KWALLET + kwallet_moc = moc.process('kwallet.cpp') + + kwallet_plugin = library('kwallet', 'kwallet.cpp', kwallet_moc, + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [kwallet, qt4, gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + endif +endif # PLUGINS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/plugins/meson.build Mon Aug 22 02:41:38 2016 -0400 @@ -0,0 +1,134 @@ +subdir('keyrings') + +if PLUGINS + autoaccept = library('autoaccept', 'autoaccept.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + buddynote = library('buddynote', 'buddynote.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + caesarcipher = library('caesarcipher', 'caesarcipher.c', 'caesarcipher.h', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + +# caesarcipher_consumer = library('caesarcipher_consumer', 'caesarcipher_consumer.c', +# include_directories : [toplevel_inc, libpurple_inc], +# link_with : libpurple, +# dependencies : [gplugin, glib], +# name_prefix : '') + + codeinline = library('codeinline', 'codeinline.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + debug_example = library('debug_example', 'debug_example.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + helloworld = library('helloworld', 'helloworld.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + idle = library('idle', 'idle.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + joinpart = library('joinpart', 'joinpart.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + log_reader = library('log_reader', 'log_reader.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + notify_example = library('notify_example', 'notify_example.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + offlinemsg = library('offlinemsg', 'offlinemsg.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + one_time_password = library('one_time_password', 'one_time_password.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + pluginpref_example = library('pluginpref_example', 'pluginpref_example.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + psychic = library('psychic', 'psychic.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + signals_test = library('signals-test', 'signals-test.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + simple = library('simple', 'simple.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '') + + statenotify = library('statenotify', 'statenotify.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gplugin, glib], + name_prefix : '', + install : true, install_dir : PURPLE_PLUGINDIR) + + if ENABLE_DBUS + dbus_example_bindings_c = custom_target('dbus_example_bindings_c', + input : 'dbus-example.c', + output : 'dbus-example-bindings.c', + command : [python, + meson.source_root() + '/libpurple/dbus-analyze-functions.py', + '--export-only', '-o', '@OUTPUT@', '@INPUT@']) + + dbus_example = library('dbus-example', 'dbus-example.c', + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [dbus, gplugin, glib], + name_prefix : '') + endif # ENABLE_DBUS +endif # PLUGINS
--- a/meson.build Mon Aug 22 01:21:17 2016 -0400 +++ b/meson.build Mon Aug 22 02:41:38 2016 -0400 @@ -235,11 +235,11 @@ conf.set('PURPLE_LOCALEDIR', purple_localedir) # FIXME: -PURPLE_PLUGINDIR = '\$(libdir)/purple-$PURPLE_MAJOR_VERSION' +PURPLE_PLUGINDIR = '@0@/purple-@1@'.format(get_option('libdir'), purple_major_version) conf.set('PURPLE_PLUGINDIR', '"@0@"'.format(PURPLE_PLUGINDIR)) -PIDGIN_PLUGINDIR = '\$(libdir)/pidgin-$PURPLE_MAJOR_VERSION' +PIDGIN_PLUGINDIR = '@0@/pidgin-@1@'.format(get_option('libdir'), purple_major_version) conf.set('PIDGIN_PLUGINDIR', '"@0@"'.format(PIDGIN_PLUGINDIR)) -FINCH_PLUGINDIR = '\$(libdir)/finch-$PURPLE_MAJOR_VERSION' +FINCH_PLUGINDIR = '@0@/finch-@1@'.format(get_option('libdir'), purple_major_version) conf.set('FINCH_PLUGINDIR', '"@0@"'.format(FINCH_PLUGINDIR)) # Checks for library functions.