From 7f2e32585d882a31125510313d1909624cf7aa42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 18 May 2018 17:15:27 +0200
Subject: [PATCH] meson: use gnome.gdbus_codegen

---
 libgdbofono/gen.sh      | 18 -----------------
 libgdbofono/meson.build | 43 ++++++++++++-----------------------------
 2 files changed, 12 insertions(+), 49 deletions(-)
 delete mode 100755 libgdbofono/gen.sh

diff --git a/libgdbofono/gen.sh b/libgdbofono/gen.sh
deleted file mode 100755
index 92b4d5d..0000000
--- a/libgdbofono/gen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-#set -x
-#echo "$@"
-
-INPUT="$1"
-OUTPUT0="$2"
-
-BASENAME="$( basename "$INPUT" .xml )"
-WD="$PWD"
-DIR="$( dirname "$OUTPUT0" )"
-
-cd "$DIR"
-gdbus-codegen \
-    --generate-c-code "gdbo-${BASENAME}" \
-    --c-namespace GDBO \
-    --interface-prefix org.ofono. \
-    "${WD}/${INPUT}"
diff --git a/libgdbofono/meson.build b/libgdbofono/meson.build
index 796e7b4..a0a3865 100644
--- a/libgdbofono/meson.build
+++ b/libgdbofono/meson.build
@@ -1,38 +1,19 @@
-gdbus_codegen = find_program('gdbus-codegen')
+gnome = import('gnome')
+dbus_interfaces = ['manager', 'modem', 'call']
 
-gen_sh = find_program('gen.sh')
-
-gdbofono_gen = generator(gen_sh,
-                         output  : [ 'gdbo-@BASENAME@.c',
-                                     'gdbo-@BASENAME@.h' ],
-                         arguments : [ '@INPUT@', '@OUTPUT0@' ])
-
-#manager_src = gdbus_ofono_gen.process('manager.xml')
-#modem_src = gdbus_ofono_gen.process('modem.xml')
-#call_src = gdbus_ofono_gen.process('call.xml')
-
-manager_src = custom_target('manager',
-                            input : 'manager.xml',
-                            output : [ 'gdbo-manager.h',
-                                       'gdbo-manager.c' ],
-                            command : [gen_sh, '@INPUT@', '@OUTPUT0@'])
-
-modem_src = custom_target('modem',
-                          input : 'modem.xml',
-                          output : [ 'gdbo-modem.h',
-                                     'gdbo-modem.c' ],
-                          command : [gen_sh, '@INPUT@', '@OUTPUT0@'])
-
-call_src = custom_target('call',
-                         input : 'call.xml',
-                         output : [ 'gdbo-call.h',
-                                    'gdbo-call.c' ],
-                         command : [gen_sh, '@INPUT@', '@OUTPUT0@'])
+gdbus_src = []
+foreach iface: dbus_interfaces
+  gdbus_src += gnome.gdbus_codegen('gdbo-' + iface,
+                                   iface + '.xml',
+                                   interface_prefix: 'org.ofono.',
+                                   namespace: 'GDBO')
+endforeach
 
 deps = [ dependency('gio-2.0'),
          dependency('gio-unix-2.0'),
        ]
 
 gdbofono_lib = shared_library('gdbofono',
-                              manager_src, modem_src, call_src,
-                              dependencies : deps )
+                               gdbus_src,
+                               include_directories : include_directories('..'),
+                               dependencies : deps )