+ convutil and strutils added

This commit is contained in:
Tomas Hajny 2004-07-18 21:44:38 +00:00
parent 668400675a
commit d60a7d24d6
2 changed files with 192 additions and 103 deletions

View File

@ -1,15 +1,25 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/07] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/07/18]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
override PATH:=$(subst \,/,$(PATH)) BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) sunos qnx
FORCE:
.PHONY: FORCE
override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
ifneq ($(findstring darwin,$(OSTYPE)),)
inUnix=1 #darwin
SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
else
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH))) SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
else else
SEARCHPATH:=$(subst ;, ,$(PATH)) SEARCHPATH:=$(subst ;, ,$(PATH))
endif endif
endif
SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH)))) PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
ifeq ($(PWD),) ifeq ($(PWD),)
PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH)))) PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@ -36,22 +46,13 @@ ifneq ($(findstring cygdrive,$(PATH)),)
inCygWin=1 inCygWin=1
endif endif
endif endif
ifeq ($(OS_TARGET),freebsd)
BSDhier=1
endif
ifeq ($(OS_TARGET),netbsd)
BSDhier=1
endif
ifeq ($(OS_TARGET),openbsd)
BSDhier=1
endif
ifdef inUnix ifdef inUnix
BATCHEXT=.sh SRCBATCHEXT=.sh
else else
ifdef inOS2 ifdef inOS2
BATCHEXT=.cmd SRCBATCHEXT=.cmd
else else
BATCHEXT=.bat SRCBATCHEXT=.bat
endif endif
endif endif
ifdef inUnix ifdef inUnix
@ -156,6 +157,12 @@ ifeq ($(findstring $(OS_TARGET),$(MAKEFILETARGETS)),)
$(error The Makefile doesn't support target $(OS_TARGET), please run fpcmake first) $(error The Makefile doesn't support target $(OS_TARGET), please run fpcmake first)
endif endif
endif endif
ifneq ($(findstring $(OS_TARGET),$(BSDs)),)
BSDhier=1
endif
ifeq ($(OS_TARGET),linux)
linuxHier=1
endif
export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE CROSSCOMPILE export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE CROSSCOMPILE
ifdef FPCDIR ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR)) override FPCDIR:=$(subst \,/,$(FPCDIR))
@ -185,11 +192,14 @@ override FPCDIR:=$(FPCDIR)/..
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR:=$(FPCDIR)/.. override FPCDIR:=$(FPCDIR)/..
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR:=$(BASEDIR)
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR=c:/pp override FPCDIR=c:/pp
endif endif
endif endif
endif endif
endif endif
endif
ifndef CROSSDIR ifndef CROSSDIR
CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
endif endif
@ -220,7 +230,7 @@ override FPCOPT+=-Ur
endif endif
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
GRAPHDIR=$(INC)/graph GRAPHDIR=$(INC)/graph
override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos crt objects printer matrix sysutils classes math typinfo varutils winsock charset ucomplex cpu mmx getopts heaptrc lineinfo dynlibs video mouse keyboard variants types rtlconst sysconst dateutil strutils convutil
override TARGET_LOADERS+=prt0 override TARGET_LOADERS+=prt0
override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil override TARGET_RSTS+=math varutils typinfo variants pmhelp classes sysconst dateutil
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
@ -234,42 +244,12 @@ ifdef REQUIRE_PACKAGESDIR
override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR) override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)
endif endif
ifdef ZIPINSTALL ifdef ZIPINSTALL
ifeq ($(OS_TARGET),linux) ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)
UNIXINSTALLDIR=1 UNIXHier=1
endif
ifeq ($(OS_TARGET),freebsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),netbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif endif
else else
ifeq ($(OS_SOURCE),linux) ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)
UNIXINSTALLDIR=1 UNIXHier=1
endif
ifeq ($(OS_SOURCE),freebsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_SOURCE),netbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_SOURCE),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif endif
endif endif
ifndef INSTALL_PREFIX ifndef INSTALL_PREFIX
@ -278,7 +258,7 @@ INSTALL_PREFIX=$(PREFIX)
endif endif
endif endif
ifndef INSTALL_PREFIX ifndef INSTALL_PREFIX
ifdef UNIXINSTALLDIR ifdef UNIXHier
INSTALL_PREFIX=/usr/local INSTALL_PREFIX=/usr/local
else else
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
@ -297,7 +277,7 @@ DIST_DESTDIR:=$(BASEDIR)
endif endif
export DIST_DESTDIR export DIST_DESTDIR
ifndef INSTALL_BASEDIR ifndef INSTALL_BASEDIR
ifdef UNIXINSTALLDIR ifdef UNIXHier
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION) INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)
else else
@ -308,10 +288,18 @@ INSTALL_BASEDIR:=$(INSTALL_PREFIX)
endif endif
endif endif
ifndef INSTALL_BINDIR ifndef INSTALL_BINDIR
ifdef UNIXINSTALLDIR ifdef UNIXHier
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else
INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
endif
else
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else else
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET) INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
endif endif
@ -330,19 +318,23 @@ endif
endif endif
endif endif
ifndef INSTALL_LIBDIR ifndef INSTALL_LIBDIR
ifdef UNIXINSTALLDIR ifdef UNIXHier
INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib
else else
INSTALL_LIBDIR:=$(INSTALL_UNITDIR) INSTALL_LIBDIR:=$(INSTALL_UNITDIR)
endif endif
endif endif
ifndef INSTALL_SOURCEDIR ifndef INSTALL_SOURCEDIR
ifdef UNIXINSTALLDIR ifdef UNIXHier
ifdef BSDhier ifdef BSDhier
SRCPREFIXDIR=share/src SRCPREFIXDIR=share/src
else else
ifdef linuxHier
SRCPREFIXDIR=share/src
else
SRCPREFIXDIR=src SRCPREFIXDIR=src
endif endif
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
ifdef INSTALL_FPCSUBDIR ifdef INSTALL_FPCSUBDIR
INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)
@ -365,12 +357,16 @@ endif
endif endif
endif endif
ifndef INSTALL_DOCDIR ifndef INSTALL_DOCDIR
ifdef UNIXINSTALLDIR ifdef UNIXHier
ifdef BSDhier ifdef BSDhier
DOCPREFIXDIR=share/doc DOCPREFIXDIR=share/doc
else else
ifdef linuxHier
DOCPREFIXDIR=share/doc
else
DOCPREFIXDIR=doc DOCPREFIXDIR=doc
endif endif
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
else else
@ -385,20 +381,28 @@ endif
endif endif
endif endif
ifndef INSTALL_EXAMPLEDIR ifndef INSTALL_EXAMPLEDIR
ifdef UNIXINSTALLDIR ifdef UNIXHier
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
ifdef BSDhier ifdef BSDhier
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
else else
ifdef linuxHier
INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples
else
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/$(PACKAGE_NAME)
endif endif
endif
else else
ifdef BSDhier ifdef BSDhier
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
else else
ifdef linuxHier
INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
else
INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
endif endif
endif endif
endif
else else
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME) INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)
@ -420,6 +424,7 @@ endif
else else
CROSSBINDIR= CROSSBINDIR=
endif endif
BATCHEXT=.bat
LOADEREXT=.as LOADEREXT=.as
EXEEXT=.exe EXEEXT=.exe
PPLEXT=.ppl PPLEXT=.ppl
@ -443,25 +448,37 @@ STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX=
FPCMADE=fpcmade.wat
ZIPSUFFIX=watc
OEXT=.obj
ASMEXT=.asm
SHAREDLIBEXT=.dll
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.lnx FPCMADE=fpcmade.lnx
ZIPSUFFIX=linux ZIPSUFFIX=linux
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.freebsd FPCMADE=fpcmade.freebsd
ZIPSUFFIX=freebsd ZIPSUFFIX=freebsd
endif endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd FPCMADE=fpcmade.openbsd
@ -473,6 +490,7 @@ FPCMADE=fpcmade.w32
ZIPSUFFIX=w32 ZIPSUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2) ifeq ($(OS_TARGET),os2)
BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
@ -481,6 +499,7 @@ ZIPSUFFIX=os2
ECHO=echo ECHO=echo
endif endif
ifeq ($(OS_TARGET),emx) ifeq ($(OS_TARGET),emx)
BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
@ -493,21 +512,29 @@ EXEEXT=
SHAREDLIBEXT=.library SHAREDLIBEXT=.library
FPCMADE=fpcmade.amg FPCMADE=fpcmade.amg
endif endif
ifeq ($(OS_TARGET),morphos)
EXEEXT=
SHAREDLIBEXT=.library
FPCMADE=fpcmade.mos
endif
ifeq ($(OS_TARGET),atari) ifeq ($(OS_TARGET),atari)
EXEEXT=.ttp EXEEXT=.ttp
FPCMADE=fpcmade.ata FPCMADE=fpcmade.ata
endif endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.be FPCMADE=fpcmade.be
ZIPSUFFIX=be ZIPSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.sun FPCMADE=fpcmade.sun
ZIPSUFFIX=sun ZIPSUFFIX=sun
endif endif
ifeq ($(OS_TARGET),qnx) ifeq ($(OS_TARGET),qnx)
BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADE=fpcmade.qnx FPCMADE=fpcmade.qnx
ZIPSUFFIX=qnx ZIPSUFFIX=qnx
@ -519,10 +546,14 @@ FPCMADE=fpcmade.nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
endif endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT=
EXEEXT= EXEEXT=
FPCMADE=fpcmade.mcc FPCMADE=fpcmade.macos
ZIPSUFFIX=macos
DEBUGSYMEXT=.xcoff
endif endif
ifeq ($(OS_TARGET),darwin) ifeq ($(OS_TARGET),darwin)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.darwin FPCMADE=fpcmade.darwin
@ -545,25 +576,34 @@ STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX=
FPCMADE=fpcmade.dos
ZIPSUFFIX=watcom
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.lnx FPCMADE=fpcmade.lnx
ZIPSUFFIX=linux ZIPSUFFIX=linux
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.freebsd FPCMADE=fpcmade.freebsd
ZIPSUFFIX=freebsd ZIPSUFFIX=freebsd
endif endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd FPCMADE=fpcmade.openbsd
@ -580,6 +620,7 @@ FPCMADE=fpcmade.w32
ZIPSUFFIX=w32 ZIPSUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2) ifeq ($(OS_TARGET),os2)
BATCHEXT=.cmd
PPUEXT=.ppo PPUEXT=.ppo
ASMEXT=.so2 ASMEXT=.so2
OEXT=.oo2 OEXT=.oo2
@ -612,6 +653,7 @@ EXEEXT=.ttp
FPCMADE=fpcmade.ata FPCMADE=fpcmade.ata
endif endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
@ -622,6 +664,7 @@ FPCMADE=fpcmade.be
ZIPSUFFIX=be ZIPSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
@ -632,6 +675,7 @@ FPCMADE=fpcmade.sun
ZIPSUFFIX=sun ZIPSUFFIX=sun
endif endif
ifeq ($(OS_TARGET),qnx) ifeq ($(OS_TARGET),qnx)
BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
@ -654,13 +698,15 @@ ZIPSUFFIX=nw
EXEEXT=.nlm EXEEXT=.nlm
endif endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT=
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
SMARTEXT=.sl SMARTEXT=.sl
STATICLIBEXT=.a STATICLIBEXT=.a
EXEEXT= EXEEXT=
FPCMADE=fpcmade.mcc DEBUGSYMEXT=.xcoff
FPCMADE=fpcmade.macos
endif endif
endif endif
ifndef ECHO ifndef ECHO
@ -668,7 +714,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= ECHO= __missing_command__
else else
ECHO:=$(firstword $(ECHO)) ECHO:=$(firstword $(ECHO))
endif endif
@ -682,7 +728,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= DATE= __missing_command__
else else
DATE:=$(firstword $(DATE)) DATE:=$(firstword $(DATE))
endif endif
@ -696,7 +742,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= GINSTALL= __missing_command__
else else
GINSTALL:=$(firstword $(GINSTALL)) GINSTALL:=$(firstword $(GINSTALL))
endif endif
@ -708,7 +754,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= CPPROG= __missing_command__
else else
CPPROG:=$(firstword $(CPPROG)) CPPROG:=$(firstword $(CPPROG))
endif endif
@ -717,7 +763,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= RMPROG= __missing_command__
else else
RMPROG:=$(firstword $(RMPROG)) RMPROG:=$(firstword $(RMPROG))
endif endif
@ -726,14 +772,18 @@ 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= MVPROG= __missing_command__
else else
MVPROG:=$(firstword $(MVPROG)) MVPROG:=$(firstword $(MVPROG))
endif endif
endif endif
export MVPROG export MVPROG
ifndef ECHOREDIR ifndef ECHOREDIR
ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO)) ifndef inUnix
ECHOREDIR=echo
else
ECHOREDIR=$(ECHO)
endif
endif endif
ifndef COPY ifndef COPY
COPY:=$(CPPROG) -fp COPY:=$(CPPROG) -fp
@ -771,7 +821,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= PPUMOVE= __missing_command__
else else
PPUMOVE:=$(firstword $(PPUMOVE)) PPUMOVE:=$(firstword $(PPUMOVE))
endif endif
@ -780,7 +830,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= FPCMAKE= __missing_command__
else else
FPCMAKE:=$(firstword $(FPCMAKE)) FPCMAKE:=$(firstword $(FPCMAKE))
endif endif
@ -789,7 +839,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= ZIPPROG= __missing_command__
else else
ZIPPROG:=$(firstword $(ZIPPROG)) ZIPPROG:=$(firstword $(ZIPPROG))
endif endif
@ -798,21 +848,25 @@ 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= TARPROG= __missing_command__
else else
TARPROG:=$(firstword $(TARPROG)) TARPROG:=$(firstword $(TARPROG))
endif endif
endif endif
export TARPROG export TARPROG
ASNAME=as ASNAME=$(BINUTILSPREFIX)as
LDNAME=ld LDNAME=$(BINUTILSPREFIX)ld
ARNAME=ar ARNAME=$(BINUTILSPREFIX)ar
RCNAME=rc RCNAME=$(BINUTILSPREFIX)rc
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
ifeq ($(CROSSBINDIR),)
ASNAME=asw ASNAME=asw
LDNAME=ldw LDNAME=ldw
ARNAME=arw ARNAME=arw
endif endif
endif
endif
ifndef ASPROG ifndef ASPROG
ifdef CROSSBINDIR ifdef CROSSBINDIR
ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@ -845,7 +899,7 @@ AS=$(ASPROG)
LD=$(LDPROG) LD=$(LDPROG)
RC=$(RCPROG) RC=$(RCPROG)
AR=$(ARPROG) AR=$(ARPROG)
PPAS=ppas$(BATCHEXT) PPAS=ppas$(SRCBATCHEXT)
ifdef inUnix ifdef inUnix
LDCONFIG=ldconfig LDCONFIG=ldconfig
else else
@ -893,6 +947,14 @@ endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
endif endif
ifndef CROSSBOOTSTRAP
ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
endif
ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-Xr$(RLINKPATH)
endif
endif
ifdef UNITDIR ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif endif
@ -919,8 +981,12 @@ ifdef RELEASE
ifeq ($(CPU_TARGET),i386) ifeq ($(CPU_TARGET),i386)
FPCCPUOPT:=-OG2p3 FPCCPUOPT:=-OG2p3
else else
ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1
else
FPCCPUOPT:= FPCCPUOPT:=
endif endif
endif
override FPCOPT+=-Xs $(FPCCPUOPT) -n override FPCOPT+=-Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE override FPCOPTDEF+=RELEASE
endif endif
@ -1002,7 +1068,7 @@ EXECPPAS:=@$(PPAS)
endif endif
endif endif
.PHONY: fpc_loaders .PHONY: fpc_loaders
ifdef TARGET_LOADERS ifneq ($(TARGET_LOADERS),)
override ALLTARGET+=fpc_loaders override ALLTARGET+=fpc_loaders
override CLEANTARGET+=fpc_loaders_clean override CLEANTARGET+=fpc_loaders_clean
override INSTALLTARGET+=fpc_loaders_install override INSTALLTARGET+=fpc_loaders_install
@ -1017,7 +1083,7 @@ fpc_loaders_install:
$(MKDIR) $(INSTALL_UNITDIR) $(MKDIR) $(INSTALL_UNITDIR)
$(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR) $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)
.PHONY: fpc_units .PHONY: fpc_units
ifdef TARGET_UNITS ifneq ($(TARGET_UNITS),)
override ALLTARGET+=fpc_units override ALLTARGET+=fpc_units
override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@ -1039,7 +1105,7 @@ fpc_debug:
$(MAKE) all DEBUG=1 $(MAKE) all DEBUG=1
fpc_release: fpc_release:
$(MAKE) all RELEASE=1 $(MAKE) all RELEASE=1
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res .SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
%$(PPUEXT): %.pp %$(PPUEXT): %.pp
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
@ -1052,10 +1118,14 @@ fpc_release:
%$(EXEEXT): %.pas %$(EXEEXT): %.pas
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
%$(EXEEXT): %.dpr
$(COMPILER) $<
$(EXECPPAS)
%.res: %.rc %.res: %.rc
windres -i $< -o $@ windres -i $< -o $@
vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
ifdef INSTALL_UNITS ifdef INSTALL_UNITS
@ -1132,6 +1202,9 @@ override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
endif endif
ifdef CLEANPPUFILES ifdef CLEANPPUFILES
override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
ifdef DEBUGSYMEXT
override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
endif
override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
endif endif
@ -1155,6 +1228,7 @@ ifdef LIB_NAME
-$(DEL) $(LIB_NAME) $(LIB_FULLNAME) -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
endif endif
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
fpc_distclean: clean fpc_distclean: clean
ifdef COMPILER_UNITTARGETDIR ifdef COMPILER_UNITTARGETDIR
TARGETDIRCLEAN=fpc_clean TARGETDIRCLEAN=fpc_clean
@ -1166,9 +1240,13 @@ endif
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-$(DELTREE) *$(SMARTEXT) -$(DELTREE) *$(SMARTEXT)
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *_ppas$(BATCHEXT)
ifdef AOUTEXT ifdef AOUTEXT
-$(DEL) *$(AOUTEXT) -$(DEL) *$(AOUTEXT)
endif endif
ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT)
endif
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
fpc_baseinfo: fpc_baseinfo:
@ -1302,9 +1380,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
%$(OEXT) : %.as %$(OEXT) : %.as
$(AS) -o $*$(OEXT) $*.as $(AS) -o $*$(OEXT) $*.as
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pas $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pas $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pas $(REDIR) $(COMPILER) -Us -Sg $(SYSTEMUNIT).pas
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 $(REDIR) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(SYSTEMUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
@ -1333,31 +1411,35 @@ crt$(PPUEXT) : crt.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT) printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(REDIR) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/math.pp $(REDIR) $(COMPILER) $(OBJPASDIR)/math.pp
varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \ varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
$(OBJPASDIR)/varutilh.inc varutils.pp $(OBJPASDIR)/varutilh.inc varutils.pp
$(COMPILER) -I$(OBJPASDIR) varutils.pp $(REDIR) $(COMPILER) -I$(OBJPASDIR) varutils.pp
types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp $(COMPILER) $(OBJPASDIR)/types.pp
rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/rtlconst.pp $(COMPILER) $(OBJPASDIR)/rtlconst.pp
sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/sysconst.pp $(COMPILER) $(OBJPASDIR)/sysconst.pp
dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp
convutil$(PPUEXT) : $(OBJPASDIR)/convutil.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/convutil.pp
strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp sysutils$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/strutils.pp
ucomplex$(PPUEXT): $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) ucomplex$(PPUEXT): $(INC)/ucomplex.pp math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Sg $(INC)/heaptrc.pp $(REDIR) $(COMPILER) -Sg $(INC)/heaptrc.pp
lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT) lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)
charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT)

View File

@ -13,7 +13,8 @@ units=$(SYSTEMUNIT) objpas strings \
dos crt objects printer matrix \ dos crt objects printer matrix \
sysutils classes math typinfo varutils winsock \ sysutils classes math typinfo varutils winsock \
charset ucomplex cpu mmx getopts heaptrc lineinfo dynlibs \ charset ucomplex cpu mmx getopts heaptrc lineinfo dynlibs \
video mouse keyboard variants types rtlconst sysconst dateutil video mouse keyboard variants types rtlconst sysconst dateutil \
strutils convutil
rsts=math varutils typinfo variants pmhelp classes sysconst dateutil rsts=math varutils typinfo variants pmhelp classes sysconst dateutil
[require] [require]
@ -86,10 +87,10 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
# #
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pas $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pas $(SYSDEPS)
$(COMPILER) -Us -Sg $(SYSTEMUNIT).pas $(REDIR) $(COMPILER) -Us -Sg $(SYSTEMUNIT).pas
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 $(REDIR) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
@ -157,35 +158,41 @@ printer$(PPUEXT) : printer.pas $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT)
# #
sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) objpas$(PPUEXT) dos$(PPUEXT) sysconst$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(REDIR) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/math.pp $(REDIR) $(COMPILER) $(OBJPASDIR)/math.pp
varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \ varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
$(OBJPASDIR)/varutilh.inc varutils.pp $(OBJPASDIR)/varutilh.inc varutils.pp
$(COMPILER) -I$(OBJPASDIR) varutils.pp $(REDIR) $(COMPILER) -I$(OBJPASDIR) varutils.pp
types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp $(COMPILER) $(OBJPASDIR)/types.pp
rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/rtlconst.pp $(COMPILER) $(OBJPASDIR)/rtlconst.pp
sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/sysconst.pp $(COMPILER) $(OBJPASDIR)/sysconst.pp
dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp
convutil$(PPUEXT) : $(OBJPASDIR)/convutil.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/convutil.pp
strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp sysutils$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/strutils.pp
# #
# Other system-independent RTL Units # Other system-independent RTL Units
# #
@ -199,7 +206,7 @@ mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT) getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)
heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Sg $(INC)/heaptrc.pp $(REDIR) $(COMPILER) -Sg $(INC)/heaptrc.pp
lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT) lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)