diff --git a/Makefile b/Makefile
index eebf921c70ee1b2327cd2473aaafc9a9dc1d7d65..5adb12882cb86937792feb9a3fdbf36f615873ee 100644
--- a/Makefile
+++ b/Makefile
@@ -14,129 +14,19 @@
#
# Makefile for Sound plug-in
#
-# ***********************************
-# *** C h a n g e L i s t ***
-# ***********************************
-# Date Name Description
-# ---- ---- -----------
-# 03-Apr-98 RML Created
-#
-# Program specific options:
-#
COMPONENT = SndSetup
-APP = !${COMPONENT}
-MSGVERSION = ${AWK} -f Build:AwkVers
-
-#
-# Generic options:
-#
-MKDIR = do mkdir -p
-CC = cc
-LD = link
-CP = copy
-RM = rm
-SQUISH = squish
-WIPE = x wipe
-AWK = GNU.gawk
-
-AFLAGS = ${THROWBACK} -depend !Depend -nocache -stamp -quit -module
-CFLAGS = ${THROWBACK} -depend !Depend -ffa ${INCLUDES}
-CPFLAGS = ~cfr~v
-SQFLAGS = -nolist
-WFLAGS = ~c~v
-
-#
-# Libraries
-#
-CLIB = CLib:o.stubs
-EVENTLIB = tbox:o.eventlib
-TOOLBOXLIB = tbox:o.toolboxlib
-WIMPLIB = tbox:o.wimplib
-
-#
-# Include files
-#
-INCLUDES = -Itbox:,C:
-
-
-FILES =\
- Resources.!Boot \
- LocalRes:!Run \
- Resources.!RunImage \
- Resources.<UserIF>.!Sprites \
- Resources.<UserIF>.!Sprites11 \
- Resources.<UserIF>.!Sprites22 \
- LocalRes:Blank \
- Resources.<UserIF>.CoSprite \
- Resources.<UserIF>.CoSprite11 \
- Resources.<UserIF>.CoSprite22 \
- LocalRes:Messages \
- LocalRes:Res \
- Resources.Sprites \
- Resources.Sprites11 \
- Resources.Sprites22 \
+TARGET = !RunImage
+INSTTYPE = app
+APP_OBJS = main common sound
+LIBS = ${EVENTLIB} ${TBOXLIB} ${WIMPLIB}
+CINCLUDES = -ITbox:,C:
+INSTAPP_FILES = !Boot !Run !RunImage Res Blank Sprites Sprites11 Sprites22 \
+ !Sprites !Sprites11 !Sprites22 CoSprite CoSprite11 CoSprite22
+INSTAPP_VERSION = Messages
-OBJS =\
- o.main \
- o.common \
- o.sound
-
-#
-# Rule patterns
-#
-.SUFFIXES: .o
-
-.c.o:; @echo
- @echo Compiling $<
- @${CC} ${CFLAGS} ${DFLAGS} -c -o $@ $<
-
-#
-# Main rules:
-#
-
-all: ${FILES}
- @echo ${COMPONENT}: Application made.
-
-install: ${FILES} o._Messages_
- @echo
- @echo ${COMPONENT}: Creating application ${APP}
- ${MKDIR} ${INSTDIR}.${APP}
- ${CP} Resources.!Boot ${INSTDIR}.${APP}.!Boot ${CPFLAGS}
- ${CP} LocalRes:!Run ${INSTDIR}.${APP}.!Run ${CPFLAGS}
- ${CP} Resources.!RunImage ${INSTDIR}.${APP}.!RunImage ${CPFLAGS}
- ${CP} Resources.<UserIF>.!Sprites ${INSTDIR}.${APP}.!Sprites ${CPFLAGS}
- ${CP} Resources.<UserIF>.!Sprites11 ${INSTDIR}.${APP}.!Sprites11 ${CPFLAGS}
- ${CP} Resources.<UserIF>.!Sprites22 ${INSTDIR}.${APP}.!Sprites22 ${CPFLAGS}
- ${CP} LocalRes:Blank ${INSTDIR}.${APP}.Blank ${CPFLAGS}
- ${CP} Resources.<UserIF>.CoSprite ${INSTDIR}.${APP}.CoSprite ${CPFLAGS}
- ${CP} Resources.<UserIF>.CoSprite11 ${INSTDIR}.${APP}.CoSprite11 ${CPFLAGS}
- ${CP} Resources.<UserIF>.CoSprite22 ${INSTDIR}.${APP}.CoSprite22 ${CPFLAGS}
- ${CP} o._Messages_ ${INSTDIR}.${APP}.Messages ${CPFLAGS}
- ${CP} LocalRes:Res ${INSTDIR}.${APP}.Res ${CPFLAGS}
- ${CP} Resources.Sprites ${INSTDIR}.${APP}.Sprites ${CPFLAGS}
- ${CP} Resources.Sprites11 ${INSTDIR}.${APP}.Sprites11 ${CPFLAGS}
- ${CP} Resources.Sprites22 ${INSTDIR}.${APP}.Sprites22 ${CPFLAGS}
- Access ${INSTDIR}.${APP}.* wr/r
- @echo
- @echo ${COMPONENT}: Application installed {Disc}
-
-clean:
- ${RM} ${OBJS}
- ${RM} Resources.!RunImage
- ${RM} o._Messages_
- @echo ${COMPONENT}: cleaned
-
-o._Messages_: LocalRes:Messages
- @echo Creating messages file
- ${MSGVERSION} LocalRes:Messages > $@
-
-#
-# Static dependencies:
-#
+include CApp
-Resources.!RunImage: ${OBJS} ${EVENTLIB} ${TOOLBOXLIB} ${WIMPLIB} ${CLIB}
- ${LD} -o $@ ${CLIB} ${EVENTLIB} ${TOOLBOXLIB} ${WIMPLIB} ${OBJS}
+C_WARNINGS = -fa
-#---------------------------------------------------------------------------
# Dynamic dependencies:
diff --git a/VersionNum b/VersionNum
index ddaaf8beee3354cd555d27ca073af2512688765e..25ec635163e8d1b9510a593be463e8d0d516fb50 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (2.05)
+/* (2.06)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 2.05
+#define Module_MajorVersion_CMHG 2.06
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 27 Jun 2012
+#define Module_Date_CMHG 17 Jul 2013
-#define Module_MajorVersion "2.05"
-#define Module_Version 205
+#define Module_MajorVersion "2.06"
+#define Module_Version 206
#define Module_MinorVersion ""
-#define Module_Date "27 Jun 2012"
+#define Module_Date "17 Jul 2013"
-#define Module_ApplicationDate "27-Jun-12"
+#define Module_ApplicationDate "17-Jul-13"
#define Module_ComponentName "SndSetup"
#define Module_ComponentPath "castle/RiscOS/Sources/SystemRes/Configure2/PlugIns/SndSetup"
-#define Module_FullVersion "2.05"
-#define Module_HelpVersion "2.05 (27 Jun 2012)"
-#define Module_LibraryVersionInfo "2:5"
+#define Module_FullVersion "2.06"
+#define Module_HelpVersion "2.06 (17 Jul 2013)"
+#define Module_LibraryVersionInfo "2:6"