Commit be088ec3 authored by David Cotton's avatar David Cotton
Browse files

Compoment now exports resources correctly.

    Amu would complain about the nesting in this component. This is due to a
bugfix in the latest version of amu (5.13) that means that macro expansion
works correctly. Fixed the makefile so that we do not get recursive macro

    Tested in a 32-bit Lazarus build.

Version 5.33. Tagged as 'Internet-5_33'
parent 1d5721d2
...@@ -32,7 +32,7 @@ APP = !${COMPONENT} ...@@ -32,7 +32,7 @@ APP = !${COMPONENT}
RDIR = Resources RDIR = Resources
SDIR = Sources SDIR = Sources
RESD = ${RESDIR}.Internet RESD = ${RESDIR}.Internet
# Generic options: # Generic options:
...@@ -114,52 +114,52 @@ all: ${FILES} ...@@ -114,52 +114,52 @@ all: ${FILES}
@echo ${COMPONENT}: All built (Disc) @echo ${COMPONENT}: All built (Disc)
install: install_${OPTIONS} install_common dirs install: install_${OPTIONS} install_common dirs
${ATTR} -directories +wr -ww ${INSTDIR} ${ATTR} -directories +wr -ww ${INSTAPP}
${ATTR} -files +or +ow +wr -ww ${INSTDIR} ${ATTR} -files +or +ow +wr -ww ${INSTAPP}
@echo ${COMPONENT}: All installed (Disc) @echo ${COMPONENT}: All installed (Disc)
install_common: ${COMMONFILES} install_common: ${COMMONFILES}
${CP} ${SDIR}.ifconfig.IfConfig ${INSTDIR}.bin.IfConfig ${CPFLAGS} ${CP} ${SDIR}.ifconfig.IfConfig ${INSTAPP}.bin.IfConfig ${CPFLAGS}
${CP} ${SDIR}.inetstat.InetStat ${INSTDIR}.bin.InetStat ${CPFLAGS} ${CP} ${SDIR}.inetstat.InetStat ${INSTAPP}.bin.InetStat ${CPFLAGS}
${CP} ${SDIR}.ipvars.IPVars ${INSTDIR}.bin.IPVars ${CPFLAGS} ${CP} ${SDIR}.ipvars.IPVars ${INSTAPP}.bin.IPVars ${CPFLAGS}
${CP} ${SDIR}.ping.Ping ${INSTDIR}.bin.Ping ${CPFLAGS} ${CP} ${SDIR}.ping.Ping ${INSTAPP}.bin.Ping ${CPFLAGS}
${CP} ${SDIR}.route.Route ${INSTDIR}.bin.Route ${CPFLAGS} ${CP} ${SDIR}.route.Route ${INSTAPP}.bin.Route ${CPFLAGS}
${CP} ${SDIR}.showstat.ShowStat ${INSTDIR}.bin.ShowStat ${CPFLAGS} ${CP} ${SDIR}.showstat.ShowStat ${INSTAPP}.bin.ShowStat ${CPFLAGS}
${CP} ${SDIR}.sysctl.SysCtl ${INSTDIR}.bin.SysCtl ${CPFLAGS} ${CP} ${SDIR}.sysctl.SysCtl ${INSTAPP}.bin.SysCtl ${CPFLAGS}
${CP} ${SDIR}.traceroute.TraceRoute ${INSTDIR}.bin.TraceRoute ${CPFLAGS} ${CP} ${SDIR}.traceroute.TraceRoute ${INSTAPP}.bin.TraceRoute ${CPFLAGS}
${CP} ${SDIR}.utils.utl.X ${INSTDIR}.bin.X ${CPFLAGS} ${CP} ${SDIR}.utils.utl.X ${INSTAPP}.bin.X ${CPFLAGS}
install_STB: install_STB:
${CP} LocalUserIFRes:!Boot ${INSTDIR}.!Boot ${CPFLAGS} ${CP} LocalUserIFRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
${CP} ${RDIR}.files.Hosts ${INSTDIR}.etc.hosts ${CPFLAGS} ${CP} ${RDIR}.files.Hosts ${INSTAPP}.etc.hosts ${CPFLAGS}
${CP} ${RDIR}.files.protocols ${INSTDIR}.etc.protocols ${CPFLAGS} ${CP} ${RDIR}.files.protocols ${INSTAPP}.etc.protocols ${CPFLAGS}
install_: ${DISCFILES} dirs install_: ${DISCFILES} dirs
${CP} ${RDIR}.!Boot ${INSTDIR}.!Boot ${CPFLAGS} ${CP} ${RDIR}.!Boot ${INSTAPP}.!Boot ${CPFLAGS}
${CP} ${LDIR}.!Help ${INSTDIR}.!Help ${CPFLAGS} ${CP} ${LDIR}.!Help ${INSTAPP}.!Help ${CPFLAGS}
${CP} ${RDIR}.!Run ${INSTDIR}.!Run ${CPFLAGS} ${CP} ${RDIR}.!Run ${INSTAPP}.!Run ${CPFLAGS}
${CP} ${RDIR}.!Sprites ${INSTDIR}.!Sprites ${CPFLAGS} ${CP} ${RDIR}.!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
${CP} ${RDIR}.!Sprites22 ${INSTDIR}.!Sprites22 ${CPFLAGS} ${CP} ${RDIR}.!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
${CP} ${RDIR}.bin ${INSTDIR}.bin ${CPFLAGS} ${CP} ${RDIR}.bin ${INSTAPP}.bin ${CPFLAGS}
${CP} ${RDIR}.files ${INSTDIR}.files ${CPFLAGS} ${CP} ${RDIR}.files ${INSTAPP}.files ${CPFLAGS}
${CP} ${RDIR}.utils ${INSTDIR}.utils ${CPFLAGS} ${CP} ${RDIR}.utils ${INSTAPP}.utils ${CPFLAGS}
| |
${CP} ${SDIR}.map-mbone.Map-MBone ${INSTDIR}.bin.Map-MBone ${CPFLAGS} ${CP} ${SDIR}.map-mbone.Map-MBone ${INSTAPP}.bin.Map-MBone ${CPFLAGS}
${CP} ${SDIR}.mrinfo.MRInfo ${INSTDIR}.bin.MRInfo ${CPFLAGS} ${CP} ${SDIR}.mrinfo.MRInfo ${INSTAPP}.bin.MRInfo ${CPFLAGS}
${CP} ${SDIR}.mtrace.MTrace ${INSTDIR}.bin.MTrace ${CPFLAGS} ${CP} ${SDIR}.mtrace.MTrace ${INSTAPP}.bin.MTrace ${CPFLAGS}
${CP} ${SDIR}.pong.Pong ${INSTDIR}.bin.Pong ${CPFLAGS} ${CP} ${SDIR}.pong.Pong ${INSTAPP}.bin.Pong ${CPFLAGS}
${CP} ${SDIR}.utils.utl.RMFind ${INSTDIR}.bin.RMFind ${CPFLAGS} ${CP} ${SDIR}.utils.utl.RMFind ${INSTAPP}.bin.RMFind ${CPFLAGS}
${CP} ${SDIR}.utils.utl.CheckMem ${INSTDIR}.utils.CheckMem ${CPFLAGS} ${CP} ${SDIR}.utils.utl.CheckMem ${INSTAPP}.utils.CheckMem ${CPFLAGS}
${CP} ${SDIR}.newfiler.NewFiler ${INSTDIR}.utils.NewFiler ${CPFLAGS} ${CP} ${SDIR}.newfiler.NewFiler ${INSTAPP}.utils.NewFiler ${CPFLAGS}
${CP} ${SDIR}.utils.utl.ReadCMOSIP ${INSTDIR}.utils.ReadCMOSIP ${CPFLAGS} ${CP} ${SDIR}.utils.utl.ReadCMOSIP ${INSTAPP}.utils.ReadCMOSIP ${CPFLAGS}
${CP} ${SDIR}.utils.utl.TriggerCBs ${INSTDIR}.utils.TriggerCBs ${CPFLAGS} ${CP} ${SDIR}.utils.utl.TriggerCBs ${INSTAPP}.utils.TriggerCBs ${CPFLAGS}
dirs: dirs:
clean: clean:
dir ${SDIR} dir ${SDIR}
/* (5.32) /* (5.33)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 5.32 #define Module_MajorVersion_CMHG 5.33
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 May 2000 #define Module_Date_CMHG 05 Mar 2001
#define Module_MajorVersion "5.32" #define Module_MajorVersion "5.33"
#define Module_Version 532 #define Module_Version 533
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "12 May 2000" #define Module_Date "05 Mar 2001"
#define Module_FullVersion "5.32" #define Module_ApplicationDate2 "05-Mar-01"
#define Module_ApplicationDate4 "05-Mar-2001"
#define Module_ComponentName "Internet"
#define Module_ComponentPath "RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.33"
#define Module_HelpVersion "5.33 (05 Mar 2001)"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment