From 600f6bfec4e87df2aeb9a01c71e157bd604c4289 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 11 Aug 2022 13:18:28 +0200
Subject: [PATCH] chore(linux): update include paths

---
 docs/settings/linux/c_cpp_properties.json | 2 +-
 docs/settings/linux/tasks.json            | 2 +-
 linux/debian/rules                        | 2 +-
 linux/ibus-keyman/README.md               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/settings/linux/c_cpp_properties.json b/docs/settings/linux/c_cpp_properties.json
index f6b6a18a49..ce69ca56e3 100644
--- a/docs/settings/linux/c_cpp_properties.json
+++ b/docs/settings/linux/c_cpp_properties.json
@@ -2,7 +2,7 @@
   "configurations": [
     {
       "name": "linux",
-      "includePath": ["${workspaceFolder}/core/include/**"],
+      "includePath": ["${workspaceFolder}/core/include/**", "${workspaceFolder}/common/include/**"],
       "defines": [],
       "compilerPath": "/usr/lib/ccache/clang",
       "cStandard": "c11",
diff --git a/docs/settings/linux/tasks.json b/docs/settings/linux/tasks.json
index 51fe4d34ea..7beff2efe8 100644
--- a/docs/settings/linux/tasks.json
+++ b/docs/settings/linux/tasks.json
@@ -66,7 +66,7 @@
       "label": "ibus-keyman: configure",
       "command": "./configure",
       "args": [
-        "CPPFLAGS=\"-DG_MESSAGES_DEBUG -I${workspaceFolder}/core/build/arch/debug/include/ -I${workspaceFolder}/core/include/\"",
+        "CPPFLAGS=\"-DG_MESSAGES_DEBUG -I${workspaceFolder}/core/build/arch/debug/include/ -I${workspaceFolder}/common/include/ -I${workspaceFolder}/core/include/\"",
         "CFLAGS=\"-g -O0\"",
         "CXXFLAGS=\"-g -O0\"",
         "KEYMAN_PROC_LIBS=\"-L${workspaceFolder}/common/core/desktop/build/arch/debug/src -lkmnkbp0\"",
diff --git a/linux/debian/rules b/linux/debian/rules
index 87c36e453d..5e2f0a8685 100755
--- a/linux/debian/rules
+++ b/linux/debian/rules
@@ -26,7 +26,7 @@ override_dh_auto_configure:
 	# ibus-keyman
 	cd linux/ibus-keyman && \
 		cp -f ../../VERSION.md VERSION && \
-		export KEYMAN_PROC_CFLAGS="-I$(CURDIR)/core/build/arch/release/include -I$(CURDIR)/core/include" && \
+		export KEYMAN_PROC_CFLAGS="-I$(CURDIR)/core/build/arch/release/include -I$(CURDIR)/common/include -I$(CURDIR)/core/include" && \
 		export KEYMAN_PROC_LIBS="-L$(CURDIR)/core/build/arch/release/src -lkmnkbp0" && \
 		export PKG_CONFIG_PATH=$(CURDIR)/core/build/arch/release/meson-private && \
 		./autogen.sh && \
diff --git a/linux/ibus-keyman/README.md b/linux/ibus-keyman/README.md
index 4f615d554f..b22ccc3429 100644
--- a/linux/ibus-keyman/README.md
+++ b/linux/ibus-keyman/README.md
@@ -24,6 +24,6 @@ For a debug build:
 To use the header files from the source repo, you need to specify paths to the include files in core:
 
 ```bash
-./configure CPPFLAGS="-DG_MESSAGES_DEBUG -I../../core/build/arch/debug/include/ -I../../core/include/" \
+./configure CPPFLAGS="-DG_MESSAGES_DEBUG -I../../core/build/arch/debug/include/ -I../../common/include/ -I../../core/include/" \
   CFLAGS="-g -O0" CXXFLAGS="-g -O0"
 ```