From 812a3552a6652a353fabc70c95aec7bf2325b487 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 17 Aug 2020 15:36:34 +0200
Subject: [PATCH] build: Fix custom_target meson warning

WARNING: custom_target 'utils_marshal' has more than one output! Using the first one.
---
 utils/enroll.c    |  2 +-
 utils/meson.build | 14 ++------------
 utils/verify.c    |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/utils/enroll.c b/utils/enroll.c
index 85b23dc..4dd3359 100644
--- a/utils/enroll.c
+++ b/utils/enroll.c
@@ -24,7 +24,7 @@
 #include <dbus/dbus-glib-bindings.h>
 #include "manager-dbus-glue.h"
 #include "device-dbus-glue.h"
-#include "marshal.h"
+#include "fprintd-marshal.h"
 
 #define N_(x) x
 #define TR(x) x
diff --git a/utils/meson.build b/utils/meson.build
index bbdc234..63c7420 100644
--- a/utils/meson.build
+++ b/utils/meson.build
@@ -16,16 +16,6 @@ foreach interface_name: dbus_interfaces
         ])
 endforeach
 
-utils_marshal = custom_target('utils_marshal',
-    depends: fprintd_marshal,
-    input: fprintd_marshal,
-    output: ['marshal.c', 'marshal.h'],
-    command: [bash, '-c',
-        'cp @INPUT0@ @OUTPUT0@;' +
-        'cp @INPUT1@ @OUTPUT1@;' +
-        'sed s/fprintd-//g -i ' + meson.current_build_dir() / 'marshal*.{h,c}']
-)
-
 libfprintd_utils_dep = declare_dependency(
     include_directories: [
         include_directories('../pam'),
@@ -35,13 +25,13 @@ libfprintd_utils_dep = declare_dependency(
         dbus_glib_dep,
     ],
     sources: [
-        utils_marshal,
+        fprintd_marshal,
         dbus_client_glue_sources,
     ],
     link_with: static_library('fprintd_utils',
         sources: [
             dbus_client_glue_sources,
-            utils_marshal,
+            fprintd_marshal,
         ],
         dependencies: [
             glib_dep,
diff --git a/utils/verify.c b/utils/verify.c
index 6a5ec26..2989a49 100644
--- a/utils/verify.c
+++ b/utils/verify.c
@@ -24,7 +24,7 @@
 #include <dbus/dbus-glib-bindings.h>
 #include "manager-dbus-glue.h"
 #include "device-dbus-glue.h"
-#include "marshal.h"
+#include "fprintd-marshal.h"
 
 static DBusGProxy *manager = NULL;
 static DBusGConnection *connection = NULL;