depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

meson: Define enum dependency and ensure we generate them before using

Browse source 
Avoid setting the headers as sources everywhere, but instead use a dependency
to manage the headers creation in time
This commit is contained in:
Marco Trevisan (Treviño) 2019-12-17 07:02:16 +01:00
parent 0566f82219
commit dbb26c5ade
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libfprint/meson.build
View file

@ -184,6 +184,10 @@ fpi_enums = gnome.mkenums_simple('fpi-enums',
install_header : false) install_header : false)
fpi_enums_h = fpi_enums[1] fpi_enums_h = fpi_enums[1]
enums_dep = declare_dependency(
sources: [ fp_enums_h, fpi_enums_h ]
)
drivers_sources += configure_file(input: 'empty_file', drivers_sources += configure_file(input: 'empty_file',
output: 'fpi-drivers.c', output: 'fpi-drivers.c',
capture: true, capture: true,
@ -193,6 +197,7 @@ drivers_sources += configure_file(input: 'empty_file',
]) ])
deps = [ deps = [
enums_dep,
gio_dep, gio_dep,
glib_dep, glib_dep,
gusb_dep, gusb_dep,
@ -218,13 +223,16 @@ libnbis = static_library('nbis',
install: false) install: false)
libfprint_private = static_library('fprint-private', libfprint_private = static_library('fprint-private',
sources: libfprint_private_sources + fpi_enums + [ fp_enums_h ], sources: [
fpi_enums,
libfprint_private_sources,
],
dependencies: deps, dependencies: deps,
link_with: libnbis, link_with: libnbis,
install: false) install: false)
libfprint_drivers = static_library('fprint-drivers', libfprint_drivers = static_library('fprint-drivers',
sources: drivers_sources + [ fp_enums_h ], sources: drivers_sources,
c_args: drivers_cflags, c_args: drivers_cflags,
dependencies: deps, dependencies: deps,
link_with: libfprint_private, link_with: libfprint_private,
@ -234,7 +242,11 @@ mapfile = files('libfprint.ver')
vflag = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0]) vflag = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0])
libfprint = library('fprint', libfprint = library('fprint',
sources: libfprint_sources + fp_enums + other_sources, sources: [
fp_enums,
libfprint_sources,
other_sources,
],
soversion: soversion, soversion: soversion,
version: libversion, version: libversion,
link_args : vflag, link_args : vflag,
@ -244,9 +256,9 @@ libfprint = library('fprint',
install: true) install: true)
libfprint_dep = declare_dependency(link_with: libfprint, libfprint_dep = declare_dependency(link_with: libfprint,
sources: [ fp_enums_h ],
include_directories: root_inc, include_directories: root_inc,
dependencies: [ dependencies: [
enums_dep,
gio_dep, gio_dep,
glib_dep, glib_dep,
gusb_dep, gusb_dep,