From 13f54451e639608c7af54fc9f46850c49ae35eec Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Tue, 12 Nov 2024 15:26:51 -0800
Subject: [PATCH] meson: remove the ability to use unqualified includes from
 inside Lix

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

Change-Id: I2fa38f85e43b18f1f1dbcfdb0367de8f192aca2c
---
 src/libcmd/meson.build      | 3 +--
 src/libexpr/meson.build     | 6 ++----
 src/libfetchers/meson.build | 4 ++--
 src/libmain/meson.build     | 2 +-
 src/libstore/meson.build    | 5 ++---
 src/libutil/meson.build     | 5 ++---
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
index dd66cf3fa..65d06a9ed 100644
--- a/src/libcmd/meson.build
+++ b/src/libcmd/meson.build
@@ -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,
 )
 
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index 3efdca022..0d5031ad3 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -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,
   )
diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build
index 3d06eebd4..5731d1406 100644
--- a/src/libfetchers/meson.build
+++ b/src/libfetchers/meson.build
@@ -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,
   )
diff --git a/src/libmain/meson.build b/src/libmain/meson.build
index 35633b611..ba5b48ba3 100644
--- a/src/libmain/meson.build
+++ b/src/libmain/meson.build
@@ -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,
 )
 
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index 4c9ce5c63..207d9c8d9 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -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,
   )
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index cd46f512a..b1b8742da 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -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,