paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-21 19:53:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

* copy imp files to new ppu directory

Browse Source
This commit is contained in:
armin 2004-11-05 17:32:37 +00:00
parent db0ebd5bdb
commit f6ac5c699f
4 changed files with 78 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
rtl/netware/Makefile
View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/10/30] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/04]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc MAKEFILETARGETS=netware
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) sunos qnx UNIXs = linux $(BSDs) sunos qnx
LIMIT83fs = go32v2 os2 LIMIT83fs = go32v2 os2
@ -235,7 +235,15 @@ override FPCOPT+=-Ur
override FPCOPT+=-dMT override FPCOPT+=-dMT
CREATESMART=1 CREATESMART=1
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
override TARGET_UNITS+=$(SYSTEMUNIT) systhrds objpas macpas strings lineinfo winsock heaptrc matrix initc dos crt objects sysutils classes typinfo math varutils cpu mmx getopts sockets video mouse keyboard types dateutils rtlconst sysconst strutils convutils aio nwsnut nwserv nwnit nwprot IMPFILES=aio.imp audnlm32.imp \
calnlm32.imp ccs.imp ccs-os.imp clibaux.imp \
clibctx.imp clib.imp clxnlm32.imp dplsv386.imp \
dsapi.imp dsevent.imp lib0.imp \
locnlm32.imp ndpsrpc.imp netnlm32.imp nit.imp \
nlmlib.imp nwpsrv3x.imp nwpsrv.imp nwsnut.imp \
requestr.imp socklib.imp streams.imp threads.imp \
tli.imp vollib.imp ws2_32.imp ws2nlm.imp
override TARGET_UNITS+=$(SYSTEMUNIT) systhrds objpas macpas strings lineinfo winsock heaptrc matrix initc dos crt objects sysutils classes typinfo math varutils cpu mmx getopts sockets video mouse keyboard types dateutils rtlconst sysconst strutils convutils aio nwsnut nwserv nwnit nwprot netware
override TARGET_LOADERS+=nwpre prelude override TARGET_LOADERS+=nwpre prelude
override TARGET_RSTS+=math varutils typinfo classes dateutils sysconst convutils rtlconst systhrds override TARGET_RSTS+=math varutils typinfo classes dateutils sysconst convutils rtlconst systhrds
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
@ -738,7 +746,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO= __missing_command__ ECHO= __missing_command_ECHO
else else
ECHO:=$(firstword $(ECHO)) ECHO:=$(firstword $(ECHO))
endif endif
@ -752,7 +760,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE= __missing_command__ DATE= __missing_command_DATE
else else
DATE:=$(firstword $(DATE)) DATE:=$(firstword $(DATE))
endif endif
@ -766,7 +774,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL= __missing_command__ GINSTALL= __missing_command_GINSTALL
else else
GINSTALL:=$(firstword $(GINSTALL)) GINSTALL:=$(firstword $(GINSTALL))
endif endif
@ -778,7 +786,7 @@ export GINSTALL
ifndef CPPROG ifndef CPPROG
CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(CPPROG),) ifeq ($(CPPROG),)
CPPROG= __missing_command__ CPPROG= __missing_command_CPPROG
else else
CPPROG:=$(firstword $(CPPROG)) CPPROG:=$(firstword $(CPPROG))
endif endif
@ -787,7 +795,7 @@ export CPPROG
ifndef RMPROG ifndef RMPROG
RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(RMPROG),) ifeq ($(RMPROG),)
RMPROG= __missing_command__ RMPROG= __missing_command_RMPROG
else else
RMPROG:=$(firstword $(RMPROG)) RMPROG:=$(firstword $(RMPROG))
endif endif
@ -796,7 +804,7 @@ export RMPROG
ifndef MVPROG ifndef MVPROG
MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MVPROG),) ifeq ($(MVPROG),)
MVPROG= __missing_command__ MVPROG= __missing_command_MVPROG
else else
MVPROG:=$(firstword $(MVPROG)) MVPROG:=$(firstword $(MVPROG))
endif endif
@ -807,7 +815,7 @@ MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),) ifeq ($(MKDIRPROG),)
MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH)))) MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),) ifeq ($(MKDIRPROG),)
MKDIRPROG= __missing_command__ MKDIRPROG= __missing_command_MKDIRPROG
else else
MKDIRPROG:=$(firstword $(MKDIRPROG)) MKDIRPROG:=$(firstword $(MKDIRPROG))
endif endif
@ -862,7 +870,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
ifndef PPUMOVE ifndef PPUMOVE
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(PPUMOVE),) ifeq ($(PPUMOVE),)
PPUMOVE= __missing_command__ PPUMOVE= __missing_command_PPUMOVE
else else
PPUMOVE:=$(firstword $(PPUMOVE)) PPUMOVE:=$(firstword $(PPUMOVE))
endif endif
@ -871,7 +879,7 @@ export PPUMOVE
ifndef FPCMAKE ifndef FPCMAKE
FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(FPCMAKE),) ifeq ($(FPCMAKE),)
FPCMAKE= __missing_command__ FPCMAKE= __missing_command_FPCMAKE
else else
FPCMAKE:=$(firstword $(FPCMAKE)) FPCMAKE:=$(firstword $(FPCMAKE))
endif endif
@ -880,7 +888,7 @@ export FPCMAKE
ifndef ZIPPROG ifndef ZIPPROG
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ZIPPROG),) ifeq ($(ZIPPROG),)
ZIPPROG= __missing_command__ ZIPPROG= __missing_command_ZIPPROG
else else
ZIPPROG:=$(firstword $(ZIPPROG)) ZIPPROG:=$(firstword $(ZIPPROG))
endif endif
@ -889,7 +897,7 @@ export ZIPPROG
ifndef TARPROG ifndef TARPROG
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(TARPROG),) ifeq ($(TARPROG),)
TARPROG= __missing_command__ TARPROG= __missing_command_TARPROG
else else
TARPROG:=$(firstword $(TARPROG)) TARPROG:=$(firstword $(TARPROG))
endif endif
@ -1453,11 +1461,13 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
copyimpfiles:
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
nwpre$(OEXT) : nwpre.as nwpre$(OEXT) : nwpre.as
$(AS) -o $(UNITTARGETDIRPREFIX)nwpre$(OEXT) nwpre.as $(AS) -o $(UNITTARGETDIRPREFIX)nwpre$(OEXT) nwpre.as
prelude$(OEXT) : prelude.as prelude$(OEXT) : prelude.as
$(AS) -o $(UNITTARGETDIRPREFIX)prelude$(OEXT) prelude.as $(AS) -o $(UNITTARGETDIRPREFIX)prelude$(OEXT) prelude.as
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp nwsys.inc $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : copyimpfiles $(SYSTEMUNIT).pp nwsys.inc $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
@ -1511,11 +1521,5 @@ heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT)
lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT) lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)
callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT) callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT) aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT)
override INSTALLPPUFILES+=aio.imp audnlm32.imp \ override INSTALLPPUFILES+=$(IMPFILES)
calnlm32.imp ccs.imp ccs-os.imp clibaux.imp \ override CLEANPPUFILES+=$(addprefix $(COMPILER_UNITTARGETDIR)/,$(IMPFILES))
clibctx.imp clib.imp clxnlm32.imp dplsv386.imp \
dsapi.imp dsevent.imp lib0.imp \
locnlm32.imp ndpsrpc.imp netnlm32.imp nit.imp \
nlmlib.imp nwpsrv3x.imp nwpsrv.imp nwsnut.imp \
requestr.imp socklib.imp streams.imp threads.imp \
tli.imp vollib.imp ws2_32.imp ws2nlm.imp

29
rtl/netware/Makefile.fpc
View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) systhrds objpas macpas strings \
sockets \ sockets \
video mouse keyboard types dateutils rtlconst sysconst \ video mouse keyboard types dateutils rtlconst sysconst \
strutils convutils \ strutils convutils \
aio nwsnut nwserv nwnit nwprot aio nwsnut nwserv nwnit nwprot netware
rsts=math varutils typinfo classes dateutils sysconst convutils rtlconst systhrds rsts=math varutils typinfo classes dateutils sysconst convutils rtlconst systhrds
[require] [require]
@ -67,6 +67,16 @@ CREATESMART=1
# Paths # Paths
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
# Imp-Files
IMPFILES=aio.imp audnlm32.imp \
calnlm32.imp ccs.imp ccs-os.imp clibaux.imp \
clibctx.imp clib.imp clxnlm32.imp dplsv386.imp \
dsapi.imp dsevent.imp lib0.imp \
locnlm32.imp ndpsrpc.imp netnlm32.imp nit.imp \
nlmlib.imp nwpsrv3x.imp nwpsrv.imp nwsnut.imp \
requestr.imp socklib.imp streams.imp threads.imp \
tli.imp vollib.imp ws2_32.imp ws2nlm.imp
[rules] [rules]
SYSTEMPPU=$(addsuffix $(PPUEXT),$(SYSTEMUNIT)) SYSTEMPPU=$(addsuffix $(PPUEXT),$(SYSTEMUNIT))
@ -86,6 +96,8 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together. # Put system unit dependencies together.
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
copyimpfiles:
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
# #
# Loaders # Loaders
@ -101,7 +113,10 @@ prelude$(OEXT) : prelude.as
# System Units (System, Objpas, Strings) # System Units (System, Objpas, Strings)
# #
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp nwsys.inc $(SYSDEPS) #ifdef COMPILER_UNITTARGETDIR
#endif
$(SYSTEMUNIT)$(PPUEXT) : copyimpfiles $(SYSTEMUNIT).pp nwsys.inc $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
@ -215,14 +230,8 @@ aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT)
# #
# Netware-.imp files need to be installed in the unit-dir # Netware-.imp files need to be installed in the unit-dir
# #
override INSTALLPPUFILES+=aio.imp audnlm32.imp \ override INSTALLPPUFILES+=$(IMPFILES)
calnlm32.imp ccs.imp ccs-os.imp clibaux.imp \ override CLEANPPUFILES+=$(addprefix $(COMPILER_UNITTARGETDIR)/,$(IMPFILES))
clibctx.imp clib.imp clxnlm32.imp dplsv386.imp \
dsapi.imp dsevent.imp lib0.imp \
locnlm32.imp ndpsrpc.imp netnlm32.imp nit.imp \
nlmlib.imp nwpsrv3x.imp nwpsrv.imp nwsnut.imp \
requestr.imp socklib.imp streams.imp threads.imp \
tli.imp vollib.imp ws2_32.imp ws2nlm.imp
# the smartlinked objects will not be installed by the # the smartlinked objects will not be installed by the
# standard makefile ???? # standard makefile ????

37
rtl/netwlibc/Makefile
View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/10/30] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/04]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc MAKEFILETARGETS=netwlibc
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) sunos qnx UNIXs = linux $(BSDs) sunos qnx
LIMIT83fs = go32v2 os2 LIMIT83fs = go32v2 os2
@ -226,6 +226,8 @@ RTL=..
INC=$(RTL)/inc INC=$(RTL)/inc
PROCINC=$(RTL)/$(CPU_TARGET) PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \
libcclib.imp nwplibc.o
ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
SYSTEMUNIT=system SYSTEMUNIT=system
else else
@ -738,7 +740,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
ECHO= __missing_command__ ECHO= __missing_command_ECHO
else else
ECHO:=$(firstword $(ECHO)) ECHO:=$(firstword $(ECHO))
endif endif
@ -752,7 +754,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(DATE),) ifeq ($(DATE),)
DATE= __missing_command__ DATE= __missing_command_DATE
else else
DATE:=$(firstword $(DATE)) DATE:=$(firstword $(DATE))
endif endif
@ -766,7 +768,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(GINSTALL),) ifeq ($(GINSTALL),)
GINSTALL= __missing_command__ GINSTALL= __missing_command_GINSTALL
else else
GINSTALL:=$(firstword $(GINSTALL)) GINSTALL:=$(firstword $(GINSTALL))
endif endif
@ -778,7 +780,7 @@ export GINSTALL
ifndef CPPROG ifndef CPPROG
CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(CPPROG),) ifeq ($(CPPROG),)
CPPROG= __missing_command__ CPPROG= __missing_command_CPPROG
else else
CPPROG:=$(firstword $(CPPROG)) CPPROG:=$(firstword $(CPPROG))
endif endif
@ -787,7 +789,7 @@ export CPPROG
ifndef RMPROG ifndef RMPROG
RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(RMPROG),) ifeq ($(RMPROG),)
RMPROG= __missing_command__ RMPROG= __missing_command_RMPROG
else else
RMPROG:=$(firstword $(RMPROG)) RMPROG:=$(firstword $(RMPROG))
endif endif
@ -796,7 +798,7 @@ export RMPROG
ifndef MVPROG ifndef MVPROG
MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MVPROG),) ifeq ($(MVPROG),)
MVPROG= __missing_command__ MVPROG= __missing_command_MVPROG
else else
MVPROG:=$(firstword $(MVPROG)) MVPROG:=$(firstword $(MVPROG))
endif endif
@ -807,7 +809,7 @@ MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),) ifeq ($(MKDIRPROG),)
MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH)))) MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),) ifeq ($(MKDIRPROG),)
MKDIRPROG= __missing_command__ MKDIRPROG= __missing_command_MKDIRPROG
else else
MKDIRPROG:=$(firstword $(MKDIRPROG)) MKDIRPROG:=$(firstword $(MKDIRPROG))
endif endif
@ -862,7 +864,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
ifndef PPUMOVE ifndef PPUMOVE
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(PPUMOVE),) ifeq ($(PPUMOVE),)
PPUMOVE= __missing_command__ PPUMOVE= __missing_command_PPUMOVE
else else
PPUMOVE:=$(firstword $(PPUMOVE)) PPUMOVE:=$(firstword $(PPUMOVE))
endif endif
@ -871,7 +873,7 @@ export PPUMOVE
ifndef FPCMAKE ifndef FPCMAKE
FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(FPCMAKE),) ifeq ($(FPCMAKE),)
FPCMAKE= __missing_command__ FPCMAKE= __missing_command_FPCMAKE
else else
FPCMAKE:=$(firstword $(FPCMAKE)) FPCMAKE:=$(firstword $(FPCMAKE))
endif endif
@ -880,7 +882,7 @@ export FPCMAKE
ifndef ZIPPROG ifndef ZIPPROG
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ZIPPROG),) ifeq ($(ZIPPROG),)
ZIPPROG= __missing_command__ ZIPPROG= __missing_command_ZIPPROG
else else
ZIPPROG:=$(firstword $(ZIPPROG)) ZIPPROG:=$(firstword $(ZIPPROG))
endif endif
@ -889,7 +891,7 @@ export ZIPPROG
ifndef TARPROG ifndef TARPROG
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(TARPROG),) ifeq ($(TARPROG),)
TARPROG= __missing_command__ TARPROG= __missing_command_TARPROG
else else
TARPROG:=$(firstword $(TARPROG)) TARPROG:=$(firstword $(TARPROG))
endif endif
@ -1453,13 +1455,16 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
copyimpfiles:
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
override BINUTILSPREFIX=$(CPU_TARGET)-netware-
nwplibc$(OEXT) : nwplibc$(OEXT) :
cp pre/libcpre.gcc.o nwplibc.o cp pre/libcpre.gcc.o nwplibc.o
nwl_main$(OEXT) : nwl_main.as nwl_main$(OEXT) : nwl_main.as
$(AS) -o $(UNITTARGETDIRPREFIX)nwl_main$(OEXT) nwl_main.as $(AS) -o $(UNITTARGETDIRPREFIX)nwl_main$(OEXT) nwl_main.as
nwl_dlle$(OEXT) : nwl_dlle.as nwl_dlle$(OEXT) : nwl_dlle.as
$(AS) -o $(UNITTARGETDIRPREFIX)nwl_dlle$(OEXT) nwl_dlle.as $(AS) -o $(UNITTARGETDIRPREFIX)nwl_dlle$(OEXT) nwl_dlle.as
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp libc.pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : copyimpfiles $(SYSTEMUNIT).pp libc.pp $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
@ -1526,5 +1531,5 @@ keyboard$(PPUEXT) : $(INC)/keyboard.inc $(INC)/keybrdh.inc $(SYSTEMUNIT)$(PPUEXT
cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT) cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT)
callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT) callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT) aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT)
override INSTALLPPUFILES+=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \ override INSTALLPPUFILES+=$(IMPFILES)
libcclib.imp nwplibc.o override CLEANPPUFILES+=$(addprefix $(COMPILER_UNITTARGETDIR)/,$(IMPFILES))

14
rtl/netwlibc/Makefile.fpc
View File

@ -41,6 +41,9 @@ PROCINC=$(RTL)/$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \
libcclib.imp nwplibc.o
ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
SYSTEMUNIT=system SYSTEMUNIT=system
else else
@ -88,6 +91,11 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together. # Put system unit dependencies together.
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
copyimpfiles:
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
# binutils are the same for tragets netware and netwlibc
override BINUTILSPREFIX=$(CPU_TARGET)-netware-
# #
# Loaders # Loaders
@ -113,7 +121,7 @@ nwl_dlle$(OEXT) : nwl_dlle.as
# System Units (System, Objpas, Strings) # System Units (System, Objpas, Strings)
# #
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp libc.pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : copyimpfiles $(SYSTEMUNIT).pp libc.pp $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT)
@ -250,6 +258,6 @@ aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT)
# #
# Netware-.imp files need to be installed in the unit-dir # Netware-.imp files need to be installed in the unit-dir
# #
override INSTALLPPUFILES+=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \ override INSTALLPPUFILES+=$(IMPFILES)
libcclib.imp nwplibc.o override CLEANPPUFILES+=$(addprefix $(COMPILER_UNITTARGETDIR)/,$(IMPFILES))