Commit da2f28ef authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Make use of StdTools

Use ${TOUCH} instead of *Create.
Tested exports of header and library, no issues seen.

Version 5.59. Tagged as 'TCPIPLibs-5_59'
parent 1ee70ed1
/* (5.58)
/* (5.59)
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
#define Module_MajorVersion_CMHG 5.58
#define Module_MajorVersion_CMHG 5.59
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 May 2013
#define Module_Date_CMHG 28 Jun 2014
#define Module_MajorVersion "5.58"
#define Module_Version 558
#define Module_MajorVersion "5.59"
#define Module_Version 559
#define Module_MinorVersion ""
#define Module_Date "26 May 2013"
#define Module_Date "28 Jun 2014"
#define Module_ApplicationDate "26-May-13"
#define Module_ApplicationDate "28-Jun-14"
#define Module_ComponentName "TCPIPLibs"
#define Module_ComponentPath "mixed/RiscOS/Sources/Lib/TCPIPLibs"
#define Module_FullVersion "5.58"
#define Module_HelpVersion "5.58 (26 May 2013)"
#define Module_LibraryVersionInfo "5:58"
#define Module_FullVersion "5.59"
#define Module_HelpVersion "5.59 (28 Jun 2014)"
#define Module_LibraryVersionInfo "5:59"
......@@ -16,67 +16,19 @@
# Makefile for socklib.a
# Makefile,v
# Revision 1.6 96/03/19 13:14:02 kbracey
# A major shake-up. All veneers are now in assembler. The assembler
# veneers are automatically generated by a C program mkveneers.
# _makecall is no longer used, but included in the library for
# compatibility. A new function _copyerror does much of the work
# of _makecall.
# Revision 1.5 95/08/17 18:39:36 kwelton
# The _makecall() routine has been rewritten in assembler to get round
# a race condition that previously existed in the "standard" (i.e.
# not -zM) version where the Internet module's internal error block could
# be modified between _makecall() discovering an error and copying out
# the error block into _inet_error.
# Revision 1.4 95/04/20 17:44:09 kwelton
# Function prototypes altered to match the genuine functionality, not
# whatever random argument types were used in the original library.
# Remade dependencies.
# Revision 1.3 95/04/20 13:44:32 kwelton
# All library functions are now prototyped in socklib.h.
# Revision 1.2 95/04/18 15:32:12 kwelton
# Files renamed to fit RISC OS 10-char filename limit
# Revision 1.1 95/03/08 11:38:13 kwelton
# Initial revision
LIBDIR = <Lib$Dir>
# Generic options:
MKDIR = do mkdir -p
WIPE = x wipe
RM = x remove
CP = copy
CC = cc
AS = objasm
LD = link
LIB = libfile
CMHG = cmhg
TOUCH = create
DO = do
PERL = ${DO} <Perl$Dir>.perl
WFLAGS = ~c~v
CPFLAGS = ~cflnr~v
include StdTools
COMPONENT= socklib
LIBDIR= <Lib$Dir>
DIRS= o._dirs
CFLAGS= -depend !Depend ${THROWBACK} -pcc -zps0 -I${INCLUDES} -fah -Fn -DINET
CFLAGSZM= -depend !Depend ${THROWBACK} -pcc -zps1 -I${INCLUDES} -ffah -DINET -zM
ASFLAGS= -depend !Depend ${THROWBACK}
ASFLAGSZM= -depend !Depend ${THROWBACK} -predefine "module SETL {TRUE}"
OFILES4= accept.o bind.o connect.o copyerror.o getpeernam.o \
getsocknam.o getsockopt.o getstabsiz.o listen.o makecall.o \
recv.o recvfrom.o recvmsg.o select.o send.o sendmsg.o \
......@@ -113,19 +65,15 @@ ZFILES5= z.accept5 z.bind z.connect z.copyerror z.getpeerna5 \
z.oaccept z.ogetpeerna z.ogetsockna z.orecvmsg z.osendmsg \
z.orecvfrom z.kvm_nlist z.sockver z._inet_err
.SUFFIXES: .z .o .s .sz .sn .c
.c.z:; ${CCZM} -c -o $@ $<
.c.z:; ${CC} ${CFLAGSZM} -c -o $@ $<
.c.o:; ${CC} ${CFLAGS} -c -o $@ $<
.s.z:; ${ASZM} $< $@
.sz.z:; ${ASZM} $< $@
.s.z:; ${AS} ${ASFLAGSZM} $< $@
.sz.z:; ${AS} ${ASFLAGSZM} $< $@
.s.o:; ${AS} ${ASFLAGS} $< $@
.sn.o:; ${AS} ${ASFLAGS} $< $@
COMPONENT = socklib
LIBDIR = <Lib$Dir>
all: veneers socklib socklibzm socklib5 socklib5zm
${OFILES4}: veneers
......@@ -133,54 +81,54 @@ ${ZFILES4}: veneers
${OFILES5}: veneers
${ZFILES5}: veneers
socklib: ${OFILES4} o._dirs
${LIB} -c socklib ${OFILES4}
${LIB} -o socklib
socklib: ${OFILES4} ${DIRS}
${AR} -c socklib ${OFILES4}
${AR} -o socklib
socklibzm: ${ZFILES4} o._dirs
${LIB} -c socklibzm ${ZFILES4}
${LIB} -o socklibzm
socklibzm: ${ZFILES4} ${DIRS}
${AR} -c socklibzm ${ZFILES4}
${AR} -o socklibzm
socklib5: ${OFILES5} o._dirs
${LIB} -c socklib5 ${OFILES5}
${LIB} -o socklib5
socklib5: ${OFILES5} ${DIRS}
${AR} -c socklib5 ${OFILES5}
${AR} -o socklib5
socklib5zm: ${ZFILES5} o._dirs
${LIB} -c socklib5zm ${ZFILES5}
${LIB} -o socklib5zm
socklib5zm: ${ZFILES5} ${DIRS}
${AR} -c socklib5zm ${ZFILES5}
${AR} -o socklib5zm
veneers: mkveneers Prototypes
${PERL} mkveneers Prototypes
Create veneers
veneers: mkveneers Prototypes
${PERL} mkveneers Prototypes
${TOUCH} veneers
export: export_${PHASE}
${CP} h.socklib TCPIPLibs:h.socklib ${CPFLAGS}
@echo ${COMPONENT}: export complete (hdrs)
${CP} h.socklib TCPIPLibs:h.socklib ${CPFLAGS}
@${ECHO} ${COMPONENT}: header export complete
export_libs: socklib socklibzm socklib5 socklib5zm dirs
export_libs: socklib socklibzm socklib5 socklib5zm
${CP} socklib TCPIPLibs:o.socklib ${CPFLAGS}
${CP} socklibzm TCPIPLibs:o.socklibzm ${CPFLAGS}
${CP} socklib5 TCPIPLibs:o.socklib5 ${CPFLAGS}
${CP} socklib5zm TCPIPLibs:o.socklib5zm ${CPFLAGS}
@${ECHO} ${COMPONENT}: library export complete
${MKDIR} o
${MKDIR} z
${MKDIR} o
${MKDIR} z
${MKDIR} sn
${MKDIR} sz
${TOUCH} $@
${WIPE} o.* ${WFLAGS}
${WIPE} z.* ${WFLAGS}
${WIPE} sn.* ${WFLAGS}
${WIPE} sz.* ${WFLAGS}
${WIPE} sn ${WFLAGS}
${WIPE} sz ${WFLAGS}
${RM} veneers
${RM} socklib
${RM} socklibzm
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