[libdazzle] build: remove use of -I meson.build_root()



commit 7ce47832a1185ed2e8968c2dbeefffa56adabd76
Author: Christian Hergert <chergert redhat com>
Date:   Thu Feb 7 14:41:26 2019 -0800

    build: remove use of -I meson.build_root()
    
    Fixes #33

 examples/app/example-window.c | 4 +---
 meson.build                   | 1 -
 tests/meson.build             | 7 ++++---
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/examples/app/example-window.c b/examples/app/example-window.c
index 267befd..4e59b65 100644
--- a/examples/app/example-window.c
+++ b/examples/app/example-window.c
@@ -1,5 +1,3 @@
-#include "config.h"
-
 #include <glib/gi18n.h>
 
 #include "example-window.h"
@@ -171,7 +169,7 @@ example_window_init (ExampleWindow *self)
                     G_CALLBACK (on_page_changed),
                     self);
 
-  dzl_shortcut_manager_add_shortcut_entries (NULL, shortcuts, G_N_ELEMENTS (shortcuts), GETTEXT_PACKAGE);
+  dzl_shortcut_manager_add_shortcut_entries (NULL, shortcuts, G_N_ELEMENTS (shortcuts), NULL);
 
   controller = dzl_shortcut_controller_find (GTK_WIDGET (self));
 
diff --git a/meson.build b/meson.build
index be75b96..467b167 100644
--- a/meson.build
+++ b/meson.build
@@ -33,7 +33,6 @@ config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('lo
 add_project_arguments([
   '-DHAVE_CONFIG_H',
   '-DDAZZLE_COMPILATION',
-  '-I' + meson.build_root(),
 ], language: 'c')
 
 root_inc = include_directories('.')
diff --git a/tests/meson.build b/tests/meson.build
index 35d509f..30e325e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -330,9 +330,10 @@ test_list_store_adapter = executable('test-list-store-adapter', 'test-list-store
 test('test-list-store-adapter', test_list_store_adapter, env: test_env)
 
 test_util = executable('test-util', ['test-util.c', '../src/util/dzl-util.c'],
-        c_args: test_cflags,
-     link_args: test_link_args,
-  dependencies: libdazzle_deps + [libdazzle_dep],
+               c_args: test_cflags,
+            link_args: test_link_args,
+  include_directories: [include_directories('.'), root_inc ],
+         dependencies: libdazzle_deps + [libdazzle_dep],
 )
 test('test-util', test_util, env: test_env)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]