[pangomm/use-dllexport-2-42: 13/17] pango/pangomm/meson.build: Consolidate pangomm-int targets

[Chun-wei Fan <fanchunwei src gnome org>]

commit 4016bc25df1add8050fe3507c18d8a7c629bf43e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 19 18:11:26 2020 +0800

    pango/pangomm/meson.build: Consolidate pangomm-int targets
    
    This is to make the build files cleaner so that we can prepare to build
    pangomm directly as a shared library without using an intermediate
    static library when possible.

 pango/pangomm/meson.build | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/pango/pangomm/meson.build b/pango/pangomm/meson.build
index 0a57762..cbfa75e 100644
--- a/pango/pangomm/meson.build
+++ b/pango/pangomm/meson.build
@@ -128,15 +128,8 @@ if maintainer_mode
 
   extra_include_dirs = ['..']
 
-  # We need this so that we can run gendef.exe to get the .def file
-  # needed for obtaining the .lib file for the pangomm DLL
-  pango_int_lib = static_library('pangomm-int',
-    built_cc_file_targets, built_h_file_targets, extra_cc_files,
-    include_directories: extra_include_dirs,
-    cpp_args: pangomm_cpp_args,
-    dependencies: pangomm_build_dep,
-    install: false,
-  )
+  pango_gen_sources = built_cc_file_targets
+  pango_built_headers = built_h_file_targets
 
   built_h_cc_dir = meson.current_build_dir()
 
@@ -170,22 +163,26 @@ else # not maintainer_mode
     built_cc_files += src_untracked_pangomm / file + '.cc'
   endforeach
 
+  pango_gen_sources = built_cc_files
+  pango_built_headers = []
+
   extra_include_dirs = [ '..', '..' / '..' / 'untracked' / 'pango' ]
 
-  # We need this so that we can run gendef.exe to get the .def file
-  # needed for obtaining the .lib file for the pangomm DLL
-  pango_int_lib = static_library('pangomm-int',
-    built_cc_files, extra_cc_files,
-    include_directories: extra_include_dirs,
-    cpp_args: pangomm_cpp_args,
-    dependencies: pangomm_build_dep,
-    install: false,
-  )
 
   built_h_cc_dir = src_untracked_pangomm
 
 endif
 
+# We need this so that we can run gendef.exe to get the .def file
+# needed for obtaining the .lib file for the pangomm DLL
+pango_int_lib = static_library('pangomm-int',
+  pango_gen_sources, pango_built_headers, extra_cc_files,
+  include_directories: extra_include_dirs,
+  cpp_args: pangomm_cpp_args,
+  dependencies: pangomm_build_dep,
+  install: false,
+)
+
 pangomm_def = []
 pangomm_extra_link_args = []
 extra_pangomm_objects = []