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

This allows C:tboxlibint to be removed from our command line include path.
!NoChange
---
 Makefile    |  2 +-
 c/auxiliary | 26 +++++++++++++-------------
 c/create    | 16 ++++++++--------
 c/delete    | 16 ++++++++--------
 c/events    | 18 +++++++++---------
 c/getstate  | 15 +++++++--------
 c/hide      | 16 ++++++++--------
 c/main      | 22 +++++++++++-----------
 c/miscop    | 16 ++++++++--------
 c/show      | 16 ++++++++--------
 c/task      | 16 ++++++++--------
 h/auxiliary |  8 ++++----
 h/task      |  4 ++--
 13 files changed, 95 insertions(+), 96 deletions(-)

diff --git a/Makefile b/Makefile
index a567def..4464dad 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 c4b46da..66a4ffa 100644
--- a/c/auxiliary
+++ b/c/auxiliary
@@ -26,19 +26,19 @@
 #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 "os.h"
-#include "style.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.h"
-#include "objects.menu.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/os.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/create b/c/create
index fe9aec0..a623d2b 100644
--- a/c/create
+++ b/c/create
@@ -26,14 +26,14 @@
 #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 "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/delete b/c/delete
index a5c060d..60af03b 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 "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/events b/c/events
index 927c273..0f78c7f 100644
--- a/c/events
+++ b/c/events
@@ -27,15 +27,15 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.h"
-#include "objects.menu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/getstate b/c/getstate
index 77cc182..36316ed 100644
--- a/c/getstate
+++ b/c/getstate
@@ -25,14 +25,13 @@
 #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.fontdbox.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 "object.h"
 #include "auxiliary.h"
diff --git a/c/hide b/c/hide
index 0a8594b..a9a354b 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 "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/main b/c/main
index 761b6a7..aee601f 100644
--- a/c/main
+++ b/c/main
@@ -26,17 +26,17 @@
 #include "swis.h"
 #include "Global/Services.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "rmensure.h"
-#include "mem.h"
-#include "os.h"
-#include "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.h"
-#include "objmodule.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/os.h"
+#include "tboxlibint/string32.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
+#include "tboxlibint/objmodule.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/miscop b/c/miscop
index 036ba0f..b7024f6 100644
--- a/c/miscop
+++ b/c/miscop
@@ -26,14 +26,14 @@
 #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 "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 
 #include "object.h"
diff --git a/c/show b/c/show
index f1d88b6..90fc8f7 100644
--- a/c/show
+++ b/c/show
@@ -26,14 +26,14 @@
 #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 "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/task b/c/task
index f61f59c..a528079 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 "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/h/auxiliary b/h/auxiliary
index 1380a5f..3f2baa3 100644
--- a/h/auxiliary
+++ b/h/auxiliary
@@ -18,19 +18,19 @@
 #include "kernel.h"
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __fontmenu_h
-#include "objects.fontmenu.h"
+#include "tboxlibint/objects/fontmenu.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/task b/h/task
index babc94c..ed5f4aa 100644
--- a/h/task
+++ b/h/task
@@ -23,11 +23,11 @@
 #define __task_h
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __fontmenu_h
-#include "objects.fontmenu.h"
+#include "tboxlibint/objects/fontmenu.h"
 #endif
 
 #ifndef __object_h
-- 
GitLab