cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix custom_target meson warning

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/enroll.c
View File

@ -24,7 +24,7 @@
#include <dbus/dbus-glib-bindings.h> #include <dbus/dbus-glib-bindings.h>
#include "manager-dbus-glue.h" #include "manager-dbus-glue.h"
#include "device-dbus-glue.h" #include "device-dbus-glue.h"
#include "marshal.h" #include "fprintd-marshal.h"
#define N_(x) x #define N_(x) x
#define TR(x) x #define TR(x) x

14
utils/meson.build
View File

@ -16,16 +16,6 @@ foreach interface_name: dbus_interfaces
]) ])
endforeach 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( libfprintd_utils_dep = declare_dependency(
include_directories: [ include_directories: [
include_directories('../pam'), include_directories('../pam'),
@ -35,13 +25,13 @@ libfprintd_utils_dep = declare_dependency(
dbus_glib_dep, dbus_glib_dep,
], ],
sources: [ sources: [
utils_marshal, fprintd_marshal,
dbus_client_glue_sources, dbus_client_glue_sources,
], ],
link_with: static_library('fprintd_utils', link_with: static_library('fprintd_utils',
sources: [ sources: [
dbus_client_glue_sources, dbus_client_glue_sources,
utils_marshal, fprintd_marshal,
], ],
dependencies: [ dependencies: [
glib_dep, glib_dep,

2
utils/verify.c
View File

@ -24,7 +24,7 @@
#include <dbus/dbus-glib-bindings.h> #include <dbus/dbus-glib-bindings.h>
#include "manager-dbus-glue.h" #include "manager-dbus-glue.h"
#include "device-dbus-glue.h" #include "device-dbus-glue.h"
#include "marshal.h" #include "fprintd-marshal.h"
static DBusGProxy *manager = NULL; static DBusGProxy *manager = NULL;
static DBusGConnection *connection = NULL; static DBusGConnection *connection = NULL;