GNOME.org
 

[gimp/meson: 119/128] Refactoring of CFlags: * Regroup all -Defines in /meson.build. * Rename DATADIR as SYSDATADIR in /to

commit 86288a60f94070e2f4045e5840bf92de9dfdfb08
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 30 16:44:52 2018 +0100

    Refactoring of CFlags:
    * Regroup all -Defines in /meson.build.
    * Rename DATADIR as SYSDATADIR in /tools
    * Define HAVE_CONFIG_H
    * Enable profiling only for GCC (not clang)

 app/config/meson.build              |    2 -
 app/core/meson.build                |    3 --
 app/gui/meson.build                 |    1 -
 app/meson.build                     |    3 --
 app/propgui/meson.build             |    2 -
 app/widgets/meson.build             |    2 -
 libgimp/meson.build                 |    7 +---
 libgimpbase/Makefile.am             |    2 +-
 libgimpbase/gimpenv.c               |    2 +-
 libgimpbase/meson.build             |    4 +-
 libgimpcolor/meson.build            |    4 +-
 libgimpconfig/meson.build           |   11 ++----
 libgimpmath/meson.build             |   10 ++----
 libgimpmodule/meson.build           |    9 ++---
 libgimpthumb/meson.build            |    4 +-
 libgimpwidgets/meson.build          |    6 ++--
 meson.build                         |   53 ++++++++++++++++++++++++++++++----
 plug-ins/gradient-flare/meson.build |    3 --
 plug-ins/help/meson.build           |    3 --
 plug-ins/pygimp/meson.build         |    1 -
 tools/Makefile.am                   |    2 +-
 tools/gimptool.c                    |    2 +-
 tools/meson.build                   |   28 ------------------
 23 files changed, 73 insertions(+), 91 deletions(-)
---
diff --git a/app/config/meson.build b/app/config/meson.build
index 89b9e3b..cd17f1a 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -31,8 +31,6 @@ libappconfig = static_library('appconfig',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: [
     '-DG_LOG_DOMAIN="Gimp-Config"',
-    '-DGIMP_APP_VERSION_STRING="'+ app_version +'"',
-    '-DDATADIR="'+ join_paths(prefix, gimpdatadir) +'"',
     mypaint_args,
   ],
   dependencies: [
diff --git a/app/core/meson.build b/app/core/meson.build
index 4c64af1..f4c67f9 100644
--- a/app/core/meson.build
+++ b/app/core/meson.build
@@ -221,9 +221,6 @@ libappcore = static_library('appcore',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: [
     '-DG_LOG_DOMAIN="Gimp-Core"',
-    '-DGIMPDIR="'+ gimpdir +'"',
-    '-DGIMP_APP_VERSION="'+ app_version +'"',
-    '-DGIMP_USER_VERSION="'+ user_version +'"',
     '-DMESON_BUILD',
   ],
   dependencies: [
diff --git a/app/gui/meson.build b/app/gui/meson.build
index 13c7b1a..bab8c8b 100644
--- a/app/gui/meson.build
+++ b/app/gui/meson.build
@@ -29,7 +29,6 @@ libappgui = static_library('appgui',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: [
     '-DG_LOG_DOMAIN="Gimp-GUI"',
-    '-DGIMP_COMMAND="'+ gimp_command +'"',
   ],
   dependencies: [
     cairo, dbus_glib, gegl, gdk_pixbuf, gio_specific, gtk2
diff --git a/app/meson.build b/app/meson.build
index 2f15042..d2c9143 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -60,11 +60,8 @@ app_debug_files = files(
 
 # Top-level library
 app_cflags = [
-  '-DCC_VERSION="' + cc.version() + '"',
   '-DG_LOG_DOMAIN="Gimp"',
   '-DGIMP_APP_GLUE_COMPILATION',
-  '-DGIMP_USER_VERSION="'+ user_version +'"',
-  '-DGIMPDIR="'+ gimpdir + '"',
 ]
 
 libapp_sources = [
diff --git a/app/propgui/meson.build b/app/propgui/meson.build
index c38490f..1c64c73 100644
--- a/app/propgui/meson.build
+++ b/app/propgui/meson.build
@@ -20,8 +20,6 @@ libapppropgui = static_library('apppropgui',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: [
     '-DG_LOG_DOMAIN="Gimp-PropGUI"',
-    '-DISO_CODES_LOCATION="' + isocodes_location  +'"',
-    '-DISO_CODES_LOCALEDIR="'+ isocodes_localedir +'"',
   ],
   dependencies: [
     gegl, gtk2,
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 1bdd120..3a18395 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -231,8 +231,6 @@ libappwidgets = static_library('appwidgets',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: [
     '-DG_LOG_DOMAIN="Gimp-Widgets"',
-    '-DISO_CODES_LOCATION="' + isocodes_location  +'"',
-    '-DISO_CODES_LOCALEDIR="'+ isocodes_localedir +'"',
   ],
   dependencies: [
     gegl, gtk2,
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 684af93..74298d5 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -278,7 +278,7 @@ libgimp = library('gimp-'+ api_version,
   dependencies: [
     gegl, gexiv2, gtk2,
   ],
-  c_args:     [ libgimp_cflags, libgimp_top_cflags, ],
+  c_args:     [ libgimp_top_cflags, ],
   link_with:  [
     libgimpbase,
     libgimpcolor,
@@ -290,16 +290,13 @@ libgimp = library('gimp-'+ api_version,
 )
 
 
-
-libgimpui_cflags = libgimp_top_cflags
-
 libgimpui = library('gimpui-'+ api_version,
   libgimpui_sources,
   include_directories: rootInclude,
   dependencies: [
     gegl, gexiv2, gtk2,
   ],
-  c_args:     [ libgimp_cflags, libgimpui_cflags, ],
+  c_args:     [ libgimp_top_cflags, ],
   link_with:  [
     libgimp,
     libgimpbase,
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index 2f3ac24..ac600fe 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -52,7 +52,7 @@ AM_CPPFLAGS = \
        -DDATADIR=\""$(gimpdatadir)"\"                          \
        -DLOCALEDIR=\""$(gimplocaledir)"\"                      \
        -DPLUGINDIR=\""$(gimpplugindir)"\"                      \
-       -DSYSCONFDIR=\""$(gimpsysconfdir)"\"                    \
+       -DGIMPSYSCONFDIR=\""$(gimpsysconfdir)"\"                        \
        -DGIMP_PACKAGE=\""@PACKAGE@"\"                          \
        -DGIMP_DATA_VERSION=\"$(GIMP_DATA_VERSION)\"            \
        -DGIMP_USER_VERSION=\"$(GIMP_USER_VERSION)\"            \
diff --git a/libgimpbase/gimpenv.c b/libgimpbase/gimpenv.c
index a8bc641..5777c2b 100644
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@ -563,7 +563,7 @@ gimp_sysconf_directory (void)
                                      GIMP_SYSCONF_VERSION,
                                      NULL);
 
-      gimp_sysconf_dir = gimp_env_get_dir ("GIMP2_SYSCONFDIR", SYSCONFDIR, tmp);
+      gimp_sysconf_dir = gimp_env_get_dir ("GIMP2_SYSCONFDIR", GIMPSYSCONFDIR, tmp);
       g_free (tmp);
     }
 
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index babdae2..09ea36d 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -98,7 +98,7 @@ libgimpbase = library('gimpbase-' + api_version,
   dependencies: [
     gexiv2, gio, math,
   ],
-  c_args:     [ libgimp_cflags, libgimpbase_cflags, ],
+  c_args:     [ libgimpbase_cflags, ],
   vs_module_defs: 'gimpbase.def',
   install: true,
   version: so_version,
@@ -117,7 +117,7 @@ executable('test-cpu-accel',
   dependencies: [
     glib,
   ],
-  c_args:     [ libgimp_cflags, libgimpbase_cflags, ],
+  c_args:     [ libgimpbase_cflags, ],
   link_with:  [
     libgimpbase,
   ],
diff --git a/libgimpcolor/meson.build b/libgimpcolor/meson.build
index 4001029..6723f83 100644
--- a/libgimpcolor/meson.build
+++ b/libgimpcolor/meson.build
@@ -43,7 +43,7 @@ libgimpcolor = library('gimpcolor-' + api_version,
   dependencies: [
     cairo, gdk_pixbuf, gegl, lcms, math,
   ],
-  c_args:     [ libgimp_cflags, libgimpcolor_cflags, ],
+  c_args:     [ libgimpcolor_cflags, ],
   link_with:  [ libgimpbase, ],
   vs_module_defs: 'gimpcolor.def',
   install: true,
@@ -65,7 +65,7 @@ executable('test-color-parser',
     babl,
     # glib,
   ],
-  c_args:     [ libgimp_cflags, libgimpcolor_cflags, ],
+  c_args:     [ libgimpcolor_cflags, ],
   link_with:  [ libgimpbase, libgimpcolor, ],
   install: false,
 )
diff --git a/libgimpconfig/meson.build b/libgimpconfig/meson.build
index 4f9e681..d8ee9ed 100644
--- a/libgimpconfig/meson.build
+++ b/libgimpconfig/meson.build
@@ -44,19 +44,16 @@ libgimpconfig_headers = [
   'gimpscanner.h',
 ]
 
-
-libgimpconfig_cflags = [
-  '-DG_LOG_DOMAIN="'+ 'LibGimpConfig' + '"',
-  '-DGIMP_CONFIG_COMPILATION',
-]
-
 libgimpconfig = library('gimpconfig-' + api_version,
   libgimpconfig_sources,
   include_directories: rootInclude,
   dependencies: [
     cairo, gdk_pixbuf, gegl, gio, gio_specific,
   ],
-  c_args:     [ libgimp_cflags, libgimpconfig_cflags, ],
+  c_args:     [
+    '-DG_LOG_DOMAIN="LibGimpConfig"',
+    '-DGIMP_CONFIG_COMPILATION',
+  ],
   link_with:  [
     libgimpbase,
     libgimpcolor,
diff --git a/libgimpmath/meson.build b/libgimpmath/meson.build
index 1471f84..c277d73 100644
--- a/libgimpmath/meson.build
+++ b/libgimpmath/meson.build
@@ -14,18 +14,16 @@ libgimpmath_headers = [
 ]
 
 
-libgimpmath_cflags = [
-  '-DG_LOG_DOMAIN="LibGimpMath"',
-  '-DGIMP_MATH_COMPILATION',
-]
-
 libgimpmath = library('gimpmath-' + api_version,
   libgimpmath_sources,
   include_directories: rootInclude,
   dependencies: [
     glib, gobject, math,
   ],
-  c_args:     [ libgimp_cflags, libgimpmath_cflags, ],
+  c_args:     [
+    '-DG_LOG_DOMAIN="LibGimpMath"',
+    '-DGIMP_MATH_COMPILATION',
+  ],
   link_with:  [
     libgimpbase,
   ],
diff --git a/libgimpmodule/meson.build b/libgimpmodule/meson.build
index 7c8b158..5ce4720 100644
--- a/libgimpmodule/meson.build
+++ b/libgimpmodule/meson.build
@@ -10,10 +10,6 @@ libgimpmodule_headers = [
   'gimpmoduletypes.h',
 ]
 
-libgimpmodule_cflags = [
-  '-DG_LOG_DOMAIN="LibGimpModule"',
-  '-DGIMP_MODULE_COMPILATION',
-]
 
 libgimpmodule = library('gimpmodule-' + api_version,
   libgimpmodule_sources,
@@ -21,7 +17,10 @@ libgimpmodule = library('gimpmodule-' + api_version,
   dependencies: [
     gio, glib, gmodule,
   ],
-  c_args:     [ libgimp_cflags, libgimpmodule_cflags, ],
+  c_args:     [
+    '-DG_LOG_DOMAIN="LibGimpModule"',
+    '-DGIMP_MODULE_COMPILATION',
+  ],
   link_with:  [
     libgimpbase,
     libgimpconfig,
diff --git a/libgimpthumb/meson.build b/libgimpthumb/meson.build
index 9dba58c..2724c71 100644
--- a/libgimpthumb/meson.build
+++ b/libgimpthumb/meson.build
@@ -57,7 +57,7 @@ libgimpthumb = library('gimpthumb-'+ api_version,
   dependencies: [
     gdk_pixbuf, glib, gio, gobject,
   ],
-  c_args:     [ libgimp_cflags, libgimpthumb_cflags, ],
+  c_args:     [ libgimpthumb_cflags, ],
   link_with:  [
     libgimpbase,
   ],
@@ -79,7 +79,7 @@ gimp_thumbnail_list = executable('gimp-thumbnail-list',
   dependencies: [
     gdk_pixbuf,
   ],
-  c_args:     [ libgimp_cflags, libgimpthumb_cflags, ],
+  c_args:     [ libgimpthumb_cflags, ],
   link_with:  [
     libgimpbase,
     libgimpthumb,
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index 54a55f7..dea0001 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -175,7 +175,7 @@ libgimpwidgets = library('gimpwidgets-'+ api_version,
   dependencies: [
     gegl, gtk2, lcms, math
   ],
-  c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
+  c_args:     [ libgimpwidgets_cflags, ],
   link_with:  [
     libgimpbase,
     libgimpcolor,
@@ -200,7 +200,7 @@ test_preview_area = executable('test-preview-area',
   dependencies: [
     gtk2,
   ],
-  c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
+  c_args:     [ libgimpwidgets_cflags, ],
   link_with:  [ libgimpwidgets, ],
   install: false,
   build_by_default: false,
@@ -212,7 +212,7 @@ test_eevl = executable('test-eevl',
   dependencies: [
     glib, gtk2,
   ],
-  c_args:     [ libgimp_cflags, libgimpwidgets_cflags, ],
+  c_args:     [ libgimpwidgets_cflags, ],
   link_with:  [ libgimpwidgets, ],
   install: false,
 )
diff --git a/meson.build b/meson.build
index 3a8df13..b62cb55 100644
--- a/meson.build
+++ b/meson.build
@@ -720,7 +720,7 @@ isocodes_localedir= join_paths(isocodes_prefix,get_option('datadir'),'locale')
 ################################################################################
 # CFlags
 
-if profiling
+if profiling and cc.get_id() == 'gcc'
   add_project_arguments     ('-pg', language: [ 'c', 'cpp', ])
   add_project_link_arguments('-pg', language: [ 'c', 'cpp', ])
 endif
@@ -750,7 +750,7 @@ add_project_arguments(
 
   # '--omg-optimized',
   # '--disable-instructions',
-  language: 'c'
+  language: [ 'c', 'cpp', ],
 )
 
 # Ensure MSVC-compatible struct packing convention is used when
@@ -770,28 +770,67 @@ has_nl_measurement = cc.has_function(
 ################################################################################
 # Set/regroup common CFlags for subdirs
 
-libgimp_cflags = [
+# Global arguments
+# Should be moved into config.h someday
+
+config_defines = [
+  # Compiler
+  '-DCC='                   +'"'+ cc.get_id()           +'"',
+  '-DCC_VERSION='           +'"'+ cc.version()          +'"',
+
+  # Names
   '-DGIMP_PACKAGE='         +'"'+ meson.project_name()  +'"',
   '-DPACKAGE_STRING='       +'"'+ package_string        +'"',
+  '-DGIMP_COMMAND='         +'"'+ gimp_command          +'"',
 
+  # Versions
+  '-DGIMP_APP_VERSION='     +'"'+ app_version           +'"',
   '-DGIMP_DATA_VERSION='    +'"'+ api_version           +'"',
-  '-DGIMP_USER_VERSION='    +'"'+ user_version          +'"',
-  '-DGIMP_SYSCONF_VERSION=' +'"'+ api_version           +'"',
   '-DGIMP_PLUGIN_VERSION='  +'"'+ api_version           +'"',
+  '-DGIMP_SYSCONF_VERSION=' +'"'+ api_version           +'"',
+  '-DGIMP_USER_VERSION='    +'"'+ user_version          +'"',
+  '-DGIMP_APP_VERSION_STRING="' + app_version           +'"',
 
+  # Directories
   '-DPREFIX='               +'"'+ prefix                +'"',
+  '-DEXEC_PREFIX='          +'"'+ prefix                +'"',
   '-DGIMPDIR='              +'"'+ gimpdir               +'"',
+  '-DGIMPSYSCONFDIR='       +'"'+ gimpsysconfdir        +'"',
   '-DDATADIR='              +'"'+ join_paths(prefix, gimpdatadir)    +'"',
-  '-DLOCALEDIR='            +'"'+ join_paths(prefix, localedir)      +'"',
+  '-DGIMPDATADIR='          +'"'+ join_paths(prefix, gimpdatadir)    +'"',
+  '-DGIMPPLUGINDIR='        +'"'+ join_paths(prefix, gimpplugindir)  +'"',
   '-DPLUGINDIR='            +'"'+ join_paths(prefix, gimpplugindir)  +'"',
-  '-DSYSCONFDIR='           +'"'+ gimpsysconfdir        +'"',
+  '-DLOCALEDIR='            +'"'+ join_paths(prefix, localedir)      +'"',
+  '-DLOCALSTATEDIR='        +'"'+ get_option('localstatedir')        +'"',
+  '-DSHAREDSTATEDIR='       +'"'+ get_option('sharedstatedir')       +'"', # HUH ? /usr/com
+  '-DSYSCONFDIR='           +'"'+ get_option('sysconfdir')           +'"',
+  '-DBINDIR='               +'"'+ join_paths(prefix, get_option('bindir'))       +'"',
+  '-DDATAROOTDIR='          +'"'+ join_paths(prefix, get_option('datadir'))      +'"',
+  '-DINFODIR='              +'"'+ join_paths(prefix, get_option('infodir'))      +'"',
+  '-DLIBDIR='               +'"'+ join_paths(prefix, get_option('libdir'))       +'"',
+  '-DLIBEXECDIR='           +'"'+ join_paths(prefix, get_option('libexecdir'))   +'"',
+  '-DMANDIR='               +'"'+ join_paths(prefix, get_option('mandir'))       +'"',
+  '-DSBINDIR='              +'"'+ join_paths(prefix, get_option('sbindir'))      +'"',
+  '-DSYSDATADIR='           +'"'+ join_paths(prefix, get_option('datadir'))      +'"',
+
+  # Third-party/Misc
+  '-DISO_CODES_LOCATION='   +'"'+ isocodes_location  +'"',
+  '-DISO_CODES_LOCALEDIR='  +'"'+ isocodes_localedir +'"',
+
+  '-DHAVE_CONFIG_H',
 ]
 
+
 if platform_osx
   # libgimp_cflags += '-xobjective-c'
   # libgimp_lflags += ['-framework', 'Cocoa']
 endif
 
+add_project_arguments(
+  config_defines,
+  language: [ 'c', 'cpp', ],
+)
+
 rootInclude = include_directories('.')
 
 ################################################################################
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index a57a168..d5f6f4f 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -18,9 +18,6 @@ gradient_flare = executable('gradient-flare',
     libgimpui,
     libgimpwidgets,
   ],
-  c_args: [
-    '-DDATADIR="' + join_paths(prefix, gimpdatadir) + '"',
-  ],
   install: true,
   install_dir: join_paths(gimpplugindir, 'plug-ins'),
 )
diff --git a/plug-ins/help/meson.build b/plug-ins/help/meson.build
index b160738..0d81e6d 100644
--- a/plug-ins/help/meson.build
+++ b/plug-ins/help/meson.build
@@ -22,9 +22,6 @@ help = executable('help',
     libgimpui,
     libgimpwidgets,
   ],
-  c_args: [
-    '-DDATADIR="' + join_paths(prefix, gimpdatadir) + '"',
-  ],
   install: true,
   install_dir: join_paths(gimpplugindir, 'plug-ins'),
 )
diff --git a/plug-ins/pygimp/meson.build b/plug-ins/pygimp/meson.build
index 6064194..7297146 100644
--- a/plug-ins/pygimp/meson.build
+++ b/plug-ins/pygimp/meson.build
@@ -81,7 +81,6 @@ foreach pylib : python_so_libs
       gdk_pixbuf, gegl,
     ],
     link_with: pylib[3],
-    c_args: [ '-DGETTEXT_PACKAGE="' + gettext_package + '"', ],
     name_prefix: '',
     install: true,
     install_dir: join_paths(gimpplugindir, 'python'),
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e841daf..731dd14 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -102,7 +102,7 @@ AM_CPPFLAGS = \
        -DBINDIR=\""$(bindir)"\"                                \
        -DSBINDIR=\""$(sbindir)"\"                              \
        -DLIBEXECDIR=\""$(libexecdir)"\"                        \
-       -DDATADIR=\""$(datadir)"\"                              \
+       -DSYSDATADIR=\""$(datadir)"\"                           \
        -DDATAROOTDIR=\""$(datarootdir)"\"                      \
        -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
        -DSHAREDSTATEDIR=\""$(sharedstatedir)"\"                \
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 08fc6df..8470560 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -76,7 +76,7 @@ static struct {
   { "bindir",         BINDIR         },
   { "sbindir",        SBINDIR        },
   { "libexecdir",     LIBEXECDIR     },
-  { "datadir",        DATADIR        },
+  { "datadir",        SYSDATADIR     },
   { "datarootdir",    DATAROOTDIR    },
   { "sysconfdir",     SYSCONFDIR     },
   { "sharedstatedir", SHAREDSTATEDIR },
diff --git a/tools/meson.build b/tools/meson.build
index 76b42cd..e846f9e 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -4,33 +4,6 @@ if platform_win32
 endif
 
 
-
-tools_cflags = [
-  '-DGIMP_APP_VERSION='    +'"'+ app_version                                    +'"',
-  '-DGIMP_PLUGIN_VERSION=' +'"'+ api_version                                    +'"',
-
-  '-DCC='                  +'"'+ cc.get_id()                                    +'"',
-
-  '-DPREFIX='              +'"'+ prefix                                         +'"',
-  '-DEXEC_PREFIX='         +'"'+ prefix                                         +'"',
-  '-DBINDIR='              +'"'+ join_paths(prefix, get_option('bindir'))       +'"',
-  '-DDATADIR='             +'"'+ join_paths(prefix, get_option('datadir'))      +'"',
-  '-DDATAROOTDIR='         +'"'+ join_paths(prefix, get_option('datadir'))      +'"',
-  '-DGIMPDATADIR='         +'"'+ join_paths(prefix, gimpdatadir)                +'"',
-  '-DGIMPDIR='             +'"'+ gimpdir                                        +'"',
-  '-DGIMPPLUGINDIR='       +'"'+ join_paths(prefix, gimpplugindir)              +'"',
-  '-DINFODIR='             +'"'+ join_paths(prefix, get_option('infodir'))      +'"',
-  '-DLIBDIR='              +'"'+ join_paths(prefix, get_option('libdir'))       +'"',
-  '-DLIBEXECDIR='          +'"'+ join_paths(prefix, get_option('libexecdir'))   +'"',
-  '-DLOCALEDIR='           +'"'+ join_paths(prefix, localedir)                  +'"',
-  '-DMANDIR='              +'"'+ join_paths(prefix, get_option('mandir'))       +'"',
-  '-DSBINDIR='             +'"'+ join_paths(prefix, get_option('sbindir'))      +'"',
-  '-DLOCALSTATEDIR='       +'"'+ get_option('localstatedir')                    +'"',
-  '-DSHAREDSTATEDIR='      +'"'+ get_option('sharedstatedir')                   +'"', # HUH ? /usr/com
-  '-DSYSCONFDIR='          +'"'+ get_option('sysconfdir')                       +'"',
-]
-
-
 gimptool = executable('gimptool-2.0',
   'gimptool.c',
 
@@ -41,7 +14,6 @@ gimptool = executable('gimptool-2.0',
   link_with: [
     libgimpbase,
   ],
-  c_args: tools_cflags,
   install: true,
 )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]