[gimp/meson: 783/805] Cleanup custom useless Ldflags/link_args

From: Félix Piédallu <fpiedallu src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp/meson: 783/805] Cleanup custom useless Ldflags/link_args
Date: Fri, 2 Feb 2018 15:24:53 +0000 (UTC)
commit 4e816ad6f3b2030d2118984290fe8f839d1094d2
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 30 14:59:55 2018 +0100

    Cleanup custom useless Ldflags/link_args

 app/config/meson.build                 |    1 +
 app/meson.build                        |   12 ----------
 libgimp/meson.build                    |   36 ++++++++++---------------------
 libgimpbase/meson.build                |    5 ++-
 libgimpcolor/meson.build               |    4 +-
 libgimpconfig/meson.build              |   12 ++++------
 libgimpmath/meson.build                |    8 ++----
 libgimpmodule/meson.build              |   10 +++-----
 libgimpthumb/meson.build               |    9 ++++++-
 libgimpwidgets/meson.build             |   16 ++++++--------
 meson.build                            |    5 +--
 modules/meson.build                    |    8 -------
 plug-ins/selection-to-path/meson.build |   10 +--------
 13 files changed, 47 insertions(+), 89 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index 805ff41..516fa8c 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -37,6 +37,7 @@ libappconfig = static_library('appconfig',
     '-DG_LOG_DOMAIN="Gimp-Config"',
     '-DGIMP_APP_VERSION_STRING="'+ app_version +'"',
     '-DDATADIR="'+ join_paths(prefix, gimpdatadir) +'"',
+    mypaint_args,
   ],
   dependencies: [
     cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint,
diff --git a/app/meson.build b/app/meson.build
index c4101e3..2f15042 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -59,8 +59,6 @@ app_debug_files = files(
 )
 
 # Top-level library
-app_lflags = [
-]
 app_cflags = [
   '-DCC_VERSION="' + cc.version() + '"',
   '-DG_LOG_DOMAIN="Gimp"',
@@ -69,15 +67,6 @@ app_cflags = [
   '-DGIMPDIR="'+ gimpdir + '"',
 ]
 
-if platform_osx
-  app_cflags += '-xobjective-c'
-  #app_lflags += ['-framework', 'Cocoa']
-endif
-
-if platform_win32
-  # app_lflags += [ '-mwindows', '-mexchndl', ]
-endif
-
 libapp_sources = [
   'app.c',
   'errors.c',
@@ -100,7 +89,6 @@ libapp = static_library('app',
   dependencies: [
     gegl, gdk_pixbuf, gtk2,
   ],
-  link_with: app_lflags,
 )
 
 
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 2af6655..684af93 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -272,17 +272,6 @@ libgimp_top_cflags = [
   '-DGIMP_COMPILATION',
 ]
 
-libgimp_top_lflags = [
-  libgimpbase,
-  libgimpcolor,
-  libgimpconfig,
-]
-
-if platform_win32
-  # libgimp_top_lflags += '-lexchndl'
-endif
-
-
 libgimp = library('gimp-'+ api_version,
   libgimp_top_sources,
   include_directories: rootInclude,
@@ -290,7 +279,11 @@ libgimp = library('gimp-'+ api_version,
     gegl, gexiv2, gtk2,
   ],
   c_args:     [ libgimp_cflags, libgimp_top_cflags, ],
-  link_with:  [ libgimp_lflags, libgimp_top_lflags, ],
+  link_with:  [
+    libgimpbase,
+    libgimpcolor,
+    libgimpconfig,
+  ],
   vs_module_defs: 'gimp.def',
   install: true,
   version: so_version,
@@ -299,17 +292,6 @@ libgimp = library('gimp-'+ api_version,
 
 
 libgimpui_cflags = libgimp_top_cflags
-libgimpui_lflags = [
-  libgimp,
-  libgimpbase,
-  libgimpcolor,
-  libgimpmodule,
-  libgimpwidgets,
-]
-
-if platform_win32
-  # libgimpui_lflags += '-lexchndl'
-endif
 
 libgimpui = library('gimpui-'+ api_version,
   libgimpui_sources,
@@ -318,7 +300,13 @@ libgimpui = library('gimpui-'+ api_version,
     gegl, gexiv2, gtk2,
   ],
   c_args:     [ libgimp_cflags, libgimpui_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpui_lflags, ],
+  link_with:  [
+    libgimp,
+    libgimpbase,
+    libgimpcolor,
+    libgimpmodule,
+    libgimpwidgets,
+  ],
   vs_module_defs: 'gimpui.def',
   install: true,
   version: so_version,
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index 8963777..babdae2 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -99,7 +99,6 @@ libgimpbase = library('gimpbase-' + api_version,
     gexiv2, gio, math,
   ],
   c_args:     [ libgimp_cflags, libgimpbase_cflags, ],
-  link_with:  [ libgimp_lflags, ],
   vs_module_defs: 'gimpbase.def',
   install: true,
   version: so_version,
@@ -119,6 +118,8 @@ executable('test-cpu-accel',
     glib,
   ],
   c_args:     [ libgimp_cflags, libgimpbase_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpbase, ],
+  link_with:  [
+    libgimpbase,
+  ],
   install: false,
 )
diff --git a/libgimpcolor/meson.build b/libgimpcolor/meson.build
index 253f4bf..4001029 100644
--- a/libgimpcolor/meson.build
+++ b/libgimpcolor/meson.build
@@ -44,7 +44,7 @@ libgimpcolor = library('gimpcolor-' + api_version,
     cairo, gdk_pixbuf, gegl, lcms, math,
   ],
   c_args:     [ libgimp_cflags, libgimpcolor_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpbase, ],
+  link_with:  [ libgimpbase, ],
   vs_module_defs: 'gimpcolor.def',
   install: true,
   version: so_version,
@@ -66,6 +66,6 @@ executable('test-color-parser',
     # glib,
   ],
   c_args:     [ libgimp_cflags, libgimpcolor_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpbase, libgimpcolor, ],
+  link_with:  [ libgimpbase, libgimpcolor, ],
   install: false,
 )
diff --git a/libgimpconfig/meson.build b/libgimpconfig/meson.build
index b758044..4f9e681 100644
--- a/libgimpconfig/meson.build
+++ b/libgimpconfig/meson.build
@@ -50,12 +50,6 @@ libgimpconfig_cflags = [
   '-DGIMP_CONFIG_COMPILATION',
 ]
 
-libgimpconfig_lflags = [
-  libgimpbase,
-  libgimpcolor,
-  libgimpmath,
-]
-
 libgimpconfig = library('gimpconfig-' + api_version,
   libgimpconfig_sources,
   include_directories: rootInclude,
@@ -63,7 +57,11 @@ libgimpconfig = library('gimpconfig-' + api_version,
     cairo, gdk_pixbuf, gegl, gio, gio_specific,
   ],
   c_args:     [ libgimp_cflags, libgimpconfig_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpconfig_lflags, ],
+  link_with:  [
+    libgimpbase,
+    libgimpcolor,
+    libgimpmath,
+  ],
   vs_module_defs: 'gimpconfig.def',
   install: true,
   version: so_version,
diff --git a/libgimpmath/meson.build b/libgimpmath/meson.build
index 53571e9..1471f84 100644
--- a/libgimpmath/meson.build
+++ b/libgimpmath/meson.build
@@ -19,10 +19,6 @@ libgimpmath_cflags = [
   '-DGIMP_MATH_COMPILATION',
 ]
 
-libgimpmath_lflags = [
-  libgimpbase,
-]
-
 libgimpmath = library('gimpmath-' + api_version,
   libgimpmath_sources,
   include_directories: rootInclude,
@@ -30,7 +26,9 @@ libgimpmath = library('gimpmath-' + api_version,
     glib, gobject, math,
   ],
   c_args:     [ libgimp_cflags, libgimpmath_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpmath_lflags, ],
+  link_with:  [
+    libgimpbase,
+  ],
   vs_module_defs: 'gimpmath.def',
   install: true,
   version: so_version,
diff --git a/libgimpmodule/meson.build b/libgimpmodule/meson.build
index eb6889e..7c8b158 100644
--- a/libgimpmodule/meson.build
+++ b/libgimpmodule/meson.build
@@ -15,11 +15,6 @@ libgimpmodule_cflags = [
   '-DGIMP_MODULE_COMPILATION',
 ]
 
-libgimpmodule_lflags = [
-  libgimpbase,
-  libgimpconfig,
-]
-
 libgimpmodule = library('gimpmodule-' + api_version,
   libgimpmodule_sources,
   include_directories: rootInclude,
@@ -27,7 +22,10 @@ libgimpmodule = library('gimpmodule-' + api_version,
     gio, glib, gmodule,
   ],
   c_args:     [ libgimp_cflags, libgimpmodule_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpmodule_lflags, ],
+  link_with:  [
+    libgimpbase,
+    libgimpconfig,
+  ],
   vs_module_defs: 'gimpmodule.def',
   install: true,
   version: so_version,
diff --git a/libgimpthumb/meson.build b/libgimpthumb/meson.build
index 34cd2db..9dba58c 100644
--- a/libgimpthumb/meson.build
+++ b/libgimpthumb/meson.build
@@ -58,7 +58,9 @@ libgimpthumb = library('gimpthumb-'+ api_version,
     gdk_pixbuf, glib, gio, gobject,
   ],
   c_args:     [ libgimp_cflags, libgimpthumb_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpbase, ],
+  link_with:  [
+    libgimpbase,
+  ],
   vs_module_defs: 'gimpthumb.def',
   install: true,
   version: so_version,
@@ -78,6 +80,9 @@ gimp_thumbnail_list = executable('gimp-thumbnail-list',
     gdk_pixbuf,
   ],
   c_args:     [ libgimp_cflags, libgimpthumb_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpbase, libgimpthumb, ],
+  link_with:  [
+    libgimpbase,
+    libgimpthumb,
+  ],
   install: false,
 )
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index cde7bc0..54a55f7 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -158,12 +158,6 @@ libgimpwidgets_cflags = [
   '-DMESON_BUILD',
 ]
 
-libgimpwidgets_lflags = [
-  libgimpbase,
-  libgimpcolor,
-  libgimpconfig,
-]
-
 if gtk_mac_integration_ok
   libgimpwidgets_sources += [
     'gimppickbutton-quartz.c',
@@ -182,7 +176,11 @@ libgimpwidgets = library('gimpwidgets-'+ api_version,
     gegl, gtk2, lcms, math
   ],
   c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpwidgets_lflags, ],
+  link_with:  [
+    libgimpbase,
+    libgimpcolor,
+    libgimpconfig,
+  ],
   vs_module_defs: 'gimpwidgets.def',
   install: true,
   version: so_version,
@@ -203,7 +201,7 @@ test_preview_area = executable('test-preview-area',
     gtk2,
   ],
   c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpwidgets_lflags, libgimpwidgets, ],
+  link_with:  [ libgimpwidgets, ],
   install: false,
   build_by_default: false,
 )
@@ -215,6 +213,6 @@ test_eevl = executable('test-eevl',
     glib, gtk2,
   ],
   c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
-  link_with:  [ libgimp_lflags, libgimpwidgets_lflags, libgimpwidgets, ],
+  link_with:  [ libgimpwidgets, ],
   install: false,
 )
diff --git a/meson.build b/meson.build
index fcee026..7bc7fb2 100644
--- a/meson.build
+++ b/meson.build
@@ -780,11 +780,10 @@ libgimp_cflags = [
   '-DPLUGINDIR='            +'"'+ join_paths(prefix, gimpplugindir)  +'"',
   '-DSYSCONFDIR='           +'"'+ gimpsysconfdir        +'"',
 ]
-libgimp_lflags = []
 
 if platform_osx
-  libgimp_cflags += '-xobjective-c'
-  libgimp_lflags += ['-framework', 'Cocoa']
+  # libgimp_cflags += '-xobjective-c'
+  # libgimp_lflags += ['-framework', 'Cocoa']
 endif
 
 rootInclude = include_directories('.')
diff --git a/modules/meson.build b/modules/meson.build
index d125f7e..e2f9c2d 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -1,12 +1,4 @@
 
-global_cflags = []
-global_lflags = []
-
-if platform_osx
-  global_cflags += '-xobjective-c'
-  global_lflags += ['-framework', 'Cocoa']
-endif
-
 modules_deps = [
   gtk2, babl, gegl, math,
 ]
diff --git a/plug-ins/selection-to-path/meson.build b/plug-ins/selection-to-path/meson.build
index 67e6ba1..0b96b3d 100644
--- a/plug-ins/selection-to-path/meson.build
+++ b/plug-ins/selection-to-path/meson.build
@@ -20,21 +20,13 @@ plugin_selection_to_path_link = [
   libgimpwidgets,
 ]
 plugin_selection_to_path_deps = [
-  gegl, gtk2,
+  gegl, gtk2, math,
 ]
-plugin_selection_to_path_lflags = []
-if platform_win32
-  plugin_selection_to_path_lflags += '-mwindows'
-else
-  plugin_selection_to_path_deps += math
-endif
-
 
 selection_to_path = executable('selection-to-path',
   plugin_selection_to_path_sources,
   include_directories: [ rootInclude, ],
   link_with:    plugin_selection_to_path_link,
-  link_args:    plugin_selection_to_path_lflags,
   dependencies: plugin_selection_to_path_deps,
   install: true,
   install_dir: join_paths(gimpplugindir, 'plug-ins'),
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]