Subcomponent makefiles improved.

Detail:
  Now clean up after themselves better.
Admin:
  Tested in DB220S Baseline build.

Version 5.45. Tagged as 'Internet-5_45'

Sources/arp/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/gethost/Makefile

@@ -67,7 +67,7 @@ OBJS =      o.GetHost
 all:    GetHost
 
 clean:  
-        ${WIPE} o ${WFLAGS}
+        IfThere o Then ${WIPE} o ${WFLAGS}
         ${RM} GetHost
 
 ${DIRS}:

Sources/host/Makefile

@@ -68,8 +68,8 @@ OBJS =      o.ns o.host o.res o.dst
 all:    bin.Host
 
 clean:  
-        ${WIPE} bin ${WFLAGS}
-        ${WIPE} o ${WFLAGS}
+        IfThere bin Then ${WIPE} bin ${WFLAGS}
+        IfThere o Then ${WIPE} o ${WFLAGS}
 
 ${DIRS}:
         ${MKDIR} bin

Sources/ifconfig/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/ifrconfig/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/inetstat/Makefile

@@ -38,6 +38,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/ipvars/Makefile

@@ -37,7 +37,7 @@ ${TARGET}:	$(OBJS) $(LIBS) $(DIRS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o ${WFLAGS}
+		IfThere o Then ${WIPE} o ${WFLAGS}
 
 $(DIRS):
 		cdir o

Sources/map-mbone/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/mrinfo/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/mtrace/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/newfiler/Makefile

@@ -36,6 +36,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/ping/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/route/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/showstat/Makefile

@@ -39,7 +39,7 @@ ${TARGET}:	$(OBJS) $(LIBS) ${DIRS}
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o ${WFLAGS}
+		IfThere o Then ${WIPE} o ${WFLAGS}
 
 ${DIRS}:
 		cdir o

Sources/sysctl/Makefile

@@ -37,7 +37,7 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 
 PathConf:	PathConf.o
 		Link -o $@ PathConf.o ${LIBS}

Sources/traceroute/Makefile

@@ -37,6 +37,6 @@ ${TARGET}:	$(OBJS) $(LIBS)
 		Squeeze $@
 
 clean:;		${RM} ${TARGET}
-		${WIPE} o.* ${WFLAGS}
+		IfThere o.* Then ${WIPE} o.* ${WFLAGS}
 	
 # Dynamic dependencies:

Sources/utils/Makefile

@@ -59,8 +59,8 @@ all: ${FILES}
         @echo ${COMPONENT}: Utilties built (Disc)
 
 clean:
-        ${WIPE} o.* ${WFLAGS}
-        ${WIPE} utl.* ${WFLAGS}
+        IfThere o.* Then ${WIPE} o.* ${WFLAGS}
+        IfThere utl.* Then ${WIPE} utl.* ${WFLAGS}
         @echo ${COMPONENT}: cleaned
 
 #

VersionNum

-/* (5.44)
+/* (5.45)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        5.44
+#define Module_MajorVersion_CMHG        5.45
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                01 Jul 2004
+#define Module_Date_CMHG                11 Jul 2004
 
-#define Module_MajorVersion             "5.44"
-#define Module_Version                  544
+#define Module_MajorVersion             "5.45"
+#define Module_Version                  545
 #define Module_MinorVersion             ""
-#define Module_Date                     "01 Jul 2004"
+#define Module_Date                     "11 Jul 2004"
 
-#define Module_ApplicationDate          "01-Jul-04"
+#define Module_ApplicationDate          "11-Jul-04"
 
 #define Module_ComponentName            "Internet"
 #define Module_ComponentPath            "RiscOS/Sources/SystemRes/Internet"
 
-#define Module_FullVersion              "5.44"
-#define Module_HelpVersion              "5.44 (01 Jul 2004)"
-#define Module_LibraryVersionInfo       "5:44"
+#define Module_FullVersion              "5.45"
+#define Module_HelpVersion              "5.45 (11 Jul 2004)"
+#define Module_LibraryVersionInfo       "5:45"