diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-21 18:14:19 +0100 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-23 18:12:57 +0100 |
| commit | 5c61331625ff964dcc42238151d41ba674618986 (patch) | |
| tree | eda0bc4702fe0d907cd14678e4546d255ae3ea94 | |
| parent | 465ec84bbba2c45627d560438096509a00484c18 (diff) | |
| download | libchamplain-5c61331625ff964dcc42238151d41ba674618986.tar.gz | |
meson: Split lib includedirs
| -rw-r--r-- | champlain-gtk/meson.build | 10 | ||||
| -rw-r--r-- | champlain/meson.build | 25 |
2 files changed, 15 insertions, 20 deletions
diff --git a/champlain-gtk/meson.build b/champlain-gtk/meson.build index 680b132..5309b4d 100644 --- a/champlain-gtk/meson.build +++ b/champlain-gtk/meson.build @@ -29,12 +29,14 @@ libchamplain_gtk_c_args = [ libchamplain_gtk_link_args = [ ] +libchamplain_gtk_includedir = join_paths( + pkgincludedir, + 'champlain-gtk', +) + install_headers( libchamplain_gtk_public_h, - install_dir: join_paths( - pkgincludedir, - 'champlain-gtk', - ) + install_dir: libchamplain_gtk_includedir, ) libchamplain_gtk_sha = library( diff --git a/champlain/meson.build b/champlain/meson.build index 1076af6..1431c75 100644 --- a/champlain/meson.build +++ b/champlain/meson.build @@ -114,6 +114,11 @@ libchamplain_c_args = [ libchamplain_link_args = [ ] +libchamplain_includedir = join_paths( + pkgincludedir, + 'champlain', +) + features_h = configuration_data() if build_with_memphis features_h.set('CHAMPLAIN_HAS_MEMPHIS', '1') @@ -123,10 +128,7 @@ libchamplain_features_h = configure_file( output: 'champlain-features.h', configuration: features_h, install: true, - install_dir: join_paths( - pkgincludedir, - 'champlain', - ) + install_dir: libchamplain_includedir, ) version_h = configuration_data() @@ -140,10 +142,7 @@ libchamplain_version_h = configure_file( output: 'champlain-version.h', configuration: version_h, install: true, - install_dir: join_paths( - pkgincludedir, - 'champlain', - ) + install_dir: libchamplain_includedir, ) libchamplain_public_h += [ @@ -157,10 +156,7 @@ libchamplain_enums = gnome.mkenums( h_template: 'champlain-enum-types.h.in', c_template: 'champlain-enum-types.c.in', install_header: true, - install_dir: join_paths( - pkgincludedir, - 'champlain', - ) + install_dir: libchamplain_includedir, ) libchamplain_enums_h = libchamplain_enums.get(1) @@ -171,10 +167,7 @@ libchamplain_sources += [ install_headers( libchamplain_public_h, - install_dir: join_paths( - pkgincludedir, - 'champlain', - ) + install_dir: libchamplain_includedir, ) libchamplain_sha = library( |