From 5ea229d26158d8176c276bf6905762e316d2face Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 9 Feb 2023 11:20:16 +1000
Subject: [PATCH] meson.build: switch the src include dir to the proper meson
 way

---
 meson.build | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index 404b592..bbc8d1a 100644
--- a/meson.build
+++ b/meson.build
@@ -43,6 +43,8 @@ endif
 
 add_project_arguments(cc.get_supported_arguments(cflags), language: 'c')
 
+inc_src = include_directories('src')
+
 protocol_version = 1
 
 config_h = configuration_data()
@@ -110,7 +112,7 @@ lib_libei = shared_library('ei',
 install_headers('src/libei.h')
 
 dep_libei = declare_dependency(link_with: lib_libei,
-                                include_directories: 'src')
+                                include_directories: [inc_src])
 meson.override_dependency('libei', dep_libei)
 
 pkgconfig.generate(lib_libei,
@@ -151,7 +153,7 @@ lib_libeis = shared_library('eis',
 install_headers('src/libeis.h')
 
 dep_libeis = declare_dependency(link_with: lib_libeis,
-                                include_directories: 'src')
+                                include_directories: [inc_src])
 meson.override_dependency('libeis', dep_libeis)
 
 pkgconfig.generate(lib_libeis,
@@ -172,12 +174,12 @@ lib_libreis = shared_library('reis',
     dependencies: [dep_libutil, dep_protobuf],
     gnu_symbol_visibility: 'hidden',
     install: true,
-    include_directories: 'src',
+    include_directories: [inc_src],
 )
 install_headers('src/libreis.h')
 
 dep_libreis = declare_dependency(link_with: lib_libreis,
-                                include_directories: 'src')
+                                include_directories: [inc_src])
 meson.override_dependency('libreis', dep_libreis)
 
 pkgconfig.generate(lib_libreis,
@@ -240,7 +242,7 @@ if build_oeffis
     install_headers('src/liboeffis.h')
 
     dep_liboeffis = declare_dependency(link_with: lib_liboeffis,
-                                       include_directories: 'src')
+                                       include_directories: [inc_src])
     meson.override_dependency('liboeffis', dep_liboeffis)
 
     pkgconfig.generate(lib_liboeffis,
@@ -277,7 +279,7 @@ if get_option('tests')
         executable('unit-tests-utils',
                     'test/unit-tests.c',
                     src_libutil,
-                    include_directories: 'src',
+                    include_directories: [inc_src],
                     c_args: ['-D_enable_tests_'],
                     dependencies: [dep_unittest]))
 
@@ -285,7 +287,7 @@ if get_option('tests')
         executable('unit-tests-ei',
                     'test/unit-tests.c',
                     src_libei,
-                    include_directories: 'src',
+                    include_directories: [inc_src],
                     c_args: ['-D_enable_tests_'],
                     dependencies: deps_libei + [dep_unittest]))
 
@@ -293,7 +295,7 @@ if get_option('tests')
         executable('unit-tests-eis',
                     'test/unit-tests.c',
                     src_libeis,
-                    include_directories: 'src',
+                    include_directories: [inc_src],
                     c_args: ['-D_enable_tests_'],
                     dependencies: [dep_unittest, dep_libutil, dep_protobuf]))
 
@@ -302,7 +304,7 @@ if get_option('tests')
             executable('unit-tests-oeffis',
                         'test/unit-tests.c',
                         src_liboeffis,
-                        include_directories: 'src',
+                        include_directories: [inc_src],
                         c_args: ['-D_enable_tests_'],
                         dependencies: deps_liboeffis + [dep_unittest]))
 
@@ -322,7 +324,7 @@ if get_option('tests')
     lib_eierpecken = static_library('eierpecken',
                                     'test/eierpecken.h',
                                     'test/eierpecken.c',
-                                    include_directories: 'src',
+                                    include_directories: [inc_src],
                                     dependencies: [munit, dep_libutil, dep_libei, dep_libeis, dep_libreis],
     )
 
@@ -354,21 +356,21 @@ if get_option('tests')
     executable('test-build-libei',
         'test/buildtest.c',
         dependencies : [dep_libei],
-        include_directories : 'src',
+        include_directories : [inc_src],
         c_args : ['-Werror', '-DINCLUDE_LIBEI=1'],
         install : false)
 
     executable('test-build-libeis',
         'test/buildtest.c',
         dependencies : [dep_libeis],
-        include_directories : 'src',
+        include_directories : [inc_src],
         c_args : ['-Werror', '-DINCLUDE_LIBEIS=1'],
         install : false)
 
     executable('test-build-libreis',
         'test/buildtest.c',
         dependencies : [dep_libreis],
-        include_directories : 'src',
+        include_directories : [inc_src],
         c_args : ['-Werror', '-DINCLUDE_LIBREIS=1'],
         install : false)
 
@@ -376,7 +378,7 @@ if get_option('tests')
         executable('test-build-cxx',
                 'test/buildtest.cc',
                 dependencies: [dep_libei, dep_libeis],
-                include_directories: 'src',
+                include_directories: [inc_src],
                 install: false)
     endif
 endif # tests