!MkClean,fd7

@@ -13,5 +13,5 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine clean COMPONENT=ToolAction
+amu_machine clean
 stripdepnd

!MkTrace,fd7 → !MkDebug,fd7

-| Copyright 2014 Castle Technology Ltd
+| Copyright 2015 Castle Technology Ltd
 |
 | Licensed under the Apache License, Version 2.0 (the "License");
 | you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine trace COMPONENT=ToolAction
+amu_machine debug THROWBACK=-throwback

!MkRam,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine all COMPONENT=ToolAction
\ No newline at end of file
+amu_machine standalone

!MkRom,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine rom COMPONENT=ToolAction
\ No newline at end of file
+amu_machine rom

Makefile

@@ -12,52 +12,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Makefile for a Toolbox Object module
+# Makefile for ToolAction module
 #
-# $Id$
-#
-# Component specific options:
-#
-RAMMESSAGES = o.msgs
-
-COMMON_OBJ = o.modhdr o.toolact o.utils
-
-ROM_OBJS = o.mainROM ${COMMON_OBJ}
-
-RAM_OBJS = o.main ${RAMMESSAGES} ${COMMON_OBJ}
-
-DBG_OBJS = od.main ${RAMMESSAGES} o.modhdr od.toolact od.utils
 
-CINCLUDES = -IOS:
-RAM_DEPEND = h.ToolAction h.modhdr
-ROM_DEPEND = h.ToolAction h.modhdr
+COMPONENT     = ToolAction
+OBJS          = main toolact utils
+CMHGDEPENDS   = main
+ROMCDEFINES   = -DROM
+CINCLUDES     = -IOS:,C:tboxlibint,tbox:,C:
+CUSTOMEXP     = custom
+ROM_DEPEND    = h.ToolAction 
+SA_DEPEND     = h.ToolAction 
+LIBS          = ${TBOXINTLIB}
 
-#
-# Get main rules
-#
-include C:tboxlibint.TboxMake
-
-#
-# Module specific rules:
-#
-resources: resources-messages
-	@echo ${COMPONENT}: resource files copied to Messages module
+include CModule
 
-clean: toolbox-clean
+clean::
 	${RM} h.ToolAction
-	${RM} h.modhdr
 	${RM} hdr.ToolAction
-	${RM} o.ToolAction
-	@echo ${COMPONENT}: cleaned
 
 export: h.ToolAction hdr.ToolAction o.ToolAction
-	${MKDIR} <cexport$dir>.h
-	${MKDIR} <cexport$dir>.o
-	${MKDIR} <export$dir>.Interface2
-	${CP} h.ToolAction   <cexport$dir>.h.ToolAction ${CPFLAGS}
-	${CP} o.ToolAction   <cexport$dir>.o.ToolAction ${CPFLAGS}
-	${CP} hdr.ToolAction <export$dir>.ToolAction    ${CPFLAGS}
-	@echo ${COMPONENT}: export complete
+	${MKDIR} ${CEXPDIR}.h
+	${MKDIR} ${CEXPDIR}.o
+	${MKDIR} ${EXPDIR}.Interface2
+	${CP} h.ToolAction   ${CEXPDIR}.h.ToolAction ${CPFLAGS}
+	${CP} o.ToolAction   ${CEXPDIR}.o.ToolAction ${CPFLAGS}
+	${CP} hdr.ToolAction ${EXPDIR}.Interface2.ToolAction ${CPFLAGS}
+	@echo ${COMPONENT}: header export complete
 
 h.ToolAction: Documents.def.ToolAction
 	${DEFMOD} -h > h.ToolAction < Documents.def.ToolAction
@@ -66,10 +47,10 @@ hdr.ToolAction: Documents.def.ToolAction
 	${DEFMOD} -hdr > hdr.ToolAction < Documents.def.ToolAction
 
 o.ToolAction: Documents.def.ToolAction
+	${MKDIR} o
 	${DEFMOD} -l -o DefMod < Documents.def.ToolAction
 	${AR} -c -o o.ToolAction -via viafile
 	${RM} viafile
-	${WIPE} Defmod ${WFLAGS}
+	${XWIPE} Defmod ${WFLAGS}
 
-#---------------------------------------------------------------------------
 # Dynamic dependencies:

VersionNum

-/* (0.36)
+/* (0.38)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.36
+#define Module_MajorVersion_CMHG        0.38
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                05 Aug 2014
+#define Module_Date_CMHG                20 Mar 2016
 
-#define Module_MajorVersion             "0.36"
-#define Module_Version                  36
+#define Module_MajorVersion             "0.38"
+#define Module_Version                  38
 #define Module_MinorVersion             ""
-#define Module_Date                     "05 Aug 2014"
+#define Module_Date                     "20 Mar 2016"
 
-#define Module_ApplicationDate          "05-Aug-14"
+#define Module_ApplicationDate          "20-Mar-16"
 
 #define Module_ComponentName            "ToolAction"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Toolbox/ToolAction"
 
-#define Module_FullVersion              "0.36"
-#define Module_HelpVersion              "0.36 (05 Aug 2014)"
-#define Module_LibraryVersionInfo       "0:36"
+#define Module_FullVersion              "0.38"
+#define Module_HelpVersion              "0.38 (20 Mar 2016)"
+#define Module_LibraryVersionInfo       "0:38"

c/main

@@ -28,7 +28,7 @@
 #include "os.h"
 #include "resourcefs.h"
 
-#include "modhdr.h"
+#include "ToolActionHdr.h"
 #include "messages.h"
 #include "objmodule.h"
 #include "utils.h"
@@ -36,7 +36,7 @@
 #include "toolact.h"
 
 #ifndef ROM
-extern int messages_file(void); /* From resgen */
+extern int Resources(void); /* From resgen */
 #endif
 
 #undef  Service_WindowModuleStarting
@@ -52,7 +52,7 @@ _kernel_oserror *toolaction_final (int fatal, int podule, void *pw)
 
     e = messages_file_close();
 #ifndef ROM
-    if (!e) e = objmodule_deregister_resources(messages_file());
+    if (!e) e = objmodule_deregister_resources(Resources());
 #endif
 
     toolaction_de_register(ToolAction_ToolAction);
@@ -71,7 +71,7 @@ _kernel_oserror *toolaction_init(const char *cmd_tail, int podule_base, void *pw
     os_error *e = NULL;
 
 #ifndef ROM
-    e = (os_error *)objmodule_register_resources(messages_file());
+    e = (os_error *)objmodule_register_resources(Resources());
 #endif
     if (!e)
     {
@@ -82,7 +82,7 @@ _kernel_oserror *toolaction_init(const char *cmd_tail, int podule_base, void *pw
             if (e) messages_file_close();
         }
 #ifndef ROM
-        if (e) objmodule_deregister_resources(messages_file());
+        if (e) objmodule_deregister_resources(Resources());
 #endif
     }
 
@@ -105,7 +105,7 @@ void toolaction_services(int service_number, _kernel_swi_regs *r, void *pw)
 
 #ifndef ROM
         case Service_ResourceFSStarting:
-            (*(void (*)(int, void *, void *, void *))r->r[2])(messages_file(), 0, 0, (void *)r->r[3]);
+            (*(void (*)(int, void *, void *, void *))r->r[2])(Resources(), 0, 0, (void *)r->r[3]);
             break;
 #endif
     }

c/toolact

@@ -338,7 +338,7 @@ static os_error *toolaction_mclick(tb_handle tb, wimp_pointer *click, toolbox_o
     if (tb->flags & toolaction_GENERATE_SELECTED_EVENT)
     {
     	tbaction_selected action;
-    	action.size = 16;
+    	action.size = sizeof(action);
         action.ref_no = 0;
     	action.action_no = click->buttons & wimp_CLICK_ADJUST ? tb->adjust_action_no : tb->select_action_no;
         action.flags = click->buttons;

cmhg/modhdr → cmhg/ToolActionHdr

-; Copyright 1996 Acorn Computers Ltd
+; Copyright 2015 Castle Technology Ltd
 ;
 ; Licensed under the Apache License, Version 2.0 (the "License");
 ; you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 ;
-; Title:   cmhg.modhdr
-
 #include "VersionNum"
 #include "Global/Services.h"