[eog] build: Fix compiler flags
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] build: Fix compiler flags
- Date: Mon, 5 Mar 2018 21:27:41 +0000 (UTC)
commit 9ce1df2230b638473adfdc28f8a1ae0f2222cc1a
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Feb 22 13:15:24 2018 +0100
build: Fix compiler flags
The compiler flags used for the shared library and the executable
are different.
They have been modified so now only those that are necessary are
added to each targets.
https://bugzilla.gnome.org/show_bug.cgi?id=793719
src/meson.build | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index d18a8ab..179b506 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,10 +1,5 @@
src_inc = include_directories('.')
-cflags = [
- '-DEOG_DATA_DIR="@0@"'.format(eog_datadir),
- '-DEOG_LOCALE_DIR="@0@"'.format(eog_localedir)
-]
-
enum_headers = files(
'eog-scroll-view.h',
'eog-window.h'
@@ -137,10 +132,10 @@ deps = common_deps + [
cc.find_library('m')
]
-libeog_cflags = cflags + [
- '-DEOG_PLUGIN_DIR="@0@"'.format(eog_pluginsdir),
- '-DEOG_PREFIX="@0@"'.format(eog_prefix),
+cflags = [
'-DG_LOG_DOMAIN="@0@"'.format(meson.project_name().to_upper()),
+ '-DEOG_DATA_DIR="@0@"'.format(eog_datadir),
+ '-DEOG_PLUGIN_DIR="@0@"'.format(eog_pluginsdir),
'-DLIBDIR="@0@"'.format(eog_libdir)
]
@@ -168,7 +163,7 @@ libeog = shared_library(
sources: sources,
include_directories: top_inc,
dependencies: deps,
- c_args: libeog_cflags,
+ c_args: cflags,
link_args: ldflags,
link_depends: symbol_map,
install: true,
@@ -197,6 +192,11 @@ pkg.generate(
deps = [libeog_dep]
+cflags = [
+ '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name().to_upper()),
+ '-DEOG_LOCALE_DIR="@0@"'.format(eog_localedir)
+]
+
if enable_introspection
deps += gir_dep
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]