[gimp/meson: 102/805] Fix libraries: * Add so version * Fix installation subdir (modules, headers)

[Félix Piédallu <fpiedallu src gnome org>]

commit 94a30d72ef9ae772a7060649caa76e00773ee635
Author: Félix Piédallu <felix piedallu me>
Date:   Fri Nov 17 11:39:08 2017 +0100

    Fix libraries:
    * Add so version
    * Fix installation subdir (modules, headers)

 libgimp/meson.build        |    6 +++++-
 libgimpbase/meson.build    |    4 +++-
 libgimpcolor/meson.build   |    4 +++-
 libgimpconfig/meson.build  |    4 +++-
 libgimpmath/meson.build    |    4 +++-
 libgimpmodule/meson.build  |    4 +++-
 libgimpthumb/meson.build   |    4 +++-
 libgimpwidgets/meson.build |    4 +++-
 meson.build                |    3 +++
 modules/meson.build        |   18 ++++++++++++++++++
 10 files changed, 47 insertions(+), 8 deletions(-)
---
diff --git a/libgimp/meson.build b/libgimp/meson.build
index d565e68..86d9089 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -319,6 +319,8 @@ libgimp = library('gimp-'+ api_version,
   ],
   c_args:     [ libgimp_cflags, libgimp_top_cflags, ],
   link_with:  [ libgimp_lflags, libgimp_top_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 
@@ -345,10 +347,12 @@ libgimpui = library('gimpui-'+ api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpui_cflags, ],
   link_with:  [ libgimp_lflags, libgimpui_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 
 install_headers(
   libgimp_top_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimp'),
+  subdir: join_paths(gimp_api_name, 'libgimp'),
 )
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index e628dbf..ee47106 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -161,11 +161,13 @@ libgimpbase = library('gimpbase-' + api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpbase_cflags, ],
   link_with:  [ libgimp_lflags, libgimpbase_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpbase_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpbase'),
+  subdir: join_paths(gimp_api_name, 'libgimpbase'),
 )
 
 
diff --git a/libgimpcolor/meson.build b/libgimpcolor/meson.build
index aeb9b24..a663030 100644
--- a/libgimpcolor/meson.build
+++ b/libgimpcolor/meson.build
@@ -53,11 +53,13 @@ libgimpcolor = library('gimpcolor-' + api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpcolor_cflags, ],
   link_with:  [ libgimp_lflags, libgimpcolor_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpcolor_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpcolor'),
+  subdir: join_paths(gimp_api_name, 'libgimpcolor'),
 )
 
 
diff --git a/libgimpconfig/meson.build b/libgimpconfig/meson.build
index 49f3409..c9fbb55 100644
--- a/libgimpconfig/meson.build
+++ b/libgimpconfig/meson.build
@@ -97,9 +97,11 @@ libgimpconfig = library('gimpconfig-' + api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpconfig_cflags, ],
   link_with:  [ libgimp_lflags, libgimpconfig_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpconfig_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpconfig'),
+  subdir: join_paths(gimp_api_name, 'libgimpconfig'),
 )
diff --git a/libgimpmath/meson.build b/libgimpmath/meson.build
index 2a29f5b..d172324 100644
--- a/libgimpmath/meson.build
+++ b/libgimpmath/meson.build
@@ -36,9 +36,11 @@ libgimpmath = library('gimpmath-' + api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpmath_cflags, ],
   link_with:  [ libgimp_lflags, libgimpmath_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpmath_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpmath'),
+  subdir: join_paths(gimp_api_name, 'libgimpmath'),
 )
diff --git a/libgimpmodule/meson.build b/libgimpmodule/meson.build
index 2aebe8e..c94a311 100644
--- a/libgimpmodule/meson.build
+++ b/libgimpmodule/meson.build
@@ -33,11 +33,13 @@ libgimpmodule = library('gimpmodule-' + api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpmodule_cflags, ],
   link_with:  [ libgimp_lflags, libgimpmodule_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpmodule_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpmodule'),
+  subdir: join_paths(gimp_api_name, 'libgimpmodule'),
 )
 
 
diff --git a/libgimpthumb/meson.build b/libgimpthumb/meson.build
index a8d4380..7f5a027 100644
--- a/libgimpthumb/meson.build
+++ b/libgimpthumb/meson.build
@@ -69,11 +69,13 @@ libgimpthumb = library('gimpthumb-'+ api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpthumb_cflags, ],
   link_with:  [ libgimp_lflags, libgimpthumb_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpthumb_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpthumb'),
+  subdir: join_paths(gimp_api_name, 'libgimpthumb'),
 )
 
 
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index dd6ab0f..9b554d2 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -213,11 +213,13 @@ libgimpwidgets = library('gimpwidgets-'+ api_version,
   ],
   c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
   link_with:  [ libgimp_lflags, libgimpwidgets_lflags, ],
+  install: true,
+  version: so_version,
 )
 
 install_headers(
   libgimpwidgets_headers,
-  install_dir: join_paths(gimp_api_name, 'libgimpwidgets'),
+  subdir: join_paths(gimp_api_name, 'libgimpwidgets'),
 )
 
 
diff --git a/meson.build b/meson.build
index 4d46ed9..3b1678b 100644
--- a/meson.build
+++ b/meson.build
@@ -43,6 +43,7 @@ major_version = version[0].to_int()
 minor_version = version[1].to_int()
 micro_version = version[2].to_int()
 
+# TODO cleanup all this versions mess
 interface_age = 0
 binary_age = 100 * minor_version + micro_version
 
@@ -52,6 +53,8 @@ lt_age = binary_age - interface_age
 lt_version_info = '@0@:@1@:@2@'.format(lt_current, lt_revision, lt_age)
 lt_current_minus_age = lt_current - lt_age
 
+so_version = '@0@.@1@.@2@'.format(lt_revision, lt_current, lt_current_minus_age)
+
 api_version        = '2.0'
 app_version        = '2.9'
 data_version       = '2.0'
diff --git a/modules/meson.build b/modules/meson.build
index e495a3f..e80287a 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -45,6 +45,8 @@ libcolor_selector_cmyk = library('color-selector-cmyk',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: color_selector_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 
 libcolor_selector_water = library('color-selector-water',
@@ -52,6 +54,8 @@ libcolor_selector_water = library('color-selector-water',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: color_selector_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 
 libcolor_selector_wheel = library('color-selector-wheel',
@@ -62,6 +66,8 @@ libcolor_selector_wheel = library('color-selector-wheel',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: color_selector_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 
 if have_linuxinput
@@ -73,6 +79,8 @@ libcontroller_linux_input = library('controller-linux-input',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: controller_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 endif
 if have_directXinput
@@ -84,6 +92,8 @@ libcontroller_dx_input = library('controller-dx-input',
   include_directories: rootInclude,
   dependencies: [modules_deps, directx],
   link_with: [controller_libs, '-lrpcrt4'],
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 
 endif
@@ -93,6 +103,8 @@ libcontroller_midi = library('controller-midi',
   include_directories: rootInclude,
   dependencies:modules_deps,
   link_with: controller_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 endif
 
@@ -101,6 +113,8 @@ libdisplay_filter_color_blind = library('display-filter-color-blind',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: display_filter_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 
 libdisplay_filter_gamma = library('display-filter-gamma',
@@ -108,6 +122,8 @@ libdisplay_filter_gamma = library('display-filter-gamma',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: display_filter_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )
 
 libdisplay_filter_high_contrast = library('display-filter-high-contrast',
@@ -115,4 +131,6 @@ libdisplay_filter_high_contrast = library('display-filter-high-contrast',
   include_directories: rootInclude,
   dependencies: modules_deps,
   link_with: display_filter_libs,
+  install: true,
+  install_dir: join_paths(gimpplugindir, 'modules'),
 )