Removed include_directories hackery, as suggested by various people in freenode #mesonbuild.

common/meson.build

@@ -15,5 +15,3 @@ libui_sources += [
 	'common/userbugs.c',
 	'common/utf.c',
 ]
-
-libui_include_directories += [include_directories('.')]

darwin/meson.build

@@ -52,8 +52,6 @@ libui_sources += [
 	'darwin/winmoveresize.m',
 ]
 
-libui_include_directories += [include_directories('.')]
-
 libui_deps += [dependency('appleframeworks',
 	modules: ['Foundation', 'AppKit'],
 	required: true)]

examples/meson.build

@@ -1,7 +1,5 @@
 # 24 march 2019
 
-libui_example_include_directories = libui_base_include_directories + [include_directories('.')]
-
 libui_example_sources = []
 libui_example_link_args = []
 libui_example_cpp_extra_args = []
@@ -13,8 +11,7 @@ if libui_OS == 'windows'
 	libui_example_sources += [
 		windows.compile_resources('resources.rc',
 			args: libui_manifest_args,
-			depend_files: [libui_example_manifest],
+			depend_files: [libui_example_manifest]),
-			include_directories: libui_example_include_directories),
 	]
 	# because Microsoft's toolchain is dumb
 	if libui_MSVC
@@ -54,7 +51,6 @@ libui_examples = {
 }
 foreach name, args : libui_examples
 	executable(name, args['sources'] + libui_example_sources,
-		include_directories: libui_example_include_directories,
 		dependencies: args.get('deps', []) + libui_binary_deps,
 		link_with: libui_libui,
 		cpp_args: args.get('cpp_args', []),

meson.build

@@ -129,8 +129,6 @@ if libui_mode == 'static'
 endif
 
 libui_sources = []
-libui_base_include_directories = [include_directories('.')]
-libui_include_directories = libui_base_include_directories
 libui_deps = []
 libui_soversion = ''
 libui_rpath = ''
@@ -147,7 +145,6 @@ else
 endif
 # TODO make sure the name is always libui.(something) regardless of the OS or build type
 libui_libui = library('ui', libui_sources,
-	include_directories: libui_include_directories,
 	dependencies: libui_deps,
 	build_rpath: libui_rpath,
 	install_rpath: libui_rpath,

test/meson.build

@@ -27,8 +27,6 @@ libui_test_sources = [
 	'spaced.c',
 ]
 
-libui_test_include_directories = libui_base_include_directories + [include_directories('.')]
-
 if libui_OS == 'windows'
 	libui_test_manifest = 'test.manifest'
 	if libui_mode == 'static'
@@ -37,14 +35,12 @@ if libui_OS == 'windows'
 	libui_test_sources += [
 		windows.compile_resources('resources.rc',
 			args: libui_manifest_args,
-			depend_files: [libui_test_manifest],
+			depend_files: [libui_test_manifest]),
-			include_directories: libui_test_include_directories),
 	]
 endif
 
 # TODO meson doesn't let us name this target test, but also doesn't seem to provide a way to override the executable name????
 executable('tester', libui_test_sources,
-	include_directories: libui_test_include_directories,
 	dependencies: libui_binary_deps,
 	link_with: libui_libui,
 	build_by_default: false,

unix/meson.build

@@ -47,8 +47,6 @@ libui_sources += [
 	'unix/window.c',
 ]
 
-libui_include_directories += [include_directories('.')]
-
 libui_deps += [
 	dependency('gtk+-3.0',
 		version: '>=3.10.0',

windows/meson.build

@@ -66,8 +66,6 @@ libui_sources += [
 	'windows/winutil.cpp',
 ]
 
-libui_include_directories += [include_directories('.')]
-
 # resources.rc only contains the libui manifest.
 # For a DLL, we have to include this directly, so we do so.
 # Windows won't link resources in static libraries, so including this would have no effect.
@@ -79,7 +77,6 @@ if libui_mode == 'shared'
 		windows.compile_resources('resources.rc',
 			args: libui_manifest_args,
 			depend_files: ['libui.manifest'],
-			include_directories: libui_include_directories),
 	]
 endif