From 8ff166a8e0f6dbbdd82579aa6b1594a8976d2bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Sat, 27 Jan 2018 08:50:05 +0100 Subject: build: Do not use headers on library building Headers are not necessary to be passed to the library compilation function because the compiler will find them. On the other hand they are necessary for the proper GIR generation. This patch splits headers and sources, uses only sources for the library building and uses both for GIR generation. It also allows getting both separately. https://bugzilla.gnome.org/show_bug.cgi?id=792948 --- meson.build | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index e7f2f45..2649a1f 100644 --- a/meson.build +++ b/meson.build @@ -18,27 +18,30 @@ cdata.set_quoted('PACKAGE_VERSION', get_option('package_version')) libgvc_inc = include_directories('.') -libgvc_gir_sources = [ +libgvc_gir_headers = [ + 'gvc-channel-map.h', 'gvc-mixer-card.h', - 'gvc-mixer-card.c', + 'gvc-mixer-control.h', + 'gvc-mixer-event-role.h', + 'gvc-mixer-sink.h', + 'gvc-mixer-sink-input.h', + 'gvc-mixer-source.h', + 'gvc-mixer-source-output.h', 'gvc-mixer-stream.h', - 'gvc-mixer-stream.c', - 'gvc-channel-map.h', + 'gvc-mixer-ui-device.h' +] + +libgvc_gir_sources = [ 'gvc-channel-map.c', - 'gvc-mixer-ui-device.h', - 'gvc-mixer-ui-device.c', - 'gvc-mixer-sink.h', + 'gvc-mixer-card.c', + 'gvc-mixer-control.c', + 'gvc-mixer-event-role.c', 'gvc-mixer-sink.c', - 'gvc-mixer-source.h', - 'gvc-mixer-source.c', - 'gvc-mixer-sink-input.h', 'gvc-mixer-sink-input.c', - 'gvc-mixer-source-output.h', + 'gvc-mixer-source.c', 'gvc-mixer-source-output.c', - 'gvc-mixer-event-role.h', - 'gvc-mixer-event-role.c', - 'gvc-mixer-control.h', - 'gvc-mixer-control.c' + 'gvc-mixer-stream.c', + 'gvc-mixer-ui-device.c' ] libgvc_no_gir_sources = [ @@ -110,7 +113,7 @@ if enable_introspection endif libgvc_gir = gnome.generate_gir(libgvc, - sources: libgvc_gir_sources, + sources: libgvc_gir_sources + libgvc_gir_headers, nsversion: '1.0', namespace: 'Gvc', includes: ['Gio-2.0', 'GObject-2.0'], -- cgit v1.2.1