[balsa/wip/gmime3: 89/197] Do not include internal dependencies

[Peter Bloomfield <peterb src gnome org>]

commit 74c7fda0a6ebab355a2e64a5db770a9013685069
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Sep 20 11:18:02 2017 -0400

    Do not include internal dependencies
    
    Do not include internal dependencies in declare_dependency()
    
        * libbalsa/imap/meson.build:
        * libbalsa/meson.build:
        * libinit_balsa/meson.build:
        * libnetclient/meson.build:
        * libnetclient/test/meson.build:
        * src/meson.build:

 ChangeLog                     |   11 +++++++++++
 libbalsa/imap/meson.build     |    8 ++++----
 libbalsa/meson.build          |    7 +++----
 libinit_balsa/meson.build     |    5 ++---
 libnetclient/meson.build      |    6 +++---
 libnetclient/test/meson.build |   11 +++++------
 src/meson.build               |   14 ++++++--------
 7 files changed, 34 insertions(+), 28 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7a367f2..dcd8e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-09-20  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Do not include internal dependencies in declare_dependency()
+
+       * libbalsa/imap/meson.build:
+       * libbalsa/meson.build:
+       * libinit_balsa/meson.build:
+       * libnetclient/meson.build:
+       * libnetclient/test/meson.build:
+       * src/meson.build:
+
 2017-09-19  Peter Bloomfield  <pbloomfield bellsouth net>
 
        * meson.build: adapt the meson build to reflect the GNOME option
diff --git a/libbalsa/imap/meson.build b/libbalsa/imap/meson.build
index 4eba35a..88eb9fb 100644
--- a/libbalsa/imap/meson.build
+++ b/libbalsa/imap/meson.build
@@ -29,8 +29,7 @@ libimap_compile_args = ['-I' + meson.build_root(),
                         '-I' + join_paths(meson.source_root(), 'libnetclient'),
                         '-I' + join_paths(meson.source_root(), 'libbalsa', 'imap'),
                         '-ansi']
-libimap_deps = declare_dependency(compile_args : libimap_compile_args,
-                                  dependencies : balsa_deps)
+libimap_compile_dep  = declare_dependency(compile_args : libimap_compile_args)
 
 # genmarshal
 #
@@ -64,11 +63,12 @@ libimap_marshal_c = custom_target('libimap_marshal_c',
 
 libimap_a = static_library('imap', libimap_a_sources,
                            libimap_marshal_c, libimap_marshal_h,
-                           dependencies : libimap_deps,
+                           dependencies : balsa_deps + [libimap_compile_dep],
                            install      : false)
 
 imap_tst_sources = 'imap_tst.c'
 
 imap_tst = executable('imap_tst', imap_tst_sources,
                       link_with    : [libimap_a, libnetclient_a],
-                     dependencies : balsa_deps)
+                      dependencies : balsa_deps,
+                      install      : false)
diff --git a/libbalsa/meson.build b/libbalsa/meson.build
index ac87318..6026838 100644
--- a/libbalsa/meson.build
+++ b/libbalsa/meson.build
@@ -140,8 +140,7 @@ libbalsa_compile_args = ['-I' + meson.build_root(),
                          '-I' + join_paths(meson.source_root(), 'libbalsa'),
                          '-I' + join_paths(meson.source_root(), 'libnetclient'),
                          '-I' + join_paths(meson.source_root(), 'libbalsa', 'imap')]
-libbalsa_deps = declare_dependency(compile_args : libbalsa_compile_args,
-                                   dependencies : balsa_deps)
+libbalsa_compile_dep  = declare_dependency(compile_args : libbalsa_compile_args)
 
 # genmarshal
 #
@@ -164,8 +163,8 @@ libbalsa_marshal_c = custom_target('libbalsa_marshal_c',
   output  : 'libbalsa-marshal.c',
   command : [
     'sh', '-c',
-    'echo \'#include "libbalsa-marshal.h"\' > libbalsa/libbalsa-marshal.c && ' +
     glib_genmarshal +
+    ' --header' +
     ' --body' +
     ' --prefix=libbalsa' +
     ' @INPUT@' +
@@ -175,7 +174,7 @@ libbalsa_marshal_c = custom_target('libbalsa_marshal_c',
 
 libbalsa_a = static_library('balsa', libbalsa_a_sources,
                             libbalsa_marshal_c, libbalsa_marshal_h,
-                            dependencies : libbalsa_deps,
+                            dependencies : balsa_deps + [libbalsa_compile_dep],
                             install      : false)
 
 subdir('imap')
diff --git a/libinit_balsa/meson.build b/libinit_balsa/meson.build
index 8cd6c84..00a8159 100644
--- a/libinit_balsa/meson.build
+++ b/libinit_balsa/meson.build
@@ -21,9 +21,8 @@ libinit_balsa_compile_args = ['-I' + meson.build_root(),
                               '-I' + join_paths(meson.source_root(), 'libbalsa'),
                               '-I' + join_paths(meson.source_root(), 'libnetclient'),
                               '-I' + join_paths(meson.source_root(), 'src')]
-libinit_balsa_deps = declare_dependency(compile_args : libinit_balsa_compile_args,
-                                        dependencies : balsa_deps)
+libinit_balsa_compile_dep = declare_dependency(compile_args : libinit_balsa_compile_args)
 
 libinit_balsa_a = static_library('init_balsa', libinit_balsa_sources,
-                                 dependencies : libinit_balsa_deps,
+                                 dependencies : balsa_deps + [libinit_balsa_compile_dep],
                                  install      : false)
diff --git a/libnetclient/meson.build b/libnetclient/meson.build
index 20f3cf7..f20d963 100644
--- a/libnetclient/meson.build
+++ b/libnetclient/meson.build
@@ -12,10 +12,10 @@ libnetclient_a_sources = [
   ]
 
 libnetclient_compile_args = '-I' + meson.build_root()
-netclient_deps = declare_dependency(compile_args : libnetclient_compile_args,
-                                    dependencies : libnetclient_deps)
+libbetclient_compile_dep  = declare_dependency(compile_args : libnetclient_compile_args)
+
 libnetclient_a = static_library('netclient', libnetclient_a_sources,
-                                dependencies : netclient_deps,
+                                dependencies : libnetclient_deps + [libbetclient_compile_dep],
                                 install      : false)
 
 if with_libnetclient_docs
diff --git a/libnetclient/test/meson.build b/libnetclient/test/meson.build
index 5b35cc9..52cabae 100644
--- a/libnetclient/test/meson.build
+++ b/libnetclient/test/meson.build
@@ -18,12 +18,11 @@ if with_libnetclient_test
                    '--track-fds=yes',
                    '--child-silent-after-fork=yes']
 
-  test_deps = declare_dependency(compile_args : test_flags + ['-I.', '-I..'],
-                                 dependencies : libnetclient_deps)
-  test_executable = executable('tests', 'tests.c',
-                               link_with    : libnetclient_a,
-                               dependencies : test_deps,
-                               install      : false)
+  test_compile_dep = declare_dependency(compile_args : test_flags + ['-I.', '-I..'])
+  test_executable  = executable('tests', 'tests.c',
+                                link_with    : libnetclient_a,
+                                dependencies : libnetclient_deps + [test_compile_dep],
+                                install      : false)
   test('libnetclient-test', test_executable)
   # now run the test with:
   #   meson test --wrap='valgrind --tool=memcheck --leak-check=full --track-fds=yes 
--child-silent-after-fork=yes --suppressions=valgrind.supp' libnetclient-test
diff --git a/src/meson.build b/src/meson.build
index 36bc383..1279c7e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -105,13 +105,12 @@ balsa_compile_args = ['-DGNOMELOCALEDIR="' + locale_dir + '"',
                       '-I' + join_paths(meson.source_root(), 'libbalsa'),
                       '-I' + join_paths(meson.source_root(), 'libnetclient')]
 
-real_balsa_deps = declare_dependency(compile_args : balsa_compile_args,
-                                     dependencies : balsa_deps)
-real_balsa_libs = [libinit_balsa_a, libbalsa_a, libimap_a, libnetclient_a]
+balsa_compile_dep = declare_dependency(compile_args : balsa_compile_args)
+balsa_libs = [libinit_balsa_a, libbalsa_a, libimap_a, libnetclient_a]
 
 executable('balsa', balsa_sources,
-           dependencies : real_balsa_deps,
-           link_with    : real_balsa_libs,
+           dependencies : balsa_deps + [balsa_compile_dep],
+           link_with    : balsa_libs,
            install      : true)
 
 balsa_ab_sources = [
@@ -122,10 +121,9 @@ balsa_ab_sources = [
 balsa_ab_compile_args = ['-I' + meson.build_root(),
                          '-I' + join_paths(meson.source_root(), 'libbalsa')]
 
-real_balsa_ab_deps = declare_dependency(compile_args : balsa_ab_compile_args,
-                                        dependencies : balsa_ab_deps)
+balsa_ab_compile_dep  = declare_dependency(compile_args : balsa_ab_compile_args)
 
 executable('balsa_ab', balsa_ab_sources,
-           dependencies : real_balsa_ab_deps,
+           dependencies : balsa_ab_deps + [balsa_ab_compile_dep],
            link_with    : libbalsa_a,
            install      : true)