From 2dafa2f1d3c86ed36ee727994022f61eb8c697d0 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 28 Mar 2017 10:08:56 +0100 Subject: [PATCH] Move epoxy_headers definition into include/epoxy In order to properly depend on headers, both generated and provided, in a separate directory, we need to refer to them using their path. Generated headers already have their full path; for provided ones, we can simply use the `files()` directive. This change should allow using libepoxy as a Meson subproject. Fixes: #115 --- include/epoxy/meson.build | 2 ++ src/meson.build | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/epoxy/meson.build b/include/epoxy/meson.build index 12ae719..65f83be 100644 --- a/include/epoxy/meson.build +++ b/include/epoxy/meson.build @@ -39,4 +39,6 @@ foreach g: generated_headers headers += [ header ] endforeach +epoxy_headers = files(headers) + gen_headers + install_headers(headers, subdir: 'epoxy') diff --git a/src/meson.build b/src/meson.build index ce6fe45..6f44220 100644 --- a/src/meson.build +++ b/src/meson.build @@ -46,10 +46,6 @@ foreach g: generated_sources endforeach epoxy_sources = sources + gen_sources -epoxy_headers = gen_headers -foreach h: headers - epoxy_headers += join_paths(meson.source_root(), 'include/epoxy/@0@'.format(h)) -endforeach common_ldflags = []