[dia: 87/105] #19: Add config.h to all dependencies since it is a generated file.

[Zander <zbrown src gnome org>]

commit 69d9db2eb2296f9f93ea0057e00c3bd203c5f9e3
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Tue Jan 22 23:19:44 2019 +0000

    #19: Add config.h to all dependencies since it is a generated file.
    
      - (Note: This is as per the documentation for vcs_tag)

 app/meson.build             | 2 +-
 lib/meson.build             | 2 +-
 meson.build                 | 2 +-
 objects/meson.build         | 2 +-
 plug-ins/drs/meson.build    | 2 +-
 plug-ins/layout/meson.build | 2 +-
 plug-ins/meson.build        | 2 +-
 plug-ins/python/meson.build | 2 +-
 plug-ins/stress/meson.build | 2 +-
 tests/meson.build           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 4c5486d1..7f5d5ec4 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -75,7 +75,7 @@ endif
 diaapp_inc = include_directories('.')
 
 diaapp = executable('dia',
-    dia_sources + [dia_app_icons_h, diamarshal_h],
+    dia_sources + [dia_app_icons_h, diamarshal_h, config_h],
     dependencies: [libgtk_dep, libxml_dep, libm_dep],
     link_with: [libdia],
     link_args: dia_link_args,
diff --git a/lib/meson.build b/lib/meson.build
index 4a5b4eb7..652c6058 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -121,7 +121,7 @@ libdia_deps = [
 libdia_inc = include_directories('.')
 
 libdia = library('dia',
-    libdia_sources + [diamarshal, dia_lib_icons_h],
+    libdia_sources + [diamarshal, dia_lib_icons_h, config_h],
     dependencies: libdia_deps,
     include_directories: configuration_inc,
     c_args: ['-Wall'],
diff --git a/meson.build b/meson.build
index 0055434e..f447791a 100644
--- a/meson.build
+++ b/meson.build
@@ -68,7 +68,7 @@ endforeach
 
 configuration_inc = include_directories('.')
 config_h_in = configure_file(output: 'config.h.in', configuration: conf)
-vcs_tag(input: config_h_in, output: 'config.h')
+config_h = vcs_tag(input: config_h_in, output: 'config.h')
 
 # TODO: I don't think this should be defined.
 # To fix we should remove #ifdef HAVE_CONFIG_H checks from all source files.
diff --git a/objects/meson.build b/objects/meson.build
index c164dbd7..9a739a03 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -21,7 +21,7 @@ subdir('UML')
 
 foreach o : dia_object_desc
     library(o[0],
-        o[1],
+        o[1] + [config_h],
         dependencies: [libc_dep, libgtk_dep, libxml_dep, libm_dep] + o[2],
         link_with: libdia,
         include_directories: [configuration_inc, libdia_inc],
diff --git a/plug-ins/drs/meson.build b/plug-ins/drs/meson.build
index 585e9a69..ee9cc830 100644
--- a/plug-ins/drs/meson.build
+++ b/plug-ins/drs/meson.build
@@ -8,7 +8,7 @@ sources = files(
 # Prevent installation - currently a debug tool only
 shared_library(
     'drs_filter',
-    sources,
+    sources + [config_h],
     dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep],
     include_directories: [libdia_inc, configuration_inc],
     link_with: [libdia],
diff --git a/plug-ins/layout/meson.build b/plug-ins/layout/meson.build
index d39809da..a41ebbf8 100644
--- a/plug-ins/layout/meson.build
+++ b/plug-ins/layout/meson.build
@@ -15,7 +15,7 @@ endif
 # on symbols found in the dia *app* (which will be linked at run-time).
 shared_module(
     'layout_filter',
-    sources,
+    sources + [config_h],
     dependencies: deps,
     include_directories: [libdia_inc, configuration_inc, diaapp_inc],
     link_with: [libdia, diaapp],
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index a37168b8..1a6ad98c 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -38,7 +38,7 @@ foreach p : install_plugins_desc
     message(p[0])
     library(
         p[0],
-        p[1],
+        p[1] + [config_h],
         dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + [p[2]],
         include_directories: [libdia_inc, configuration_inc],
         link_with: [libdia],
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index 6b970b50..52418d86 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -48,7 +48,7 @@ if py_dep.found()
     # Same as layout plugin.
     shared_module(
         'python_plugin',
-        sources,
+        sources + [config_h],
         dependencies: [libc_dep, libxml_dep, libgtk_dep, py_dep],
         include_directories: [libdia_inc, configuration_inc, diaapp_inc],
         link_with: [libdia, diaapp],
diff --git a/plug-ins/stress/meson.build b/plug-ins/stress/meson.build
index 568565ff..d3c89564 100644
--- a/plug-ins/stress/meson.build
+++ b/plug-ins/stress/meson.build
@@ -10,7 +10,7 @@ sources = files(
 if host_machine.system() != 'windows'
     library(
         'stress_filter',
-        sources,
+        sources + [config_h],
         dependencies: [libc_dep, libgtk_dep, libm_dep],
         include_directories: [libdia_inc, configuration_inc],
         link_with: [libdia],
diff --git a/tests/meson.build b/tests/meson.build
index d7320392..c4524484 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -24,7 +24,7 @@ foreach t : ['boundingbox', 'objects', 'svg', 'sizeof']
     test_exes += [
         executable(
             'test-' + t,
-            'test-' + t + '.c',
+            ['test-' + t + '.c', config_h],
             dependencies: [libgtk_dep, libxml_dep, libm_dep],
             link_with: [libdia],
             link_args: dia_link_args,