[pango/wip/one-library] fixup! Build a single library
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/wip/one-library] fixup! Build a single library
- Date: Tue, 9 Jul 2019 22:52:42 +0000 (UTC)
commit a030bdf67986ce90c7999d773f4077928442ad68
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jul 9 18:36:14 2019 -0400
fixup! Build a single library
Keep Xft separate. It is just dead cruft.
pango/meson.build | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index 1b9b9d3c..be651aec 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -140,24 +140,6 @@ if cairo_dep.found()
pango_sources += pangocairo_sources
endif
-# Xft
-if xft_dep.found() and fontconfig_dep.found()
- pangoxft_headers = [
- 'pangoxft.h',
- 'pangoxft-render.h',
- ]
-
- pangoxft_sources = [
- 'pangoxft-font.c',
- 'pangoxft-fontmap.c',
- 'pangoxft-render.c',
- ]
-
- install_headers(pangoxft_headers, subdir: pango_api_path)
-
- pango_sources += pangoxft_sources
-endif
-
# Features header
pango_features_conf = configuration_data()
pango_features_conf.set('PANGO_VERSION_MAJOR', pango_major_version)
@@ -325,9 +307,22 @@ endif
# Xft
if xft_dep.found() and fontconfig_dep.found()
+ pangoxft_headers = [
+ 'pangoxft.h',
+ 'pangoxft-render.h',
+ ]
+
+ pangoxft_sources = [
+ 'pangoxft-font.c',
+ 'pangoxft-fontmap.c',
+ 'pangoxft-render.c',
+ ]
+
+ install_headers(pangoxft_headers, subdir: pango_api_path)
+
libpangoxft = library(
'pangoxft-@0@'.format(pango_api_version),
- sources: [],
+ sources: pangoxft_sources,
version: pango_libversion,
soversion: pango_soversion,
darwin_versions : pango_osxversion,
@@ -344,7 +339,7 @@ if xft_dep.found() and fontconfig_dep.found()
if build_gir
pangoxft_gir = gnome.generate_gir(
libpangoxft,
- sources: [],
+ sources: pangoxft_headers+ pangoxft_sources,
dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
namespace: 'PangoXft',
nsversion: pango_api_version,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]