* Updated Makefile to allow building on minimalist STB !Internet. If

  OPTIONS=STB is passed into the makefile this is built, otherwise the
  normal disc build is built.  Makefile expects Resources.<UserIF>.<Locale>
  to contain !Boot, !Run etc.  Not checked in yet.
* Added !MkInstSTB.
* Tested building STB and original builds.

Added for STB400 Baseline.

!MkInstSTB,fd7

+| Copyright 1999 Pace Micro Technology plc
+|
+| 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 install INSTDIR=<Install$Dir> OPTIONS=STB

Makefile

@@ -20,6 +20,8 @@
 # Date           Name   Description
 # ----           ----   -----------
 # 03-Jul-96      KJB    Derived from Scrap makefile
+# 05-Oct-99      SNB    Updated to allow slimmed down STB !Internet to be built.
+#                       Passing OPTIONS=STB builds a cut down structure.
 #
 
 #
@@ -44,28 +46,30 @@ WIPE    = -wipe
 CPFLAGS = ~cfr~v
 WFLAGS  = ~c~v
 
-FILES=\
- ${RDIR}.!Boot\
+
+COMMONFILES=\
+ ${SDIR}.arp.ARP\
+ ${SDIR}.ifconfig.IfConfig\
+ ${SDIR}.inetstat.InetStat\
+ ${SDIR}.ping.Ping\
+ ${SDIR}.route.Route\
+ ${SDIR}.showstat.ShowStat\
+ ${SDIR}.sysctl.SysCtl\
+ ${SDIR}.traceroute.TraceRoute\
+ ${SDIR}.utils.utl.X\
+
+DISCFILES= ${RDIR}.!Boot\
  ${LDIR}.!Help\
  ${RDIR}.!Run\
  ${RDIR}.!Sprites\
  ${RDIR}.!Sprites22\
- ${SDIR}.arp.ARP\
  ${RDIR}.bin.GetHost\
  ${RDIR}.bin.Host\
- ${SDIR}.ifconfig.IfConfig\
- ${SDIR}.inetstat.InetStat\
  ${SDIR}.map-mbone.Map-MBone\
  ${SDIR}.mrinfo.MRInfo\
  ${SDIR}.mtrace.MTrace\
- ${SDIR}.ping.Ping\
  ${SDIR}.pong.Pong\
  ${SDIR}.utils.utl.RMFind\
- ${SDIR}.route.Route\
- ${SDIR}.traceroute.TraceRoute\
- ${SDIR}.showstat.ShowStat\
- ${SDIR}.sysctl.SysCtl\
- ${SDIR}.utils.utl.X\
  ${RDIR}.files.AUNMap\
  ${RDIR}.files.Hosts\
  ${RDIR}.files.Networks\
@@ -77,6 +81,10 @@ FILES=\
  ${SDIR}.utils.utl.ReadCMOSIP\
  ${SDIR}.utils.utl.TriggerCBs
 
+FILES=\
+  ${COMMONFILES} \
+  ${DISCFILES}
+  
 NETUTILS = \
         ${SDIR}.arp.ARP              \
         ${SDIR}.ifconfig.IfConfig    \
@@ -103,9 +111,31 @@ NETUTILS = \
 all: ${FILES}
         @echo ${COMPONENT}: All built (Disc)
 
-install: ${FILES}
-        ${MKDIR} ${INSTDIR}
-        |
+install: install_${OPTIONS} install_common dirs
+        ${ATTR} -directories +wr -ww ${INSTDIR}
+        ${ATTR} -files +or +ow +wr -ww ${INSTDIR}
+        @echo ${COMPONENT}: All installed (Disc)
+
+install_common: ${COMMONFILES}
+        ${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}.route.Route           ${INSTDIR}.bin.Route        ${CPFLAGS}
+        ${CP} ${SDIR}.showstat.ShowStat     ${INSTDIR}.bin.ShowStat     ${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}
+
+install_STB:
+        ${MKDIR} ${INSTDIR}.etc
+        ${CP} LocalUserIFRes:!Run      ${INSTDIR}.!Run          ${CPFLAGS}
+        ${CP} LocalUserIFRes:!Help     ${INSTDIR}.!Help         ${CPFLAGS}
+        ${CP} LocalUserIFRes:hosts     ${INSTDIR}.etc.hosts     ${CPFLAGS}
+        ${CP} LocalUserIFRes:protocols ${INSTDIR}.etc.protocols ${CPFLAGS}
+        ${CP} LocalUserIFRes:services  ${INSTDIR}.etc.services  ${CPFLAGS}
+
+install_: ${DISCFILES} dirs
         ${CP} ${RDIR}.!Boot      ${INSTDIR}.!Boot      ${CPFLAGS}
         ${CP} ${LDIR}.!Help      ${INSTDIR}.!Help      ${CPFLAGS}
         ${CP} ${RDIR}.!Run       ${INSTDIR}.!Run       ${CPFLAGS}
@@ -115,29 +145,19 @@ 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}.map-mbone.Map-MBone   ${INSTDIR}.bin.Map-MBone    ${CPFLAGS}
         ${CP} ${SDIR}.mrinfo.MRInfo         ${INSTDIR}.bin.MRInfo       ${CPFLAGS}
         ${CP} ${SDIR}.mtrace.MTrace         ${INSTDIR}.bin.MTrace       ${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}.showstat.ShowStat     ${INSTDIR}.bin.ShowStat     ${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)
+
+dirs:
+        ${MKDIR} ${INSTDIR}
+        ${MKDIR} ${INSTDIR}.bin
 
 clean:
 	dir ${SDIR}