Mercurial > pidgin3 / changeset

changeset

Fix Meson DBus build. meson

Fri, 16 Jun 2017 00:44:40 -0400

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Fri, 16 Jun 2017 00:44:40 -0400
branch
meson
changeset 38498
f956b9e3f8e6
parent 38497
fcf50c9e4138
child 38499
4f6cafbbf4f1

Fix Meson DBus build.

Rename .c files that are #included so that Meson doesn't attempt to
build them, since they aren't supposed to be.

Also, add built headers into targets so they're built before sources
that need them.

libpurple/Makefile.am file | annotate | diff | comparison | revisions
libpurple/dbus-server.c file | annotate | diff | comparison | revisions
libpurple/meson.build file | annotate | diff | comparison | revisions
libpurple/plugins/Makefile.am file | annotate | diff | comparison | revisions
libpurple/plugins/dbus-example.c file | annotate | diff | comparison | revisions
libpurple/plugins/meson.build file | annotate | diff | comparison | revisions
pidgin/plugins/musicmessaging/Makefile.am file | annotate | diff | comparison | revisions
pidgin/plugins/musicmessaging/meson.build file | annotate | diff | comparison | revisions
pidgin/plugins/musicmessaging/musicmessaging.c file | annotate | diff | comparison | revisions 
--- a/libpurple/Makefile.am	Fri Jun 16 00:19:05 2017 -0400
+++ b/libpurple/Makefile.am	Fri Jun 16 00:44:40 2017 -0400
@@ -293,11 +293,11 @@
 if ENABLE_DBUS
 
 CLEANFILES += \
-	dbus-bindings.c \
+	dbus-bindings.ch \
 	dbus-client-binding.c \
 	dbus-client-binding.h \
-	dbus-signals.c \
-	dbus-types.c \
+	dbus-signals.ch \
+	dbus-types.ch \
 	dbus-types.h \
 	purple-client-bindings.ch \
 	purple-client-bindings.h \
@@ -328,20 +328,20 @@
 	$(srcdir)/protocols/irc/irc.c \
 	$(srcdir)/protocols/jabber/jabber.c
 
-dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
+dbus-types.ch: dbus-analyze-types.py $(purple_build_coreheaders)
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) -o $@ $(purple_build_coreheaders)
 
 dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders)
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) -o $@ $(purple_build_coreheaders)
 
-dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
+dbus-bindings.ch: dbus-analyze-functions.py $(dbus_exported)
 	$(AM_V_GEN)$(PYTHON) $(srcdir)/dbus-analyze-functions.py -o $@ $(dbus_build_exported)
 
-dbus-signals.c: dbus-analyze-signals.py $(dbus_signals)
+dbus-signals.ch: dbus-analyze-signals.py $(dbus_signals)
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/dbus-analyze-signals.py -o $@ $(dbus_signals)
 
-dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
-dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
+dbus-server.$(OBJEXT): dbus-bindings.ch dbus-signals.ch dbus-types.ch dbus-types.h
+dbus-server.lo: dbus-bindings.ch dbus-signals.ch dbus-types.ch dbus-types.h
 
 # Declare these as dependencies so they're built even if `make distcheck`
 # is run immediately after configuring.
@@ -385,9 +385,9 @@
 
 BUILT_SOURCES = $(purple_builtheaders) \
 	$(purple_builtsources) \
-	dbus-bindings.c \
-	dbus-signals.c \
-	dbus-types.c \
+	dbus-bindings.ch \
+	dbus-signals.ch \
+	dbus-types.ch \
 	dbus-types.h \
 	purple-client-bindings.ch \
 	purple-client-bindings.h
--- a/libpurple/dbus-server.c	Fri Jun 16 00:19:05 2017 -0400
+++ b/libpurple/dbus-server.c	Fri Jun 16 00:44:40 2017 -0400
@@ -61,7 +61,7 @@
  * #dbus-analyze-types.py script.
  */
 
-#include "dbus-types.c"
+#include "dbus-types.ch"
 
 /*
  * The following three hashtables map are used to translate between
@@ -411,8 +411,8 @@
 	return purple_dbus_connection;
 }
 
-#include "dbus-bindings.c"
-#include "dbus-signals.c"
+#include "dbus-bindings.ch"
+#include "dbus-signals.ch"
 
 static gboolean
 purple_dbus_dispatch_cb(DBusConnection *connection,
--- a/libpurple/meson.build	Fri Jun 16 00:19:05 2017 -0400
+++ b/libpurple/meson.build	Fri Jun 16 00:44:40 2017 -0400
@@ -329,7 +329,7 @@
 
 dbus_types_c = custom_target('dbus_types_c',
                              input : purple_build_coreheaders,
-                             output : 'dbus-types.c',
+                             output : 'dbus-types.ch',
                              command : [python, dbus_analyze_types, '-o', '@OUTPUT@',
                                         '--pattern=PURPLE_DBUS_DEFINE_TYPE(%s)', '@INPUT@'])
 
@@ -341,13 +341,13 @@
 
 dbus_bindings_c = custom_target('dbus_bindings_c',
                                 input : dbus_exported,
-                                output : 'dbus-bindings.c',
+                                output : 'dbus-bindings.ch',
                                 command : [python, dbus_analyze_functions, '-o', '@OUTPUT@',
                                            '@INPUT@'])
 
 dbus_signals_c = custom_target('dbus_signals_c',
                                input : dbus_signals,
-                               output : 'dbus-signals.c',
+                               output : 'dbus-signals.ch',
                                command : [python, dbus_analyze_signals, '-o', '@OUTPUT@',
                                           '@INPUT@'])
 
@@ -426,7 +426,7 @@
                          gstreamer_app, idn, json, gnutls,
                          nss, zlib, math])
 libpurple_dep = declare_dependency(
-	sources : purple_builtsources,  # Ensure built before any dependencies.
+    sources : purple_builtheaders,  # Ensure built before any dependencies.
     include_directories : [toplevel_inc, libpurple_inc],
     link_with : libpurple,
     dependencies : [gstreamer, gplugin, glib, gio])
--- a/libpurple/plugins/Makefile.am	Fri Jun 16 00:19:05 2017 -0400
+++ b/libpurple/plugins/Makefile.am	Fri Jun 16 00:44:40 2017 -0400
@@ -94,7 +94,7 @@
 
 if ENABLE_DBUS
 
-CLEANFILES              = dbus-example-bindings.c
+CLEANFILES              = dbus-example-bindings.ch
 dbus_example_la_SOURCES = dbus-example.c
 
 dbus_example_la_LIBADD       = @PURPLE_LIBS@ $(DBUS_LIBS)
@@ -104,11 +104,11 @@
 $(top_builddir)/libpurple/dbus-types.h: always
 	$(AM_V_GEN)cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
-dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
+dbus-example-bindings.ch: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
 	$(AM_V_GEN)cat $(srcdir)/$(dbus_example_la_SOURCES) | \
 	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
-$(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/libpurple/dbus-types.h
+$(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.ch $(top_builddir)/libpurple/dbus-types.h
 
 
 endif # ENABLE_DBUS
--- a/libpurple/plugins/dbus-example.c	Fri Jun 16 00:19:05 2017 -0400
+++ b/libpurple/plugins/dbus-example.c	Fri Jun 16 00:44:40 2017 -0400
@@ -73,7 +73,7 @@
 /* This file has been generated by the #dbus-analize-functions.py
    script.  It contains dbus wrappers for the four functions declared
    above. */
-#include "dbus-example-bindings.c"
+#include "dbus-example-bindings.ch"
 
 /* This is the PurpleText object we want to make publicly visible. */
 static PurpleText hello;
--- a/libpurple/plugins/meson.build	Fri Jun 16 00:19:05 2017 -0400
+++ b/libpurple/plugins/meson.build	Fri Jun 16 00:44:40 2017 -0400
@@ -84,12 +84,12 @@
 	if ENABLE_DBUS
 		dbus_example_bindings_c = custom_target('dbus_example_bindings_c',
 		    input : 'dbus-example.c',
-		    output : 'dbus-example-bindings.c',
+		    output : 'dbus-example-bindings.ch',
 		    command : [python,
 		               meson.source_root() + '/libpurple/dbus-analyze-functions.py',
 		               '--export-only', '-o', '@OUTPUT@', '@INPUT@'])
 
-		dbus_example = library('dbus-example', 'dbus-example.c',
+		dbus_example = library('dbus-example', 'dbus-example.c', dbus_example_bindings_c,
 		    dependencies : [libpurple_dep, dbus],
 		    name_prefix : '')
 	endif  # ENABLE_DBUS
--- a/pidgin/plugins/musicmessaging/Makefile.am	Fri Jun 16 00:19:05 2017 -0400
+++ b/pidgin/plugins/musicmessaging/Makefile.am	Fri Jun 16 00:44:40 2017 -0400
@@ -18,18 +18,18 @@
 
 musicmessaging_la_LIBADD = @PIDGIN_LIBS@ $(DBUS_LIBS)
 
-CLEANFILES              = music-messaging-bindings.c
+CLEANFILES              = music-messaging-bindings.ch
 
 .PHONY: always
 
 $(top_builddir)/libpurple/dbus-types.h: always
 	$(AM_V_GEN)cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
-music-messaging-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(musicmessaging_la_SOURCES)
+music-messaging-bindings.ch: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(musicmessaging_la_SOURCES)
 	$(AM_V_GEN)cat $(srcdir)/$(musicmessaging_la_SOURCES) | \
 	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
-$(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.c $(top_builddir)/libpurple/dbus-types.h
+$(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.ch $(top_builddir)/libpurple/dbus-types.h
 
 endif
 endif
--- a/pidgin/plugins/musicmessaging/meson.build	Fri Jun 16 00:19:05 2017 -0400
+++ b/pidgin/plugins/musicmessaging/meson.build	Fri Jun 16 00:44:40 2017 -0400
@@ -5,9 +5,9 @@
 	music_messaging_bindings = custom_target('music_messaging_bindings.c',
 	    command : [python, dbus_analyze_functions, '--export-only', '-o', '@OUTPUT@', '@INPUT@'],
 	    input : 'musicmessaging.c',
-	    output : 'music-messaging-bindings.c')
+	    output : 'music-messaging-bindings.ch')
 
-	musicmessaging = library('musicmessaging', 'musicmessaging.c',
+	musicmessaging = library('musicmessaging', 'musicmessaging.c', music_messaging_bindings,
 	    dependencies : [dbus, libpurple_dep, libpidgin_dep, glib],
 	    name_prefix : '',
 	    install : true, install_dir : PIDGIN_PLUGINDIR)
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Fri Jun 16 00:19:05 2017 -0400
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Fri Jun 16 00:44:40 2017 -0400
@@ -103,7 +103,7 @@
 /* This file has been generated by the #dbus-analize-functions.py
    script.  It contains dbus wrappers for the four functions declared
    above. */
-#include "music-messaging-bindings.c"
+#include "music-messaging-bindings.ch"
 
 /* Exported functions */
 DBUS_EXPORT void

Mercurial Repository: pidgin3

mercurial