[dia: 72/105] #19: Get rid of unused rundeps in */meson.build.



commit 0b2efd2be5fc021bf8ec14b1c699482fea5424e3
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Thu Jan 10 20:47:19 2019 +0000

    #19: Get rid of unused rundeps in */meson.build.

 app/meson.build             | 2 --
 meson.build                 | 3 ---
 objects/meson.build         | 2 +-
 plug-ins/drs/meson.build    | 3 +--
 plug-ins/layout/meson.build | 2 +-
 plug-ins/meson.build        | 2 +-
 plug-ins/python/meson.build | 2 +-
 plug-ins/stress/meson.build | 3 +--
 plug-ins/wmf/meson.build    | 2 +-
 9 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 2b2ccb1d..2e2b50a6 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -85,5 +85,3 @@ diaapp = executable('dia',
     install : true,
     install_rpath : dialibdir
 )
-
-rundeps += diaapp
diff --git a/meson.build b/meson.build
index 4f02ffc3..d16f7291 100644
--- a/meson.build
+++ b/meson.build
@@ -73,9 +73,6 @@ configure_file(output : 'config.h',
 # To fix we should remove #ifdef HAVE_CONFIG_H checks from all source files.
 add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
 
-# Keep track of everything that is needed for running dia
-rundeps = []
-
 subdir('po')
 subdir('lib')
 subdir('objects')
diff --git a/objects/meson.build b/objects/meson.build
index 30ee2d24..485872c6 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -20,7 +20,7 @@ subdir('standard')
 subdir('UML')
 
 foreach o : dia_object_desc
-    rundeps += library(o[0],
+    library(o[0],
         o[1],
         dependencies : [libc_dep, libgtk_dep, libxml_dep, libm_dep] + o[2],
         link_with : libdia,
diff --git a/plug-ins/drs/meson.build b/plug-ins/drs/meson.build
index 08c8ee28..585e9a69 100644
--- a/plug-ins/drs/meson.build
+++ b/plug-ins/drs/meson.build
@@ -6,12 +6,11 @@ sources = files(
 )
 
 # Prevent installation - currently a debug tool only
-rundeps += shared_library(
+shared_library(
     'drs_filter',
     sources,
     dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep],
     include_directories: [libdia_inc, configuration_inc],
     link_with: [libdia],
     install: false,
-    install_dir: dialibdir
 )
diff --git a/plug-ins/layout/meson.build b/plug-ins/layout/meson.build
index 53ded378..81cec58a 100644
--- a/plug-ins/layout/meson.build
+++ b/plug-ins/layout/meson.build
@@ -13,7 +13,7 @@ endif
 
 # Need to define it as shared module since it depends
 # on symbols found in the dia *app* (which will be linked at run-time).
-rundeps += shared_module(
+shared_module(
     'layout_filter',
     sources,
     dependencies: deps,
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index ab23f882..448b575c 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -41,7 +41,7 @@ subdir('xslt')
 
 foreach p : install_plugins_desc
     message(p[0])
-    rundeps += library(
+    library(
         p[0],
         p[1],
         dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + [p[2]],
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index f1dc2120..e2dc0fa3 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -45,7 +45,7 @@ python_scripts = [
 
 if py_dep.found()
     # Same as layout plugin.
-    rundeps += shared_module(
+    shared_module(
         'python_plugin',
         sources,
         dependencies: [libc_dep, libxml_dep, libgtk_dep, py_dep],
diff --git a/plug-ins/stress/meson.build b/plug-ins/stress/meson.build
index 08876289..568565ff 100644
--- a/plug-ins/stress/meson.build
+++ b/plug-ins/stress/meson.build
@@ -8,13 +8,12 @@ sources = files(
 
 # TODO: test this on Windows.
 if host_machine.system() != 'windows'
-    rundeps += library(
+    library(
         'stress_filter',
         sources,
         dependencies: [libc_dep, libgtk_dep, libm_dep],
         include_directories: [libdia_inc, configuration_inc],
         link_with: [libdia],
         install: false,
-        install_dir: dialibdir
     )
 endif
diff --git a/plug-ins/wmf/meson.build b/plug-ins/wmf/meson.build
index 4c541941..fa0e1a0d 100644
--- a/plug-ins/wmf/meson.build
+++ b/plug-ins/wmf/meson.build
@@ -12,7 +12,7 @@ if host_machine.system() == 'windows'
     deps += [cc.find_library('comdlg32')]
 endif
 
-rundeps += library(
+library(
     'wmf_filter',
     sources,
     dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + deps,


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