[gedit] build: simplify building the main executable



commit aefff849adbd98ebd3ba30c5ef1e072b4b67414b
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri May 8 23:04:11 2020 +0200

    build: simplify building the main executable

 gedit/meson.build | 22 +++++-----------------
 meson.build       |  1 -
 2 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index cf18c307a..d9546f35e 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -248,29 +248,17 @@ custom_target(
   install_dir: get_option('datadir') / 'glib-2.0/schemas'
 )
 
-gedit_sources = [
-  'gedit.c',
-]
-
 gedit_c_args = []
-
 if host_machine.system() == 'darwin'
-  gedit_c_args += [
-    '-DOS_OSX=1',
-  ]
+  gedit_c_args += '-DOS_OSX=1'
 endif
 
-gedit_deps = [
-  libgedit_dep,
-]
-
 gedit_exe = executable(
-  meson.project_name(),
-  gedit_sources,
-  dependencies: gedit_deps,
+  'gedit',
+  'gedit.c',
+  dependencies: libgedit_dep,
   c_args: gedit_c_args,
   install: true,
-  install_dir: bindir,
-  install_rpath: pkglibdir,
+  install_rpath: get_option('prefix') / get_option('libdir') / 'gedit',
   gui_app: true,
 )
diff --git a/meson.build b/meson.build
index 6604638d9..b9eb65483 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,6 @@ root_include_dir = include_directories('.')
 
 srcdir = meson.current_source_dir()
 
-bindir = get_option('prefix') / get_option('bindir')
 pkglibdir = get_option('prefix') / get_option('libdir') / 'gedit'
 pkgdatadir = get_option('prefix') / get_option('datadir') / 'gedit'
 glibdir = get_option('prefix') / get_option('datadir') / 'glib-2.0'


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