From f89db3781d919446d8eecaf5c89fbb03c96f34e6 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Thu, 12 Jan 2023 14:23:17 +0000
Subject: [PATCH] Make tboxlibint path explicit in #includes

This allows C:tboxlibint to be removed from our command line include path.
Requires RiscOS/Sources/Toolbox/tboxlib!2
!NoTag
---
 Makefile    |  2 +-
 c/auxiliary | 24 ++++++++++++------------
 c/create    | 20 ++++++++++----------
 c/delete    | 16 ++++++++--------
 c/events    | 18 +++++++++---------
 c/getstate  | 16 ++++++++--------
 c/hide      | 16 ++++++++--------
 c/main      | 20 ++++++++++----------
 c/miscop    | 18 +++++++++---------
 c/show      | 18 +++++++++---------
 c/task      | 16 ++++++++--------
 h/auxiliary |  8 ++++----
 h/object    |  2 +-
 13 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/Makefile b/Makefile
index a5d6828..2df9ad5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CMHGDEPENDS   = main
 ROMCDEFINES   = -DROM
 CDFLAGS       = -Ddebugging=1
 CMHGDFLAGS    = -Ddebugging=1
-CINCLUDES     = -IC:tboxlibint,tbox:,C:
+CINCLUDES     = -Itbox:,C:
 HDRS          =
 LIBS          = ${TBOXINTLIB}
 DBG_LIBS      = ${TBOXINTDBGLIB}
diff --git a/c/auxiliary b/c/auxiliary
index 7e125ec..2b6dacb 100644
--- a/c/auxiliary
+++ b/c/auxiliary
@@ -26,18 +26,18 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-#include "twimp.h"
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/string32.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/create b/c/create
index 86c6722..a69e047 100644
--- a/c/create
+++ b/c/create
@@ -27,16 +27,16 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "objsupport.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objsupport.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/delete b/c/delete
index b20c34d..7ae67f4 100644
--- a/c/delete
+++ b/c/delete
@@ -25,14 +25,14 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/events b/c/events
index 2d88de1..985d3e1 100644
--- a/c/events
+++ b/c/events
@@ -26,15 +26,15 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/getstate b/c/getstate
index 50dbab5..9288ada 100644
--- a/c/getstate
+++ b/c/getstate
@@ -25,14 +25,14 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/hide b/c/hide
index 99d6bab..55a05cf 100644
--- a/c/hide
+++ b/c/hide
@@ -25,14 +25,14 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/main b/c/main
index 014d5e7..08c255f 100644
--- a/c/main
+++ b/c/main
@@ -26,16 +26,16 @@
 #include "swis.h"
 #include "Global/Services.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "rmensure.h"
-#include "mem.h"
-#include "messages.h"
-#include "objmodule.h"
-
-#include "objects.toolbox.h"
-#include "objects.scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objmodule.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "object.h"
 #include "create.h"
diff --git a/c/miscop b/c/miscop
index 13cc54b..342dcf9 100644
--- a/c/miscop
+++ b/c/miscop
@@ -25,15 +25,15 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/show b/c/show
index dee13dc..2ef6e88 100644
--- a/c/show
+++ b/c/show
@@ -26,15 +26,15 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/task b/c/task
index 88ae4e9..0196b74 100644
--- a/c/task
+++ b/c/task
@@ -26,14 +26,14 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/h/auxiliary b/h/auxiliary
index 2946192..bcf6d7a 100644
--- a/h/auxiliary
+++ b/h/auxiliary
@@ -26,19 +26,19 @@
 #include "kernel.h"
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __scale_h
-#include "objects.scale.h"
+#include "tboxlibint/objects/scale.h"
 #endif
 
 #ifndef __wimp_h
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #endif
 
 #ifndef __mem_h
-#include "mem.h"
+#include "tboxlibint/mem.h"
 #endif
 
 #include "object.h"
diff --git a/h/object b/h/object
index 9e08a22..1c2c4d8 100644
--- a/h/object
+++ b/h/object
@@ -25,7 +25,7 @@
 
 
 #ifndef __window_h
-#include "objects.window.h"
+#include "tboxlibint/objects/window.h"
 #endif
 
 typedef struct _coords {
-- 
GitLab