Change to use CModule shared makefile.

Debug redirection set to PRINTF_OUTPUT since HOSTFS_OUTPUT doesn't exist (allows debug version to compile again).
Participated in a ROM build, but not functionally tested.

Version 1.02. Tagged as 'SoundCtrl-1_02'

Makefile

@@ -14,104 +14,21 @@
 #
 # Makefile for SoundCtrl
 #
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date         Name    Description
-# ----         ----    -----------
-# 14-Feb-2003  BJGA    Created.
 
-COMPONENT = SoundCtrl
-TARGET    = SoundCtrl
-DIRS      = o._dirs
-CFLAGS    = -ffah -zM -zps1 ${DEFINES}
-RAM_OBJS  = o.module o.resmess ${OBJS}
-ROM_OBJS  = o.moduleROM ${OBJS}
-OBJS      =            o.global  o.mess o.modhdr
-DBG_OBJS  = do.module do.global do.mess o.modhdr
-EXP_HDR   = <Export$Dir>
-C_EXP_HDR = <CExport$Dir>.Interface
-LIBS      = 
-DBG_LIBS  = ${LIBS} <Lib$Dir>.DebugLib.o.debuglibzm TCPIPLibs:o.socklib5zm TCPIPLibs:o.inetlibzm
-DBG_MODULE = drm.${TARGET}
-EXPORTS   = ${C_EXP_HDR}.h.MixerDevice ${EXP_HDR}.MixerDevice ${EXP_HDR}.SoundCtrl
-
-include Makefiles:StdTools
-include Makefiles:ModuleLibs
-include Makefiles:ModStdRule
-include Makefiles:RAMCModule
-include Makefiles:ROMCModule
-
-.SUFFIXES: .do
-.c.do:; ${CC} ${CFLAGS} -DDEBUGLIB -o $@ $<
-
-${DIRS}:
-	${MKDIR} do
-	${MKDIR} o
-	${TOUCH} $@
-
-export: export_${PHASE}
-
-export_: export_libs export_hdrs
-	@|
-
-export_hdrs: ${EXPORTS}
-	@${ECHO} ${COMPONENT}: export hdrs complete
-
-export_libs: ${EXPORTS}
-	@${ECHO} ${COMPONENT}: export libs complete
-
-${EXP_HDR}.SoundCtrl: hdr.SoundCtrl
-	${CP} hdr.SoundCtrl $@ ${CPFLAGS}
-
-${EXP_HDR}.MixerDevice: hdr.MixerDevice
-	${CP} hdr.MixerDevice $@ ${CPFLAGS}
-
-${C_EXP_HDR}.h.MixerDevice: h.MixerDevice
-	${CP} h.MixerDevice $@ ${CPFLAGS}
-
-resources: o._Messages${CMDHELP}_
-	${MKDIR} ${RESDIR}.${COMPONENT}
-	${CP} o._Messages${CMDHELP}_ ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
-	@${ECHO} ${COMPONENT}: resource files copied
-
-clean:
-	${RM} h.modhdr
-	ifthere linked then wipe linked ${WFLAGS}
-	ifthere aof    then wipe aof    ${WFLAGS}
-	ifthere drm    then wipe drm    ${WFLAGS}
-	ifthere do     then wipe do     ${WFLAGS}
-	ifthere rm     then wipe rm     ${WFLAGS}
-	ifthere o      then wipe o      ${WFLAGS}
-	@${ECHO} ${COMPONENT}: cleaned
-
-debug: ${DBG_MODULE}
-	@${ECHO} ${COMPONENT}: debug module built
-
-${DBG_MODULE}: ${DBG_OBJS} ${DBG_LIBS} ${CLIB} ${DIRS}
-	${MKDIR} drm
-	${LD} ${LDFLAGS} -o $@ -rmf ${DBG_OBJS} ${DBG_LIBS} ${CLIB}
-	${CHMOD} -R a+rx drm
-
-o.module: modhdr.h
-do.module: modhdr.h
-
-moduleROM.o: module.c modhdr.h
-	${CC} ${CFLAGS} -DROM_MODULE -o moduleROM.o module.c
-
-resmess.o: o._Messages${CMDHELP}_
-	ResGen resmess_ResourcesFiles o.resmess o._Messages${CMDHELP}_ Resources.SoundCtrl.Messages
-
-o._Messages_: LocalRes:Messages LocalRes:CmdHelp
-	${MKDIR} o
-	FAppend $@ LocalRes:Messages LocalRes:CmdHelp
-
-o._MessagesNone_: LocalRes:Messages
-	${MKDIR} o
-	${CP} LocalRes:Messages $@ ${CPFLAGS}
-
-BBETYPE = soundctrl
-bbe-soundctrl: bbe-generic
-	BBE_Export_File_In_Dir o _Messages${CMDHELP}_
+COMPONENT   = SoundCtrl
+TARGET      = ${COMPONENT}
+OBJS        = global mess module
+RES_AREA    = resmess_ResourcesFiles
+CMHGFILE    = modhdr
+CMHGDEPENDS = module
+ROMCDEFINES = -DROM_MODULE
+ASMHDRS     = MixerDevice SoundCtrl
+HDRS        = MixerDevice
+
+include CModule
+
+CDFLAGS    += -DDEBUGLIB
+CFLAGS     += -IC:
+DBG_LIBS   += ${NET5LIBS}
 
 # Dynamic dependencies:

MkRam,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine all THROWBACK=-throwback %*0
+amu_machine standalone THROWBACK=-throwback %*0

VersionNum

-/* (1.01)
+/* (1.02)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        1.01
+#define Module_MajorVersion_CMHG        1.02
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                21 Jan 2012
+#define Module_Date_CMHG                04 Feb 2012
 
-#define Module_MajorVersion             "1.01"
-#define Module_Version                  101
+#define Module_MajorVersion             "1.02"
+#define Module_Version                  102
 #define Module_MinorVersion             ""
-#define Module_Date                     "21 Jan 2012"
+#define Module_Date                     "04 Feb 2012"
 
-#define Module_ApplicationDate          "21-Jan-12"
+#define Module_ApplicationDate          "04-Feb-12"
 
 #define Module_ComponentName            "SoundCtrl"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Audio/SoundCtrl"
 
-#define Module_FullVersion              "1.01"
-#define Module_HelpVersion              "1.01 (21 Jan 2012)"
-#define Module_LibraryVersionInfo       "1:1"
+#define Module_FullVersion              "1.02"
+#define Module_HelpVersion              "1.02 (04 Feb 2012)"
+#define Module_LibraryVersionInfo       "1:2"

c/module

@@ -71,7 +71,7 @@ _kernel_oserror *module_Init(const char *cmd_tail, int podule_base, void *pw)
   debug_set_taskname_prefix(false);
   debug_set_area_level_prefix(true);
   debug_set_area_pad_limit(0);
-  debug_set_device(HOSTFS_OUTPUT);
+  debug_set_device(PRINTF_OUTPUT);
   debug_set_raw_device(NULL_OUTPUT);
   debug_set_trace_device(NULL_OUTPUT);