* Removed binaries which can now be rebuilt from imported sources. (The old...

* Removed binaries which can now be rebuilt from imported sources.  (The old binaries are still available if you extract them explicitly, of course)

* Added externally supplied binaries of Host and GetHost (which we are
  shipping on J233) for reference.

!MkClean,fd7

+| Copyright 1998 Acorn Computers Ltd
+|
+| Licensed under the Apache License, Version 2.0 (the "License");
+| you may not use this file except in compliance with the License.
+| You may obtain a copy of the License at
+|
+|     http://www.apache.org/licenses/LICENSE-2.0
+|
+| Unless required by applicable law or agreed to in writing, software
+| distributed under the License is distributed on an "AS IS" BASIS,
+| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+| See the License for the specific language governing permissions and
+| limitations under the License.
+|
+Dir <Obey$Dir>
+amu_machine clean

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Makefile for Scrap
+# Makefile for Internet resources
 #
 # ***********************************
 # ***    C h a n g e   L i s t    ***
@@ -29,6 +29,7 @@ COMPONENT  = Internet
 APP        = !${COMPONENT}
 RDIR       = Resources
 LDIR       = ${RDIR}.${LOCALE}
+SDIR       = Sources
 INSTDIR    = ${INSTDIR}.${APP}
 
 # Generic options:
@@ -48,25 +49,29 @@ FILES=\
  ${RDIR}.!Run\
  ${RDIR}.!Sprites\
  ${RDIR}.!Sprites22\
- ${RDIR}.bin.ARP\
- ${RDIR}.bin.IfConfig\
- ${RDIR}.bin.InetStat\
- ${RDIR}.bin.Ping\
- ${RDIR}.bin.RMFind\
- ${RDIR}.bin.Route\
+ ${SDIR}.arp.ARP\
+ ${RDIR}.bin.GetHost\
+ ${RDIR}.bin.Host\
+ ${SDIR}.ifconfig.IfConfig\
+ ${SDIR}.inetstat.InetStat\
+ ${SDIR}.ping.Ping\
+ ${SDIR}.pong.Pong\
+ ${SDIR}.utils.utl.RMFind\
+ ${SDIR}.route.Route\
+ ${SDIR}.traceroute.TraceRoute\
  ${RDIR}.bin.ShowStat\
- ${RDIR}.bin.Sysctl\
- ${RDIR}.bin.X\
+ ${SDIR}.sysctl.SysCtl\
+ ${SDIR}.utils.utl.X\
  ${RDIR}.files.AUNMap\
  ${RDIR}.files.Hosts\
  ${RDIR}.files.Networks\
  ${RDIR}.files.Protocols\
  ${RDIR}.files.Services\
  ${RDIR}.utils.BootNet\
- ${RDIR}.utils.CheckMem\
- ${RDIR}.utils.NewFiler\
- ${RDIR}.utils.ReadCMOSIP\
- ${RDIR}.utils.TriggerCBs
+ ${SDIR}.utils.utl.CheckMem\
+ ${SDIR}.newfiler.NewFiler\
+ ${SDIR}.utils.utl.ReadCMOSIP\
+ ${SDIR}.utils.utl.TriggerCBs
 
 #
 # Main rules:
@@ -86,13 +91,120 @@ install: ${FILES}
         ${CP} ${RDIR}.files      ${INSTDIR}.files      ${CPFLAGS}
         ${CP} ${RDIR}.utils      ${INSTDIR}.utils      ${CPFLAGS}
         |
+        ${CP} ${SDIR}.arp.ARP               ${INSTDIR}.bin.ARP          ${CPFLAGS}
+        ${CP} ${SDIR}.ifconfig.IfConfig     ${INSTDIR}.bin.IfConfig     ${CPFLAGS}
+        ${CP} ${SDIR}.inetstat.InetStat     ${INSTDIR}.bin.InetStat     ${CPFLAGS}
+        ${CP} ${SDIR}.ping.Ping             ${INSTDIR}.bin.Ping         ${CPFLAGS}
+        ${CP} ${SDIR}.pong.Pong             ${INSTDIR}.bin.Pong         ${CPFLAGS}
+        ${CP} ${SDIR}.utils.utl.RMFind      ${INSTDIR}.bin.RMFind       ${CPFLAGS}
+        ${CP} ${SDIR}.route.Route           ${INSTDIR}.bin.Route        ${CPFLAGS}
+        ${CP} ${SDIR}.sysctl.SysCtl         ${INSTDIR}.bin.SysCtl       ${CPFLAGS}
+        ${CP} ${SDIR}.traceroute.TraceRoute ${INSTDIR}.bin.TraceRoute   ${CPFLAGS}
+        ${CP} ${SDIR}.utils.utl.X           ${INSTDIR}.bin.X            ${CPFLAGS}
+        ${CP} ${SDIR}.utils.utl.CheckMem    ${INSTDIR}.utils.CheckMem   ${CPFLAGS}
+        ${CP} ${SDIR}.newfiler.NewFiler     ${INSTDIR}.utils.NewFiler   ${CPFLAGS}
+        ${CP} ${SDIR}.utils.utl.ReadCMOSIP  ${INSTDIR}.utils.ReadCMOSIP ${CPFLAGS}
+        ${CP} ${SDIR}.utils.utl.TriggerCBs  ${INSTDIR}.utils.TriggerCBs ${CPFLAGS}
+        |
         ${ATTR} -directories +wr -ww ${INSTDIR}
         ${ATTR} -files +or +ow +wr -ww ${INSTDIR}
         |
         @echo ${COMPONENT}: All installed (Disc)
 
 clean:
+	dir ${SDIR}
+	!MkMods clean
+	up
         @echo ${COMPONENT}: cleaned
 
+${SDIR}.arp.ARP: ${SDIR}.arp.c.ARP
+	dir ${SDIR}.arp
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.ifconfig.IfConfig: ${SDIR}.ifconfig.c.IfConfig
+	dir ${SDIR}.ifconfig
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.inetstat.InetStat: ${SDIR}.inetstat.c.main \
+	${SDIR}.inetstat.c.if\
+	${SDIR}.inetstat.c.inet\
+	${SDIR}.inetstat.c.route\
+	${SDIR}.inetstat.c.mroute
+	dir ${SDIR}.inetstat
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.ping.Ping: ${SDIR}.ping.c.Ping
+	dir ${SDIR}.ping
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.pong.Pong: ${SDIR}.pong.c.Pong
+	dir ${SDIR}.pong
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.route.Route: ${SDIR}.route.c.Route
+	dir ${SDIR}.route
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.sysctl.SysCtl: ${SDIR}.sysctl.c.SysCtl
+	dir ${SDIR}.sysctl
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.traceroute.TraceRoute: ${SDIR}.traceroute.c.TraceRoute
+	dir ${SDIR}.traceroute
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.newfiler.NewFiler: ${SDIR}.newfiler.c.NewFiler
+	dir ${SDIR}.newfiler
+	@amu_machine
+	@up
+	@up
+
+${SDIR}.utils.utl.CheckMem: ${SDIR}.utils.s.CheckMem
+	dir ${SDIR}.utils
+	@amu_machine utl.CheckMem
+	@up
+	@up
+
+${SDIR}.utils.utl.ReadCMOSIP: ${SDIR}.utils.s.ReadCMOSIP
+	dir ${SDIR}.utils
+	@amu_machine utl.ReadCMOSIP
+	@up
+	@up
+
+${SDIR}.utils.utl.RMFind: ${SDIR}.utils.s.RMFind
+	dir ${SDIR}.utils
+	@amu_machine utl.RMFind
+	@up
+	@up
+
+${SDIR}.utils.utl.TriggerCBs: ${SDIR}.utils.s.TriggerCBs
+	dir ${SDIR}.utils
+	@amu_machine utl.TriggerCBs
+	@up
+	@up
+
+${SDIR}.utils.utl.X: ${SDIR}.utils.s.X
+	dir ${SDIR}.utils
+	@amu_machine utl.X
+	@up
+	@up
+
+
 #---------------------------------------------------------------------------
 # Dynamic dependencies: