From 345eb82fac8ab8a7bf86797ccae1a02fa1ec26e2 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@riscosopen.org>
Date: Thu, 12 Jan 2023 14:15:43 +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/create   | 20 ++++++++++----------
 c/delete   | 16 ++++++++--------
 c/events   | 24 ++++++++++++------------
 c/getstate | 14 +++++++-------
 c/globals  | 18 +++++++++---------
 c/hide     | 16 ++++++++--------
 c/main     | 22 +++++++++++-----------
 c/miscop   | 20 ++++++++++----------
 c/show     | 18 +++++++++---------
 c/task     | 16 ++++++++--------
 h/globals  |  2 +-
 h/object   |  4 ++--
 13 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/Makefile b/Makefile
index fea3272..606a2ef 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/create b/c/create
index ead57c8..3ec9b45 100644
--- a/c/create
+++ b/c/create
@@ -28,16 +28,16 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "style.h"
-#include "messages.h"
-#include "string32.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/string32.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/delete b/c/delete
index 71b4617..7a2e9fb 100644
--- a/c/delete
+++ b/c/delete
@@ -26,14 +26,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/iconbar.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/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/events b/c/events
index d7416d6..839d296 100644
--- a/c/events
+++ b/c/events
@@ -30,18 +30,18 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "twimp.h"
-#include "style.h"
-#include "messages.h"
-#include "string32.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
-#include "objects/menu.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/string32.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
+#include "tboxlibint/objects/menu.h"
 
 
 
diff --git a/c/getstate b/c/getstate
index 343cfb1..12c8569 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 "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
 
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/globals b/c/globals
index 9bccaf9..78856e6 100644
--- a/c/globals
+++ b/c/globals
@@ -20,15 +20,15 @@
  */
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "twimp.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/twimp.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "globals.h"
 
diff --git a/c/hide b/c/hide
index b3b5b20..8b221ea 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/iconbar.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/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/main b/c/main
index 21591e9..57bf717 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 "mem.h"
-#include "messages.h"
-#include "rmensure.h"
-#include "objmodule.h"
-
-#include "objects/toolbox.h"
-#include "string32.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/objmodule.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/string32.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "create.h"
 #include "delete.h"
diff --git a/c/miscop b/c/miscop
index a76fb40..901eb79 100644
--- a/c/miscop
+++ b/c/miscop
@@ -26,16 +26,16 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "twimp.h"
-#include "messages.h"
-#include "string32.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/string32.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/show b/c/show
index 417c3ac..6e21f5a 100644
--- a/c/show
+++ b/c/show
@@ -25,15 +25,15 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "twimp.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/task b/c/task
index 29eed2c..53bb0d6 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/iconbar.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/iconbar.h"
 
 #include "object.h"
 
diff --git a/h/globals b/h/globals
index 69d104f..a56b235 100644
--- a/h/globals
+++ b/h/globals
@@ -24,7 +24,7 @@
 
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 extern EventInterest   messages_of_interest[];
diff --git a/h/object b/h/object
index cefca59..ae129cb 100644
--- a/h/object
+++ b/h/object
@@ -24,11 +24,11 @@
 #define __object_h
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __wimp_h
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #endif
 
 typedef struct object
-- 
GitLab