diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-03-02 19:38:22 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-03-02 19:38:22 +0100 |
| commit | 1a5af7b9825eb19a44f84877cbc38fdf5c70caa7 (patch) | |
| tree | 54e25f7fbd7e0d42bde1f0d51bb397528c8753e9 | |
| parent | ec9b9bc3f5be6ec5ce174aaa8468f43d1d5c90c9 (diff) | |
| download | glibmm-1a5af7b9825eb19a44f84877cbc38fdf5c70caa7.tar.gz | |
Meson build: Add some dependencies when generating source files
wrap_init.cc shall be rebuilt when generate_wrap_init.pl has been rebuilt.
Generated .h and .cc files shall be rebuilt when gmmproc has been rebuilt.
| -rw-r--r-- | gio/giomm/meson.build | 5 | ||||
| -rw-r--r-- | glib/glibmm/meson.build | 5 | ||||
| -rw-r--r-- | tools/meson.build | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/gio/giomm/meson.build b/gio/giomm/meson.build index 8cd95bc9..325a1066 100644 --- a/gio/giomm/meson.build +++ b/gio/giomm/meson.build @@ -3,7 +3,7 @@ # Input: giomm_build_dep, giomm_pcname, maintainer_mode, project_source_root, # generate_binding_py, handle_built_files_py, m4_files, pm_files, # glibmm_libversion, install_includedir, python3, giomm_rc, gmmproc_dir, -# is_host_windows, gendef +# is_host_windows, gendef, gmmproc, generate_wrap_init_pl # Output: giomm_hg_ccg_basenames, giomm_extra_h_files, built_files_root, # giomm_built_h_file_targets, giomm_dep @@ -240,6 +240,7 @@ if maintainer_mode 'Gio', # namespace '@INPUT@', ], + depend_files: generate_wrap_init_pl, build_by_default: maintainer_mode, install: false, ) @@ -261,7 +262,7 @@ if maintainer_mode meson.current_source_dir() / '..' / 'src', project_source_root / 'tools' / 'm4', ], - depend_files: giomm_defs_files + m4_files + pm_files, + depend_files: giomm_defs_files + m4_files + [gmmproc] + pm_files, build_by_default: maintainer_mode, install: false, ) diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build index a21ef139..7797166a 100644 --- a/glib/glibmm/meson.build +++ b/glib/glibmm/meson.build @@ -3,7 +3,7 @@ # Input: glibmm_build_dep, glibmm_pcname, maintainer_mode, project_source_root, # generate_binding_py, handle_built_files_py, m4_files, pm_files, # glibmm_libversion, install_includedir, python3, glibmm_rc, gmmproc_dir, -# is_host_windows, gendef +# is_host_windows, gendef, gmmproc, generate_wrap_init_pl # Output: glibmm_hg_ccg_basenames, glibmm_extra_h_files, built_files_root, # glibmm_built_h_file_targets, glibmm_dep @@ -159,6 +159,7 @@ if maintainer_mode 'Glib', # namespace '@INPUT@', ], + depend_files: generate_wrap_init_pl, build_by_default: maintainer_mode, install: false, ) @@ -180,7 +181,7 @@ if maintainer_mode meson.current_source_dir() / '..' / 'src', project_source_root / 'tools' / 'm4', ], - depend_files: glibmm_defs_files + m4_files + pm_files, + depend_files: glibmm_defs_files + m4_files + [gmmproc] + pm_files, build_by_default: maintainer_mode, install: false, ) diff --git a/tools/meson.build b/tools/meson.build index 6a204f31..0bc35106 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -1,7 +1,8 @@ # tools # Input: perl, m4, install_prefix, install_libdir, glibmm_pcname -# Output: m4_files, install_m4dir, pm_files, install_pmdir +# Output: m4_files, install_m4dir, pm_files, install_pmdir, gmmproc, +# generate_wrap_init_pl subdir('extra_defs_gen') @@ -18,7 +19,7 @@ gmmproc_conf_data.set('GLIBMM_MODULE_NAME', glibmm_pcname) gmmproc_conf_data.set('M4', m4.found() ? '/'.join(m4.path().split('\\')) : '') gmmproc_conf_data.set('PACKAGE_VERSION', meson.project_version()) -configure_file( +gmmproc = configure_file( input: 'gmmproc.in', output: '@BASENAME@', configuration: gmmproc_conf_data, @@ -31,7 +32,7 @@ gen_wrap_init_conf_data.set('PERL', perl.found() ? perl.path() : '') gen_wrap_init_conf_data.set('configure_input', 'tools/generate_wrap_init.pl. Generated from generate_wrap_init.pl.in') -configure_file( +generate_wrap_init_pl = configure_file( input: 'generate_wrap_init.pl.in', output: '@BASENAME@', configuration: gen_wrap_init_conf_data, |