From db140b3ceebe2ebb8e49b0a6caa3cdd384e05cb2 Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Wed, 17 Jul 2013 19:56:42 +0000
Subject: [PATCH] Makefile recreated from fragments
Pointless !Help removed
Version 0.13. Tagged as 'WindSetup-0_13'
---
Makefile | 120 ++++-----------------------------------------
Resources/UK/!Help | 7 ---
VersionNum | 20 ++++----
3 files changed, 20 insertions(+), 127 deletions(-)
delete mode 100644 Resources/UK/!Help
diff --git a/Makefile b/Makefile
index d124977..ce2320b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,119 +14,19 @@
#
# Makefile for WindSetup
#
-# ***********************************
-# *** C h a n g e L i s t ***
-# ***********************************
-# Date Name Description
-# ---- ---- -----------
-# 31-Oct-97 BJGA Derived from KeybdSet makefile
-# 10-Nov-97 BJGA Modified to use shared Common directory
-# 18-Nov-97 BJGA Application renamed and relocated
-# 09-Dec-97 BJGA Split Main.c, and modified to use shared Common library
-# 17-Dec-97 BJGA Tidied up
-# 11-May-98 BJGA Replaced Common directory with ConfigLib
-#
-#
-# Program specific options:
-#
COMPONENT = WindSetup
-APP = !${COMPONENT}
-RDIR = Resources
-LDIR = ${RDIR}.${LOCALE}
-INSTAPP = ${INSTDIR}.${APP}
-
-#
-# Generic options:
-#
-MKDIR = do mkdir -p
-CC = cc
-ATTR = -attr
-CP = copy
-LD = link
-RM = remove
-SQUEEZE = squeeze
-WIPE = x wipe
-
-CFLAGS = -c -depend !Depend -ffa -gflv ${INCLUDES} -throwback
-CPFLAGS = ~cfr~v
-WFLAGS = ~c~v
-
-#
-# Libraries
-#
-CLIB = C:o.stubs
-ELIB = Tbox:o.eventlib
-TLIB = Tbox:o.toolboxlib
-WLIB = Tbox:o.wimplib
-CONLIB = <Lib$Dir>.ConfigLib.o.ConfigLib
-
-#
-# Include files
-#
-INCLUDES = -ITbox:,C:,<Lib$Dir>.ConfigLib.
+TARGET = !RunImage
+INSTTYPE = app
+APP_OBJS = Main Settings ToolboxE WimpE WimpM
+LIBS = ${CONLIB} ${EVENTLIB} ${TBOXLIB} ${WIMPLIB}
+CINCLUDES = -ITbox:,C:,C:ConfigLib.
+INSTAPP_FILES = !Boot !Run !RunImage Res \
+ !Sprites !Sprites11 !Sprites22 CoSprite CoSprite11 CoSprite22
+INSTAPP_VERSION = Messages
-FILES=\
- ${LDIR}.!Help\
- ${RDIR}.!Boot\
- ${LDIR}.!Run\
- ${RDIR}.!RunImage\
- ${RDIR}.!Sprites\
- ${RDIR}.!Sprites11\
- ${RDIR}.!Sprites22\
- ${RDIR}.CoSprite\
- ${RDIR}.CoSprite11\
- ${RDIR}.CoSprite22\
- ${LDIR}.Messages\
- ${LDIR}.Res\
+include CApp
-OBJS = Main.o Settings.o ToolboxE.o WimpE.o WimpM.o
-
-#
-# Rule patterns
-#
-.c.o:; ${CC} ${CFLAGS} -o $@ $<
-
-#
-# Main rules:
-#
-# Application
-#
-all: ${FILES}
- @echo ${COMPONENT}: All built (Disc)
-
-install: ${FILES}
- ${MKDIR} ${INSTAPP}
- |
- ${CP} ${RDIR}.!Boot ${INSTAPP}.!Boot ${CPFLAGS}
- ${CP} ${LDIR}.!Help ${INSTAPP}.!Help ${CPFLAGS}
- ${CP} ${LDIR}.!Run ${INSTAPP}.!Run ${CPFLAGS}
- ${CP} ${RDIR}.!RunImage ${INSTAPP}.!RunImage ${CPFLAGS}
- ${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
- ${CP} ${RDIR}.!Sprites11 ${INSTAPP}.!Sprites11 ${CPFLAGS}
- ${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
- ${CP} ${RDIR}.CoSprite ${INSTAPP}.CoSprite ${CPFLAGS}
- ${CP} ${RDIR}.CoSprite11 ${INSTAPP}.CoSprite11 ${CPFLAGS}
- ${CP} ${RDIR}.CoSprite22 ${INSTAPP}.CoSprite22 ${CPFLAGS}
- ${CP} ${LDIR}.Messages ${INSTAPP}.Messages ${CPFLAGS}
- ${CP} ${LDIR}.Res ${INSTAPP}.Res ${CPFLAGS}
- |
- ${ATTR} -directories +wr -ww ${INSTAPP}
- ${ATTR} -files +or +ow +wr -ww ${INSTAPP}
- |
- @echo ${COMPONENT}: All installed (Disc)
-
-clean:
- ${WIPE} o.* ${WFLAGS}
- ${RM} ${RDIR}.!RunImage
- @echo ${COMPONENT}: cleaned
-
-#
-# Static dependencies:
-#
-${RDIR}.!RunImage: ${OBJS} ${CONLIB} ${ELIB} ${TLIB} ${WLIB} ${CLIB}
- ${LD} ${LDFLAGS} -o $@ ${OBJS} ${CONLIB} ${ELIB} ${TLIB} ${WLIB} ${CLIB}
- ${SQUEEZE} $@
+C_WARNINGS = -fa
-#---------------------------------------------------------------------------
# Dynamic dependencies:
diff --git a/Resources/UK/!Help b/Resources/UK/!Help
deleted file mode 100644
index 0a91f9d..0000000
--- a/Resources/UK/!Help
+++ /dev/null
@@ -1,7 +0,0 @@
-Windows Setup
-=============
-
-WindSetup is used to configure window-related behaviour. You should not
-need to run it separately - it integrates into !Configure.
-
-Interactive help is available - load !Help from Apps.
diff --git a/VersionNum b/VersionNum
index 871f79e..df467b0 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.12)
+/* (0.13)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 0.12
+#define Module_MajorVersion_CMHG 0.13
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 14 Jan 2012
+#define Module_Date_CMHG 17 Jul 2013
-#define Module_MajorVersion "0.12"
-#define Module_Version 12
+#define Module_MajorVersion "0.13"
+#define Module_Version 13
#define Module_MinorVersion ""
-#define Module_Date "14 Jan 2012"
+#define Module_Date "17 Jul 2013"
-#define Module_ApplicationDate "14-Jan-12"
+#define Module_ApplicationDate "17-Jul-13"
#define Module_ComponentName "WindSetup"
#define Module_ComponentPath "castle/RiscOS/Sources/SystemRes/Configure2/PlugIns/WindSetup"
-#define Module_FullVersion "0.12"
-#define Module_HelpVersion "0.12 (14 Jan 2012)"
-#define Module_LibraryVersionInfo "0:12"
+#define Module_FullVersion "0.13"
+#define Module_HelpVersion "0.13 (17 Jul 2013)"
+#define Module_LibraryVersionInfo "0:13"
--
GitLab