lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

meson: remove the ability to use unqualified includes from inside Lix

Browse source 
These are still supported externally with pkg-config, but this commit
ensures they no longer build internally.

Change-Id: I2fa38f85e43b18f1f1dbcfdb0367de8f192aca2c
This commit is contained in:
jade 2024-11-12 15:26:51 -08:00
parent 103cd44a04
commit 13f54451e6
6 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libcmd/meson.build
View file

@ -71,8 +71,7 @@ custom_target(
)
liblixcmd = declare_dependency(
# FIXME(jade): remove old '.' include directory
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
link_with : libcmd,
)

6
src/libexpr/meson.build
View file

@ -278,7 +278,6 @@ libexpr = library(
],
# for shared.hh
include_directories : [
'../',
'../libmain',
],
cpp_pch : cpp_pch,
@ -294,8 +293,7 @@ install_headers(
)
liblixexpr = declare_dependency(
# FIXME(jade): remove old '.' include directory
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : libexpr_settings_header,
link_with : libexpr,
)
@ -303,7 +301,7 @@ liblixexpr = declare_dependency(
# FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed.
if is_static
liblixexpr_mstatic = declare_dependency(
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : libexpr_settings_header,
link_whole : libexpr,
)

4
src/libfetchers/meson.build
View file

@ -79,7 +79,7 @@ configure_file(
)
liblixfetchers = declare_dependency(
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : libfetchers_settings_header,
link_with : libfetchers,
)
@ -87,7 +87,7 @@ liblixfetchers = declare_dependency(
# FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed.
if is_static
liblixfetchers_mstatic = declare_dependency(
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : libfetchers_settings_header,
link_whole : libfetchers,
)

2
src/libmain/meson.build
View file

@ -32,7 +32,7 @@ libmain = library(
install_headers(libmain_headers, subdir : 'lix/libmain', preserve_path : true)
liblixmain = declare_dependency(
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
link_with : libmain,
)

5
src/libstore/meson.build
View file

@ -362,8 +362,7 @@ install_headers(libstore_headers, subdir : 'lix/libstore', preserve_path : true)
# Used by libfetchers.
liblixstore = declare_dependency(
# FIXME(jade): remove old '.' include directory
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : libstore_settings_headers,
link_with : libstore,
)
@ -371,7 +370,7 @@ liblixstore = declare_dependency(
# FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed.
if is_static
liblixstore_mstatic = declare_dependency(
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : libstore_settings_headers,
link_whole : libstore,
)

5
src/libutil/meson.build
View file

@ -316,8 +316,7 @@ configure_file(
# Used by libstore and libfetchers.
liblixutil = declare_dependency(
# FIXME(jade): remove old "." include-dir
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : [
experimental_features_header,
deprecated_features_header,
@ -329,7 +328,7 @@ liblixutil = declare_dependency(
# FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed.
if is_static
liblixutil_mstatic = declare_dependency(
include_directories : include_directories('.', '../include'),
include_directories : include_directories('../include'),
sources : [
experimental_features_header,
deprecated_features_header,