[glib: 1/2] gdbus-peer: Make sure to not include objectmanager-gen.c source



commit 7c70bef8b62cfdd021f820c6b8ca6113e0481d0e
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Thu Oct 25 07:34:23 2018 -0400

    gdbus-peer: Make sure to not include objectmanager-gen.c source
    
    The executable depends only on the generated header file at compile
    time, and on the library at link time. So meson can decide to compile
    gdbus-peer.c before compiling the library and thus won't have generated
    the header yet, causing the build error.
    
    So declare_dependency() should only have the header file in its sources,
    to force generating files before compiling gdbus-peer.c without
    including objectmanager-gen.c into gdbus-peer's sources.

 gio/tests/gdbus-object-manager-example/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gio/tests/gdbus-object-manager-example/meson.build 
b/gio/tests/gdbus-object-manager-example/meson.build
index 308258545..404c37788 100644
--- a/gio/tests/gdbus-object-manager-example/meson.build
+++ b/gio/tests/gdbus-object-manager-example/meson.build
@@ -22,5 +22,5 @@ libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
     install_dir : installed_tests_execdir)
 
 libgdbus_example_objectmanager_dep = declare_dependency(
-  sources : gdbus_example_objectmanager_generated,
+  sources : gdbus_example_objectmanager_generated[0],
   link_with : libgdbus_example_objectmanager)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]