diff options
| -rw-r--r-- | .hgignore | 3 | ||||
| -rw-r--r-- | libpurple/Makefile.am | 8 | ||||
| -rw-r--r-- | libpurple/meson.build | 24 | ||||
| -rw-r--r-- | libpurple/purple-client.c | 2 |
4 files changed, 21 insertions, 16 deletions
@@ -87,7 +87,8 @@ libpurple/plugins/perl/common/const-c.inc libpurple/plugins/perl/common/const-xs.inc libpurple/plugins/perl/common/lib libpurple/protocols/facebook/marshal.[ch] -libpurple/purple-client-bindings.[ch] +libpurple/purple-client-bindings.ch +libpurple/purple-client-bindings.h libpurple/purple-client-example libpurple/purple.h$ libpurple/tests/core diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am index 1f0e0c424e..c834071d63 100644 --- a/libpurple/Makefile.am +++ b/libpurple/Makefile.am @@ -305,7 +305,7 @@ CLEANFILES += \ dbus-signals.c \ dbus-types.c \ dbus-types.h \ - purple-client-bindings.c \ + purple-client-bindings.ch \ purple-client-bindings.h \ purple.service @@ -354,14 +354,14 @@ libpurple_client_la_SOURCES = purple-client.c purple-client.h libpurple_client_la_LDFLAGS = -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined libpurple_client_la_LIBADD = $(DBUS_LIBS) -purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported) +purple-client-bindings.ch: dbus-analyze-functions.py $(dbus_exported) $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client -o $@ $(dbus_build_exported) purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix ciphers/, $(purple_cipherheaders)) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported) $(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim -o $@ $(purple_build_coreheaders) $(AM_V_at) $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers --append -o $@ $(dbus_build_exported) -$(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c +$(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.ch # purple-client-example @@ -388,7 +388,7 @@ BUILT_SOURCES = $(purple_builtheaders) \ dbus-signals.c \ dbus-types.c \ dbus-types.h \ - purple-client-bindings.c \ + purple-client-bindings.ch \ purple-client-bindings.h else diff --git a/libpurple/meson.build b/libpurple/meson.build index 430d9aa22d..5342d1f8a9 100644 --- a/libpurple/meson.build +++ b/libpurple/meson.build @@ -367,18 +367,12 @@ dbus_signals_c = custom_target('dbus_signals_c', # libpurple-client -purple_client_bindings_c = custom_target('purple_client_bindings_c', - input : dbus_exported, - output : 'purple-client-bindings.c', - command : [python, dbus_analyze_functions, - '--client', '-o', '@OUTPUT@', '@INPUT@']) - purple_client_bindings_h1 = custom_target('purple_client_bindings_h1', input : purple_build_coreheaders, output : 'purple-client-bindings1.h', command : [ python, dbus_analyze_types, - '--keyword=enum', '--verbatim', '-o', '@OUTPUT@', '@INPUT@' + '--keyword=enum', '--verbatim', '-o', '@OUTPUT@', '@INPUT@' ] ) @@ -387,7 +381,7 @@ purple_client_bindings_h2 = custom_target('purple_client_bindings_h2', output : 'purple-client-bindings2.h', command : [ python, dbus_analyze_functions, - '--client', '--headers', '-o', '@OUTPUT@', '@INPUT@' + '--client', '--headers', '-o', '@OUTPUT@', '@INPUT@' ] ) @@ -397,7 +391,17 @@ purple_client_bindings_h = custom_target('purple_client_bindings_h', capture : true, command : ['cat', '@INPUT@']) -libpurple_client = library('purple-client', 'purple-client.c', +purple_client_bindings_c = custom_target('purple_client_bindings_c', + input : dbus_exported, + output : 'purple-client-bindings.ch', + command : [ + python, dbus_analyze_functions, + '--client', '-o', '@OUTPUT@', '@INPUT@' + ] +) + +libpurple_client = library('purple-client', + 'purple-client.c', purple_client_bindings_c, purple_client_bindings_h, soversion : purple_lt_current, version : PURPLE_LT_VERSION_INFO, dependencies : [dbus, dbus_glib], @@ -437,7 +441,7 @@ if ENABLE_DBUS # purple-client-example purple_client_example = executable('purple-client-example', - 'purple-client-example.c', + 'purple-client-example.c', purple_client_bindings_h, link_with : [libpurple_client, libpurple], dependencies : [dbus, dbus_glib, glib], install : true) diff --git a/libpurple/purple-client.c b/libpurple/purple-client.c index a0d4f48372..a6b22784c1 100644 --- a/libpurple/purple-client.c +++ b/libpurple/purple-client.c @@ -36,7 +36,7 @@ static GSList *garray_int_to_gslist(GArray *array) return list; } -#include "purple-client-bindings.c" +#include "purple-client-bindings.ch" static void lose(const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2); static void lose_gerror(const char *prefix, GError *error) G_GNUC_NORETURN; |