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

* Changed which files is copied, when USEUNITDIR is defined

Browse Source
This commit is contained in:
olle 2004-04-06 21:49:37 +00:00
parent 19f8e5ff4c
commit 65570a3d6b
2 changed files with 96 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
tests/units/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/04/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 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -37,22 +37,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
@ -117,6 +108,7 @@ FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
endif endif
export FPC FPC_VERSION FPC_COMPILERINFO export FPC FPC_VERSION FPC_COMPILERINFO
unexport CHECKDEPEND ALLDEPENDENCIES unexport CHECKDEPEND ALLDEPENDENCIES
BSDTARGETS=freebsd netbsd openbsd darwin
ifndef CPU_TARGET ifndef CPU_TARGET
ifdef CPU_TARGET_DEFAULT ifdef CPU_TARGET_DEFAULT
CPU_TARGET=$(CPU_TARGET_DEFAULT) CPU_TARGET=$(CPU_TARGET_DEFAULT)
@ -155,6 +147,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),$(BSDTARGETS)),)
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))
@ -184,11 +182,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
@ -225,6 +226,9 @@ endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),darwin)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
@ -244,6 +248,9 @@ endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_SOURCE),darwin)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
@ -328,8 +335,12 @@ ifdef UNIXINSTALLDIR
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)
@ -356,8 +367,12 @@ ifdef UNIXINSTALLDIR
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
@ -377,15 +392,23 @@ 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/fpc-$(FPC_VERSION)/$(PACKAGE_NAME)
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)
@ -407,6 +430,7 @@ endif
else else
CROSSBINDIR= CROSSBINDIR=
endif endif
BATCHEXT=.bat
LOADEREXT=.as LOADEREXT=.as
EXEEXT=.exe EXEEXT=.exe
PPLEXT=.ppl PPLEXT=.ppl
@ -439,24 +463,28 @@ ASMEXT=.asm
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
endif 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
@ -468,6 +496,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
@ -476,6 +505,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,16 +523,19 @@ 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
@ -514,10 +547,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
@ -546,24 +583,28 @@ FPCMADE=fpcmade.dos
ZIPSUFFIX=watcom ZIPSUFFIX=watcom
endif 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 +621,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 +654,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 +665,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 +676,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 +699,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 +715,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 +729,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 +743,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 +755,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 +764,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,7 +773,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= MVPROG= __missing_command__
else else
MVPROG:=$(firstword $(MVPROG)) MVPROG:=$(firstword $(MVPROG))
endif endif
@ -775,7 +822,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
@ -784,7 +831,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
@ -793,7 +840,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
@ -802,7 +849,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= TARPROG= __missing_command__
else else
TARPROG:=$(firstword $(TARPROG)) TARPROG:=$(firstword $(TARPROG))
endif endif
@ -814,9 +861,11 @@ ARNAME=$(BINUTILSPREFIX)ar
RCNAME=$(BINUTILSPREFIX)rc RCNAME=$(BINUTILSPREFIX)rc
ifneq ($(findstring 1.0.,$(FPC_VERSION)),) ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
ASNAME=as ifeq ($(CROSSBINDIR),)
LDNAME=ld ASNAME=asw
ARNAME=ar LDNAME=ldw
ARNAME=arw
endif
endif endif
endif endif
ifndef ASPROG ifndef ASPROG
@ -851,7 +900,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
@ -916,6 +965,11 @@ ifeq ($(CPU_TARGET),x86_64)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif endif
ifeq ($(OS_TARGET),linux)
ifeq ($(CPU_TARGET),arm)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifeq ($(OS_TARGET),go32v2) ifeq ($(OS_TARGET),go32v2)
ifeq ($(CPU_TARGET),i386) ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
@ -1328,6 +1382,9 @@ ifdef CLEAN_FILES
endif endif
ifdef LIB_NAME ifdef LIB_NAME
-$(DEL) $(LIB_NAME) $(LIB_FULLNAME) -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
endif
ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT)
endif endif
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
fpc_distclean: clean fpc_distclean: clean
@ -1341,6 +1398,7 @@ 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
@ -1488,7 +1546,10 @@ clean : cleanall
$(DELTREE) $(DUMMYINSTALLDIR) $(DELTREE) $(DUMMYINSTALLDIR)
else else
rtl: rtl:
$(COPY) $(USEUNITDIR)/* . -$(COPY) $(USEUNITDIR)/*$(PPUEXT) .
-$(COPY) $(USEUNITDIR)/*$(OEXT) .
-$(COPY) $(USEUNITDIR)/*$(ASMEXT) .
-$(COPY) $(USEUNITDIR)/*_ppas .
$(ECHO) Copied > $(FPCMADE) $(ECHO) Copied > $(FPCMADE)
ifdef FCL ifdef FCL
fcl: rtl fcl: rtl

6
tests/units/Makefile.fpc
View File

@ -46,7 +46,11 @@ clean : cleanall
else else
rtl: rtl:
$(COPY) $(USEUNITDIR)/* . # Just copying everything doesn't work, because then the Makefile will be overwritten
-$(COPY) $(USEUNITDIR)/*$(PPUEXT) .
-$(COPY) $(USEUNITDIR)/*$(OEXT) .
-$(COPY) $(USEUNITDIR)/*$(ASMEXT) .
-$(COPY) $(USEUNITDIR)/*_ppas .
$(ECHO) Copied > $(FPCMADE) $(ECHO) Copied > $(FPCMADE)
ifdef FCL ifdef FCL