[cantarell-fonts] Minor reorganization of build source includes

[Nikolaus Waxweiler <nwaxweiler src gnome org>]

commit 5fc291669dd1b33d5251d9806985f64a533e5e76
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Tue Feb 13 19:07:42 2018 +0000

    Minor reorganization of build source includes
    
    The `useprebuilt` variable now controls the inclusion of subdirs. This
    simplifies the build logic a bit.
    
    Patch based on patch by Jeremy Bicha.

 meson.build          |    5 +++--
 prebuilt/meson.build |   12 +++++-------
 src/meson.build      |   28 +++++++++++++---------------
 3 files changed, 21 insertions(+), 24 deletions(-)
---
diff --git a/meson.build b/meson.build
index d170b2c..45c5305 100644
--- a/meson.build
+++ b/meson.build
@@ -14,8 +14,9 @@ if useprebuilt == false
   fontmake = find_program('fontmake')
   fontmake_wrapper = join_paths(meson.current_source_dir(), 'scripts', 'fm.py')
   psautohint = find_program('psautohint')
+  subdir('src')
+else
+  subdir('prebuilt')
 endif
 
-subdir('src')
-subdir('prebuilt')
 subdir('appstream')
diff --git a/prebuilt/meson.build b/prebuilt/meson.build
index 6601711..3b5f29e 100644
--- a/prebuilt/meson.build
+++ b/prebuilt/meson.build
@@ -1,7 +1,5 @@
-if useprebuilt == true
-  install_data('Cantarell-Thin.otf', install_dir : fontsdir)
-  install_data('Cantarell-Light.otf', install_dir : fontsdir)
-  install_data('Cantarell-Regular.otf', install_dir : fontsdir)
-  install_data('Cantarell-Bold.otf', install_dir : fontsdir)
-  install_data('Cantarell-ExtraBold.otf', install_dir : fontsdir)
-endif
+install_data('Cantarell-Thin.otf', install_dir : fontsdir)
+install_data('Cantarell-Light.otf', install_dir : fontsdir)
+install_data('Cantarell-Regular.otf', install_dir : fontsdir)
+install_data('Cantarell-Bold.otf', install_dir : fontsdir)
+install_data('Cantarell-ExtraBold.otf', install_dir : fontsdir)
diff --git a/src/meson.build b/src/meson.build
index 64662bb..68194ee 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,15 +1,13 @@
-if useprebuilt == false
-  custom_target('cantarell-fonts',
-                input : 'Cantarell.glyphs',
-                output : [
-                  'Cantarell-Thin.otf',
-                  'Cantarell-Light.otf',
-                  'Cantarell-Regular.otf',
-                  'Cantarell-Bold.otf',
-                  'Cantarell-ExtraBold.otf'
-                ],
-                command : [python3, fontmake_wrapper, fontmake, psautohint,
-                           '@INPUT@', '@OUTDIR@'],
-                install: true,
-                install_dir : fontsdir)
-endif
+custom_target('cantarell-fonts',
+              input : 'Cantarell.glyphs',
+              output : [
+                'Cantarell-Thin.otf',
+                'Cantarell-Light.otf',
+                'Cantarell-Regular.otf',
+                'Cantarell-Bold.otf',
+                'Cantarell-ExtraBold.otf'
+              ],
+              command : [python3, fontmake_wrapper, fontmake, psautohint,
+                         '@INPUT@', '@OUTDIR@'],
+              install: true,
+              install_dir : fontsdir)