walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: rename incbase to incconfig 

Makes it clearer what it's for: config.h. See #4.
This commit is contained in:
Tim-Philipp Müller 2018-11-14 20:19:36 +00:00 committed by Ebrahim Byagowi
parent 14b5c774c2
commit 618584e923
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -55,7 +55,7 @@ endif
deps = [] deps = []
conf = configuration_data() conf = configuration_data()
incbase = include_directories('.') incconfig = include_directories('.')
cpp_args = ['-DHAVE_CONFIG_H'] cpp_args = ['-DHAVE_CONFIG_H']
warn_cflags = [ warn_cflags = [

6
src/meson.build
View File

@ -192,7 +192,7 @@ harfbuzz_def = custom_target('harfbuzz.def',
version = '0.' + '0'.join(meson.project_version().split('.')) + '.0' version = '0.' + '0'.join(meson.project_version().split('.')) + '.0'
libharfbuzz = library('harfbuzz', hb_sources, libharfbuzz = library('harfbuzz', hb_sources,
include_directories: [incbase, incucdn], include_directories: [incconfig, incucdn],
dependencies: deps, dependencies: deps,
cpp_args: cpp_args, cpp_args: cpp_args,
vs_module_defs: harfbuzz_def, vs_module_defs: harfbuzz_def,
@ -213,7 +213,7 @@ harfbuzz_subset_def = custom_target('harfbuzz-subset.def',
output: 'harfbuzz-subset.def') output: 'harfbuzz-subset.def')
libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
include_directories: incbase, include_directories: incconfig,
link_with: [libharfbuzz], link_with: [libharfbuzz],
cpp_args: cpp_args, cpp_args: cpp_args,
vs_module_defs: harfbuzz_subset_def, vs_module_defs: harfbuzz_subset_def,
@ -284,7 +284,7 @@ if conf.get('HAVE_GOBJECT', 0) == 1
output: 'harfbuzz-gobject.def') output: 'harfbuzz-gobject.def')
libharfbuzz_gobject = library('harfbuzz-gobject', [hb_gobject_sources, enum_c, enum_h], libharfbuzz_gobject = library('harfbuzz-gobject', [hb_gobject_sources, enum_c, enum_h],
include_directories: incbase, include_directories: incconfig,
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz], link_with: [libharfbuzz],
cpp_args: cpp_args, cpp_args: cpp_args,

2
test/api/meson.build
View File

@ -40,7 +40,7 @@ if conf.get('HAVE_GLIB', 0) == 1
test_name = fname.split('.')[0].underscorify() test_name = fname.split('.')[0].underscorify()
exe = executable(test_name, fname, exe = executable(test_name, fname,
cpp_args: cpp_args + extra_c_args, cpp_args: cpp_args + extra_c_args,
include_directories: [incbase, incsrc], include_directories: [incconfig, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz, libharfbuzz_subset], link_with: [libharfbuzz, libharfbuzz_subset],
) )

2
test/fuzzing/meson.build
View File

@ -10,7 +10,7 @@ foreach test_data : tests
exe = executable(test_name, [fname, 'main.cc'], exe = executable(test_name, [fname, 'main.cc'],
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incconfig, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz, libharfbuzz_subset], link_with: [libharfbuzz, libharfbuzz_subset],
) )

8
util/meson.build
View File

@ -27,7 +27,7 @@ if conf.get('HAVE_GLIB', 0) == 1
hb_view = executable('hb-view', hb_view_sources, hb_view = executable('hb-view', hb_view_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incconfig, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz], link_with: [libharfbuzz],
install: true, install: true,
@ -36,7 +36,7 @@ if conf.get('HAVE_GLIB', 0) == 1
hb_shape = executable('hb-shape', hb_shape_sources, hb_shape = executable('hb-shape', hb_shape_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incconfig, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz], link_with: [libharfbuzz],
install: true, install: true,
@ -44,7 +44,7 @@ if conf.get('HAVE_GLIB', 0) == 1
hb_subset = executable('hb-subset', hb_subset_cli_sources, hb_subset = executable('hb-subset', hb_subset_cli_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incconfig, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz, libharfbuzz_subset], link_with: [libharfbuzz, libharfbuzz_subset],
install: true, install: true,
@ -52,7 +52,7 @@ if conf.get('HAVE_GLIB', 0) == 1
hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources, hb_ot_shape_closure = executable('hb-ot-shape-closure', hb_ot_shape_closure_sources,
cpp_args: cpp_args, cpp_args: cpp_args,
include_directories: [incbase, incsrc], include_directories: [incconfig, incsrc],
dependencies: deps, dependencies: deps,
link_with: [libharfbuzz], link_with: [libharfbuzz],
install: true, install: true,