Make tboxlibint path explicit in #includes

This allows C:tboxlibint to be removed from our command line include path.
Requires tboxlib!2

Version 0.19. Not tagged

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}

VersionNum

 /* (0.19)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
- * Last processed by srccommit version: 1.1.
  *
  */
 #define Module_MajorVersion_CMHG        0.19
-#define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                18 Aug 2015
+#define Module_MinorVersion_CMHG
+#define Module_Date_CMHG                25 Jan 2023
 
 #define Module_MajorVersion             "0.19"
 #define Module_Version                  19
 #define Module_MinorVersion             ""
-#define Module_Date                     "18 Aug 2015"
+#define Module_Date                     "25 Jan 2023"
 
-#define Module_ApplicationDate          "18-Aug-15"
+#define Module_ApplicationDate          "25-Jan-23"
 
 #define Module_ComponentName            "ProgInfo"
-#define Module_ComponentPath            "castle/RiscOS/Sources/Toolbox/ProgInfo"
 
 #define Module_FullVersion              "0.19"
-#define Module_HelpVersion              "0.19 (18 Aug 2015)"
+#define Module_HelpVersion              "0.19 (25 Jan 2023)"
 #define Module_LibraryVersionInfo       "0:19"

c/auxiliary

@@ -26,17 +26,17 @@
 #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/proginfo.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/proginfo.h"
 
 #include "auxiliary.h"
 #include "object.h"

c/create

@@ -26,16 +26,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 "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objsupport.h"
 
-#include "objects/toolbox.h"
-#include "objects/proginfo.h"
-#include "objects/window.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/proginfo.h"
+#include "tboxlibint/objects/window.h"
 
 
 #include "auxiliary.h"
@@ -44,7 +44,7 @@
 
 /* SNB */
 #include "resize.h"
-#include "string32.h"
+#include "tboxlibint/string32.h"
 
 
 #include "create.h"

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/proginfo.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/proginfo.h"
 
 #include "auxiliary.h"
 #include "object.h"

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 "twimp.h"
-
-#include "objects/toolbox.h"
-#include "objects/proginfo.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/proginfo.h"
 
 #include "auxiliary.h"
 #include "object.h"

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/generic.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/generic.h"
 
 #include "object.h"
 #include "auxiliary.h"

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/proginfo.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/proginfo.h"
 
 #include "auxiliary.h"
 #include "object.h"

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 "objects/toolbox.h"
-#include "objects/proginfo.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/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/proginfo.h"
+#include "tboxlibint/objmodule.h"
 
 #include "auxiliary.h"
 #include "object.h"

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 "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/proginfo.h"
-#include "objects/window.h"
-#include "string32.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/proginfo.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/string32.h"
 
 #include "auxiliary.h"
 #include "object.h"

c/resize

@@ -26,16 +26,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/proginfo.h"
-#include "objects/window.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/proginfo.h"
+#include "tboxlibint/objects/window.h"
 
 
 #include "auxiliary.h"

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/proginfo.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/proginfo.h"
 
 #include "auxiliary.h"
 #include "object.h"

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/proginfo.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/proginfo.h"
 
 #include "auxiliary.h"
 #include "object.h"

h/auxiliary

@@ -26,19 +26,19 @@
 #include "kernel.h"
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __proginfo_h
-#include "objects.proginfo.h"
+#include "tboxlibint/objects/proginfo.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 "auxiliary.h"

h/object

@@ -24,7 +24,7 @@
 #define __object_h
 
 #ifndef __window_h
-#include "objects.h.window"
+#include "tboxlibint/objects/window.h"
 #endif
 
 typedef struct _coords {