[gedit/zbrown/deteplification-src: 338/633] build: small refactoring




commit 7b3d07b6f9bae543a612bbdb08fed8a7828e809e
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri May 8 20:41:27 2020 +0200

    build: small refactoring

 gedit/meson.build | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index e5cb3fe9b..0cbd7bf25 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -171,23 +171,19 @@ libgedit_private_headers += 'gedit-enum-types-private.h'
 
 subdir('resources')
 
-libgedit_sources = [
-  libgedit_public_sources,
-  libgedit_private_sources,
-  libgedit_public_enum_types[0],
-  libgedit_private_enum_types[0],
-  libgedit_gresources[0],
-]
-
 libgedit_shared_lib = shared_library(
   'gedit-@0@'.format(api_version),
-  libgedit_sources + [libgedit_public_enum_types[1], libgedit_private_enum_types[1], libgedit_gresources[1]],
+  [libgedit_public_sources,
+   libgedit_private_sources,
+   libgedit_public_enum_types,
+   libgedit_private_enum_types,
+   libgedit_gresources],
   include_directories: root_include_dir,
   dependencies: libgedit_deps,
   c_args: libgedit_c_args,
   link_args: libgedit_link_args,
   install: true,
-  install_dir: pkglibdir,
+  install_dir: get_option('libdir') / 'gedit',
 )
 
 # GObject Introspection
@@ -200,6 +196,14 @@ libgedit_gir_includes = [
   'GtkSource-4',
 ]
 
+libgedit_sources = [
+  libgedit_public_sources,
+  libgedit_private_sources,
+  libgedit_public_enum_types[0],
+  libgedit_private_enum_types[0],
+  libgedit_gresources[0],
+]
+
 libgedit_gir = gnome.generate_gir(
   libgedit_shared_lib,
   sources: libgedit_sources + libgedit_public_headers,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]