CTools build will now export things into an "Exports" directory.

This replaces the "AcornC/C++.Libraries" directory that we had
before, which was a random mash-up of bits of a real "Exports"
directory.

Also reverted the CModule change - leave this job to components
to deal with in their own makefiles.

Version 6.58. Tagged as 'BuildSys-6_58'

Components/ROOL/CTools

@@ -14,7 +14,7 @@ BuildSys                -options INSTDIR=Install:DDE.AcornC/C++ INSTTYPE=Makefil
 #
 # Components only required for their headers
 #
-HdrSrc                  -options INSTDIR=Install:DDE.AcornC/C++.Libraries OPTIONS=ALL
+HdrSrc                  -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS> OPTIONS=ALL
 BufferManager           -type EXP
 ColourTrans             -type EXP
 FileSwitch              -type EXP
@@ -74,15 +74,15 @@ RTC                     -type EXP
 #
 # Libraries
 #
-SharedCLibrary          -options INSTDIR=Install:DDE.AcornC/C++.Libraries INSTTYPE=libraries
+SharedCLibrary          -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS>.Lib INSTTYPE=libraries
 TCPIPheaders            -type EXP
 inetlib                 -type EXP
 rpclib                  -type EXP
 socklib                 -type EXP
 unixlib                 -type EXP
-TCPIPheaders            -options INSTDIR=Install:DDE.AcornC/C++.Libraries
-AsmUtils                -options INSTDIR=Install:DDE.AcornC/C++.Libraries
-C++Lib                  -options INSTDIR=Install:DDE.AcornC/C++.Libraries
+TCPIPheaders            -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS>.Lib
+AsmUtils                -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS>.Lib
+C++Lib                  -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS>.Lib
 CLXLite                 -type EXP
 CLX                     -type EXP
 Common                  -type EXP
@@ -92,7 +92,7 @@ ModMallocLib            -options INSTDIR=Install:DDE.AcornC/C++.Libraries
 NBLib                   -type EXP
 PDebug                  -type EXP
 PlainArgvLib            -type EXP
-ToolboxLib              -options INSTDIR=Install:DDE.AcornC/C++.Libraries
+ToolboxLib              -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS>.Lib
 RemoteDebug             -type EXP
 Wild                    -options INSTDIR=Install:DDE.AcornC/C++.Libraries
 Trace                   -options INSTDIR=Install:DDE.AcornC/C++.Libraries
@@ -100,7 +100,7 @@ DebugLib                -options INSTDIR=Install:DDE.AcornC/C++.Libraries
 tboxlib                 -type EXP
 ConfigLib               -type EXP
 OSLib                   -type EXP
-UnicodeLib              -options INSTDIR=Install:DDE.AcornC/C++.Libraries
+UnicodeLib              -options INSTDIR=Install:DDE.AcornC/C++.Export.<APCS>.Lib
 
 #
 # Targets - DevSystem

Makefiles/CModule

@@ -214,7 +214,6 @@ all: aof.${ROM_TARGET} rm.${SA_TARGET} rm.${DBG_TARGET}
         @${ECHO} ${COMPONENT}: all built
 
 ${DIRS} ::
-        ${MKDIR} h
         ${MKDIR} aif
         ${MKDIR} aof
         ${MKDIR} i

VersionNum

-/* (6.57)
+/* (6.58)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        6.57
+#define Module_MajorVersion_CMHG        6.58
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                18 Oct 2014
+#define Module_Date_CMHG                19 Oct 2014
 
-#define Module_MajorVersion             "6.57"
-#define Module_Version                  657
+#define Module_MajorVersion             "6.58"
+#define Module_Version                  658
 #define Module_MinorVersion             ""
-#define Module_Date                     "18 Oct 2014"
+#define Module_Date                     "19 Oct 2014"
 
-#define Module_ApplicationDate          "18-Oct-14"
+#define Module_ApplicationDate          "19-Oct-14"
 
 #define Module_ComponentName            "BuildSys"
 #define Module_ComponentPath            "castle/RiscOS/BuildSys"
 
-#define Module_FullVersion              "6.57"
-#define Module_HelpVersion              "6.57 (18 Oct 2014)"
-#define Module_LibraryVersionInfo       "6:57"
+#define Module_FullVersion              "6.58"
+#define Module_HelpVersion              "6.58 (19 Oct 2014)"
+#define Module_LibraryVersionInfo       "6:58"