build: Fix custom_target meson warning

WARNING: custom_target 'utils_marshal' has more than one output! Using the first one.
This commit is contained in:
Bastien Nocera
2020-08-17 15:36:34 +02:00
parent ff06a301f0
commit 812a3552a6
3 changed files with 4 additions and 14 deletions

View File

@ -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

View File

@ -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,

View File

@ -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;