From 86e92d9dafd14ed03a29bce2befb301ccf47c72a Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 12 Apr 2004 18:16:15 +0000 Subject: [PATCH] * i386 compilation on debian biarch fixed --- Makefile | 103 +++- ide/Makefile | 128 +++-- ide/Makefile.fpc | 6 +- packages/base/gdbint/Makefile | 128 +++-- utils/fpcm/fpcmake.inc | 878 +++++++++++++++++----------------- utils/fpcm/fpcmake.ini | 15 +- 6 files changed, 737 insertions(+), 521 deletions(-) diff --git a/Makefile b/Makefile index 010788699c..48dbf09205 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/21] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/04/12] # default: help 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 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 -BATCHEXT=.sh +SRCBATCHEXT=.sh else ifdef inOS2 -BATCHEXT=.cmd +SRCBATCHEXT=.cmd else -BATCHEXT=.bat +SRCBATCHEXT=.bat endif endif ifdef inUnix @@ -117,6 +108,7 @@ FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO)) endif export FPC FPC_VERSION FPC_COMPILERINFO unexport CHECKDEPEND ALLDEPENDENCIES +BSDTARGETS=freebsd netbsd openbsd darwin ifndef CPU_TARGET ifdef 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) 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 ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -318,6 +316,9 @@ endif ifeq ($(OS_TARGET),openbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),darwin) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif @@ -337,6 +338,9 @@ endif ifeq ($(OS_SOURCE),openbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_SOURCE),darwin) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif @@ -421,8 +425,12 @@ ifdef UNIXINSTALLDIR ifdef BSDhier SRCPREFIXDIR=share/src else +ifdef linuxHier +SRCPREFIXDIR=share/src +else SRCPREFIXDIR=src endif +endif ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCSUBDIR INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) @@ -449,8 +457,12 @@ ifdef UNIXINSTALLDIR ifdef BSDhier DOCPREFIXDIR=share/doc else +ifdef linuxHier +DOCPREFIXDIR=share/doc +else DOCPREFIXDIR=doc endif +endif ifdef INSTALL_FPCPACKAGE INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) else @@ -470,15 +482,23 @@ ifdef INSTALL_FPCPACKAGE ifdef BSDhier INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) 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) endif +endif else ifdef BSDhier INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) else +ifdef linuxHier +INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) +else INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) endif endif +endif else ifdef INSTALL_FPCPACKAGE INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME) @@ -500,6 +520,7 @@ endif else CROSSBINDIR= endif +BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe PPLEXT=.ppl @@ -532,24 +553,28 @@ ASMEXT=.asm SHAREDLIBEXT=.dll endif ifeq ($(OS_TARGET),linux) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.lnx ZIPSUFFIX=linux endif ifeq ($(OS_TARGET),freebsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.freebsd ZIPSUFFIX=freebsd endif ifeq ($(OS_TARGET),netbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif ifeq ($(OS_TARGET),openbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.openbsd @@ -561,6 +586,7 @@ FPCMADE=fpcmade.w32 ZIPSUFFIX=w32 endif ifeq ($(OS_TARGET),os2) +BATCHEXT=.cmd AOUTEXT=.out STATICLIBPREFIX= SHAREDLIBEXT=.dll @@ -569,6 +595,7 @@ ZIPSUFFIX=os2 ECHO=echo endif ifeq ($(OS_TARGET),emx) +BATCHEXT=.cmd AOUTEXT=.out STATICLIBPREFIX= SHAREDLIBEXT=.dll @@ -586,16 +613,19 @@ EXEEXT=.ttp FPCMADE=fpcmade.ata endif ifeq ($(OS_TARGET),beos) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.be ZIPSUFFIX=be endif ifeq ($(OS_TARGET),sunos) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.sun ZIPSUFFIX=sun endif ifeq ($(OS_TARGET),qnx) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.qnx ZIPSUFFIX=qnx @@ -607,11 +637,14 @@ FPCMADE=fpcmade.nw ZIPSUFFIX=nw endif ifeq ($(OS_TARGET),macos) +BATCHEXT= EXEEXT= FPCMADE=fpcmade.macos ZIPSUFFIX=macos +DEBUGSYMEXT=.xcoff endif ifeq ($(OS_TARGET),darwin) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.darwin @@ -640,24 +673,28 @@ FPCMADE=fpcmade.dos ZIPSUFFIX=watcom endif ifeq ($(OS_TARGET),linux) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.lnx ZIPSUFFIX=linux endif ifeq ($(OS_TARGET),freebsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.freebsd ZIPSUFFIX=freebsd endif ifeq ($(OS_TARGET),netbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif ifeq ($(OS_TARGET),openbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.openbsd @@ -674,6 +711,7 @@ FPCMADE=fpcmade.w32 ZIPSUFFIX=w32 endif ifeq ($(OS_TARGET),os2) +BATCHEXT=.cmd PPUEXT=.ppo ASMEXT=.so2 OEXT=.oo2 @@ -706,6 +744,7 @@ EXEEXT=.ttp FPCMADE=fpcmade.ata endif ifeq ($(OS_TARGET),beos) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -716,6 +755,7 @@ FPCMADE=fpcmade.be ZIPSUFFIX=be endif ifeq ($(OS_TARGET),sunos) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -726,6 +766,7 @@ FPCMADE=fpcmade.sun ZIPSUFFIX=sun endif ifeq ($(OS_TARGET),qnx) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -748,13 +789,15 @@ ZIPSUFFIX=nw EXEEXT=.nlm endif ifeq ($(OS_TARGET),macos) +BATCHEXT= PPUEXT=.ppu ASMEXT=.s OEXT=.o SMARTEXT=.sl STATICLIBEXT=.a EXEEXT= -FPCMADE=fpcmade.mcc +DEBUGSYMEXT=.xcoff +FPCMADE=fpcmade.macos endif endif ifndef ECHO @@ -762,7 +805,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) -ECHO= +ECHO= __missing_command__ else ECHO:=$(firstword $(ECHO)) endif @@ -776,7 +819,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(DATE),) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(DATE),) -DATE= +DATE= __missing_command__ else DATE:=$(firstword $(DATE)) endif @@ -790,7 +833,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(GINSTALL),) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(GINSTALL),) -GINSTALL= +GINSTALL= __missing_command__ else GINSTALL:=$(firstword $(GINSTALL)) endif @@ -802,7 +845,7 @@ export GINSTALL ifndef CPPROG CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(CPPROG),) -CPPROG= +CPPROG= __missing_command__ else CPPROG:=$(firstword $(CPPROG)) endif @@ -811,7 +854,7 @@ export CPPROG ifndef RMPROG RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(RMPROG),) -RMPROG= +RMPROG= __missing_command__ else RMPROG:=$(firstword $(RMPROG)) endif @@ -820,7 +863,7 @@ export RMPROG ifndef MVPROG MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(MVPROG),) -MVPROG= +MVPROG= __missing_command__ else MVPROG:=$(firstword $(MVPROG)) endif @@ -869,7 +912,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ifndef PPUMOVE PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(PPUMOVE),) -PPUMOVE= +PPUMOVE= __missing_command__ else PPUMOVE:=$(firstword $(PPUMOVE)) endif @@ -878,7 +921,7 @@ export PPUMOVE ifndef FPCMAKE FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(FPCMAKE),) -FPCMAKE= +FPCMAKE= __missing_command__ else FPCMAKE:=$(firstword $(FPCMAKE)) endif @@ -887,7 +930,7 @@ export FPCMAKE ifndef ZIPPROG ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ZIPPROG),) -ZIPPROG= +ZIPPROG= __missing_command__ else ZIPPROG:=$(firstword $(ZIPPROG)) endif @@ -896,7 +939,7 @@ export ZIPPROG ifndef TARPROG TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(TARPROG),) -TARPROG= +TARPROG= __missing_command__ else TARPROG:=$(firstword $(TARPROG)) endif @@ -947,7 +990,7 @@ AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) -PPAS=ppas$(BATCHEXT) +PPAS=ppas$(SRCBATCHEXT) ifdef inUnix LDCONFIG=ldconfig else @@ -1206,8 +1249,12 @@ ifdef RELEASE ifeq ($(CPU_TARGET),i386) FPCCPUOPT:=-OG2p3 else +ifeq ($(CPU_TARGET),powerpc) +FPCCPUOPT:=-O1 +else FPCCPUOPT:= endif +endif override FPCOPT+=-Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif @@ -1392,7 +1439,7 @@ USEZIPWRAPPER=1 endif ifdef USEZIPWRAPPER ZIPPATHSEP=$(PATHSEP) -ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT)) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) else ZIPPATHSEP=/ endif @@ -1467,6 +1514,9 @@ ifdef CLEAN_FILES endif ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) +endif +ifdef DEBUGSYMEXT + -$(DEL) *$(DEBUGSYMEXT) endif -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) fpc_distclean: clean @@ -1480,6 +1530,7 @@ endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) *_ppas$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) endif diff --git a/ide/Makefile b/ide/Makefile index f2d96799a2..b9635c4974 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/04/12] # default: all 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 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 -BATCHEXT=.sh +SRCBATCHEXT=.sh else ifdef inOS2 -BATCHEXT=.cmd +SRCBATCHEXT=.cmd else -BATCHEXT=.bat +SRCBATCHEXT=.bat endif endif ifdef inUnix @@ -117,6 +108,7 @@ FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO)) endif export FPC FPC_VERSION FPC_COMPILERINFO unexport CHECKDEPEND ALLDEPENDENCIES +BSDTARGETS=freebsd netbsd openbsd darwin ifndef CPU_TARGET ifdef 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) 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 ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -281,6 +279,9 @@ endif ifeq ($(OS_TARGET),openbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),darwin) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif @@ -300,6 +301,9 @@ endif ifeq ($(OS_SOURCE),openbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_SOURCE),darwin) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif @@ -384,8 +388,12 @@ ifdef UNIXINSTALLDIR ifdef BSDhier SRCPREFIXDIR=share/src else +ifdef linuxHier +SRCPREFIXDIR=share/src +else SRCPREFIXDIR=src endif +endif ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCSUBDIR INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) @@ -412,8 +420,12 @@ ifdef UNIXINSTALLDIR ifdef BSDhier DOCPREFIXDIR=share/doc else +ifdef linuxHier +DOCPREFIXDIR=share/doc +else DOCPREFIXDIR=doc endif +endif ifdef INSTALL_FPCPACKAGE INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) else @@ -433,15 +445,23 @@ ifdef INSTALL_FPCPACKAGE ifdef BSDhier INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) 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) endif +endif else ifdef BSDhier INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) else +ifdef linuxHier +INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) +else INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) endif endif +endif else ifdef INSTALL_FPCPACKAGE INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME) @@ -465,7 +485,19 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +ifeq ($(CPU_TARGET),i386) +ifneq ($(findstring x86_64,$(shell uname -a)),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -477,6 +509,7 @@ OTHERLIBDIR+=/usr/pkg/lib endif export GCCLIBDIR OTHERLIB endif +BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe PPLEXT=.ppl @@ -509,24 +542,28 @@ ASMEXT=.asm SHAREDLIBEXT=.dll endif ifeq ($(OS_TARGET),linux) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.lnx ZIPSUFFIX=linux endif ifeq ($(OS_TARGET),freebsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.freebsd ZIPSUFFIX=freebsd endif ifeq ($(OS_TARGET),netbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif ifeq ($(OS_TARGET),openbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.openbsd @@ -538,6 +575,7 @@ FPCMADE=fpcmade.w32 ZIPSUFFIX=w32 endif ifeq ($(OS_TARGET),os2) +BATCHEXT=.cmd AOUTEXT=.out STATICLIBPREFIX= SHAREDLIBEXT=.dll @@ -546,6 +584,7 @@ ZIPSUFFIX=os2 ECHO=echo endif ifeq ($(OS_TARGET),emx) +BATCHEXT=.cmd AOUTEXT=.out STATICLIBPREFIX= SHAREDLIBEXT=.dll @@ -563,16 +602,19 @@ EXEEXT=.ttp FPCMADE=fpcmade.ata endif ifeq ($(OS_TARGET),beos) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.be ZIPSUFFIX=be endif ifeq ($(OS_TARGET),sunos) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.sun ZIPSUFFIX=sun endif ifeq ($(OS_TARGET),qnx) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.qnx ZIPSUFFIX=qnx @@ -584,10 +626,14 @@ FPCMADE=fpcmade.nw ZIPSUFFIX=nw endif ifeq ($(OS_TARGET),macos) +BATCHEXT= EXEEXT= -FPCMADE=fpcmade.mcc +FPCMADE=fpcmade.macos +ZIPSUFFIX=macos +DEBUGSYMEXT=.xcoff endif ifeq ($(OS_TARGET),darwin) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.darwin @@ -616,24 +662,28 @@ FPCMADE=fpcmade.dos ZIPSUFFIX=watcom endif ifeq ($(OS_TARGET),linux) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.lnx ZIPSUFFIX=linux endif ifeq ($(OS_TARGET),freebsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.freebsd ZIPSUFFIX=freebsd endif ifeq ($(OS_TARGET),netbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif ifeq ($(OS_TARGET),openbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.openbsd @@ -650,6 +700,7 @@ FPCMADE=fpcmade.w32 ZIPSUFFIX=w32 endif ifeq ($(OS_TARGET),os2) +BATCHEXT=.cmd PPUEXT=.ppo ASMEXT=.so2 OEXT=.oo2 @@ -682,6 +733,7 @@ EXEEXT=.ttp FPCMADE=fpcmade.ata endif ifeq ($(OS_TARGET),beos) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -692,6 +744,7 @@ FPCMADE=fpcmade.be ZIPSUFFIX=be endif ifeq ($(OS_TARGET),sunos) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -702,6 +755,7 @@ FPCMADE=fpcmade.sun ZIPSUFFIX=sun endif ifeq ($(OS_TARGET),qnx) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -724,13 +778,15 @@ ZIPSUFFIX=nw EXEEXT=.nlm endif ifeq ($(OS_TARGET),macos) +BATCHEXT= PPUEXT=.ppu ASMEXT=.s OEXT=.o SMARTEXT=.sl STATICLIBEXT=.a EXEEXT= -FPCMADE=fpcmade.mcc +DEBUGSYMEXT=.xcoff +FPCMADE=fpcmade.macos endif endif ifndef ECHO @@ -738,7 +794,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) -ECHO= +ECHO= __missing_command__ else ECHO:=$(firstword $(ECHO)) endif @@ -752,7 +808,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(DATE),) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(DATE),) -DATE= +DATE= __missing_command__ else DATE:=$(firstword $(DATE)) endif @@ -766,7 +822,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(GINSTALL),) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(GINSTALL),) -GINSTALL= +GINSTALL= __missing_command__ else GINSTALL:=$(firstword $(GINSTALL)) endif @@ -778,7 +834,7 @@ export GINSTALL ifndef CPPROG CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(CPPROG),) -CPPROG= +CPPROG= __missing_command__ else CPPROG:=$(firstword $(CPPROG)) endif @@ -787,7 +843,7 @@ export CPPROG ifndef RMPROG RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(RMPROG),) -RMPROG= +RMPROG= __missing_command__ else RMPROG:=$(firstword $(RMPROG)) endif @@ -796,7 +852,7 @@ export RMPROG ifndef MVPROG MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(MVPROG),) -MVPROG= +MVPROG= __missing_command__ else MVPROG:=$(firstword $(MVPROG)) endif @@ -845,7 +901,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ifndef PPUMOVE PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(PPUMOVE),) -PPUMOVE= +PPUMOVE= __missing_command__ else PPUMOVE:=$(firstword $(PPUMOVE)) endif @@ -854,7 +910,7 @@ export PPUMOVE ifndef FPCMAKE FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(FPCMAKE),) -FPCMAKE= +FPCMAKE= __missing_command__ else FPCMAKE:=$(firstword $(FPCMAKE)) endif @@ -863,7 +919,7 @@ export FPCMAKE ifndef ZIPPROG ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ZIPPROG),) -ZIPPROG= +ZIPPROG= __missing_command__ else ZIPPROG:=$(firstword $(ZIPPROG)) endif @@ -872,7 +928,7 @@ export ZIPPROG ifndef TARPROG TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(TARPROG),) -TARPROG= +TARPROG= __missing_command__ else TARPROG:=$(firstword $(TARPROG)) endif @@ -884,9 +940,11 @@ ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc ifneq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) -ASNAME=as -LDNAME=ld -ARNAME=ar +ifeq ($(CROSSBINDIR),) +ASNAME=asw +LDNAME=ldw +ARNAME=arw +endif endif endif ifndef ASPROG @@ -921,7 +979,7 @@ AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) -PPAS=ppas$(BATCHEXT) +PPAS=ppas$(SRCBATCHEXT) ifdef inUnix LDCONFIG=ldconfig else @@ -1348,8 +1406,12 @@ ifdef RELEASE ifeq ($(CPU_TARGET),i386) FPCCPUOPT:=-OG2p3 else +ifeq ($(CPU_TARGET),powerpc) +FPCCPUOPT:=-O1 +else FPCCPUOPT:= endif +endif override FPCOPT+=-Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif @@ -1587,7 +1649,7 @@ USEZIPWRAPPER=1 endif ifdef USEZIPWRAPPER ZIPPATHSEP=$(PATHSEP) -ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT)) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) else ZIPPATHSEP=/ endif @@ -1662,6 +1724,9 @@ ifdef CLEAN_FILES endif ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) +endif +ifdef DEBUGSYMEXT + -$(DEL) *$(DEBUGSYMEXT) endif -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) fpc_distclean: clean @@ -1675,6 +1740,7 @@ endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) *_ppas$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) endif diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc index 4f42bd7bac..5d8534fe75 100644 --- a/ide/Makefile.fpc +++ b/ide/Makefile.fpc @@ -24,6 +24,7 @@ unitdir=compiler [require] packages=fv gdbint regexpr +libc=y [default] fpcdir=.. @@ -226,7 +227,10 @@ clean_compiler: # # $Log$ -# Revision 1.19 2004-01-05 23:29:35 marco +# Revision 1.20 2004-04-12 18:16:15 florian +# * i386 compilation on debian biarch fixed +# +# Revision 1.19 2004/01/05 23:29:35 marco # * fixed a few makefiles version numbers # # Revision 1.18 2003/11/01 22:45:29 marco diff --git a/packages/base/gdbint/Makefile b/packages/base/gdbint/Makefile index 1632d79a9d..a3aae81043 100644 --- a/packages/base/gdbint/Makefile +++ b/packages/base/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/04/12] # default: all 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 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 -BATCHEXT=.sh +SRCBATCHEXT=.sh else ifdef inOS2 -BATCHEXT=.cmd +SRCBATCHEXT=.cmd else -BATCHEXT=.bat +SRCBATCHEXT=.bat endif endif ifdef inUnix @@ -117,6 +108,7 @@ FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO)) endif export FPC FPC_VERSION FPC_COMPILERINFO unexport CHECKDEPEND ALLDEPENDENCIES +BSDTARGETS=freebsd netbsd openbsd darwin ifndef CPU_TARGET ifdef 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) 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 ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) @@ -255,6 +253,9 @@ endif ifeq ($(OS_TARGET),openbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),darwin) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif @@ -274,6 +275,9 @@ endif ifeq ($(OS_SOURCE),openbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_SOURCE),darwin) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif @@ -358,8 +362,12 @@ ifdef UNIXINSTALLDIR ifdef BSDhier SRCPREFIXDIR=share/src else +ifdef linuxHier +SRCPREFIXDIR=share/src +else SRCPREFIXDIR=src endif +endif ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCSUBDIR INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) @@ -386,8 +394,12 @@ ifdef UNIXINSTALLDIR ifdef BSDhier DOCPREFIXDIR=share/doc else +ifdef linuxHier +DOCPREFIXDIR=share/doc +else DOCPREFIXDIR=doc endif +endif ifdef INSTALL_FPCPACKAGE INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) else @@ -407,15 +419,23 @@ ifdef INSTALL_FPCPACKAGE ifdef BSDhier INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) 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) endif +endif else ifdef BSDhier INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) else +ifdef linuxHier +INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKAGE_VERSION) +else INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) endif endif +endif else ifdef INSTALL_FPCPACKAGE INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME) @@ -439,7 +459,19 @@ CROSSBINDIR= endif ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +ifeq ($(CPU_TARGET),i386) +ifneq ($(findstring x86_64,$(shell uname -a)),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') @@ -451,6 +483,7 @@ OTHERLIBDIR+=/usr/pkg/lib endif export GCCLIBDIR OTHERLIB endif +BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe PPLEXT=.ppl @@ -483,24 +516,28 @@ ASMEXT=.asm SHAREDLIBEXT=.dll endif ifeq ($(OS_TARGET),linux) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.lnx ZIPSUFFIX=linux endif ifeq ($(OS_TARGET),freebsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.freebsd ZIPSUFFIX=freebsd endif ifeq ($(OS_TARGET),netbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif ifeq ($(OS_TARGET),openbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.openbsd @@ -512,6 +549,7 @@ FPCMADE=fpcmade.w32 ZIPSUFFIX=w32 endif ifeq ($(OS_TARGET),os2) +BATCHEXT=.cmd AOUTEXT=.out STATICLIBPREFIX= SHAREDLIBEXT=.dll @@ -520,6 +558,7 @@ ZIPSUFFIX=os2 ECHO=echo endif ifeq ($(OS_TARGET),emx) +BATCHEXT=.cmd AOUTEXT=.out STATICLIBPREFIX= SHAREDLIBEXT=.dll @@ -537,16 +576,19 @@ EXEEXT=.ttp FPCMADE=fpcmade.ata endif ifeq ($(OS_TARGET),beos) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.be ZIPSUFFIX=be endif ifeq ($(OS_TARGET),sunos) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.sun ZIPSUFFIX=sun endif ifeq ($(OS_TARGET),qnx) +BATCHEXT=.sh EXEEXT= FPCMADE=fpcmade.qnx ZIPSUFFIX=qnx @@ -558,10 +600,14 @@ FPCMADE=fpcmade.nw ZIPSUFFIX=nw endif ifeq ($(OS_TARGET),macos) +BATCHEXT= EXEEXT= -FPCMADE=fpcmade.mcc +FPCMADE=fpcmade.macos +ZIPSUFFIX=macos +DEBUGSYMEXT=.xcoff endif ifeq ($(OS_TARGET),darwin) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.darwin @@ -590,24 +636,28 @@ FPCMADE=fpcmade.dos ZIPSUFFIX=watcom endif ifeq ($(OS_TARGET),linux) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.lnx ZIPSUFFIX=linux endif ifeq ($(OS_TARGET),freebsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.freebsd ZIPSUFFIX=freebsd endif ifeq ($(OS_TARGET),netbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif ifeq ($(OS_TARGET),openbsd) +BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 FPCMADE=fpcmade.openbsd @@ -624,6 +674,7 @@ FPCMADE=fpcmade.w32 ZIPSUFFIX=w32 endif ifeq ($(OS_TARGET),os2) +BATCHEXT=.cmd PPUEXT=.ppo ASMEXT=.so2 OEXT=.oo2 @@ -656,6 +707,7 @@ EXEEXT=.ttp FPCMADE=fpcmade.ata endif ifeq ($(OS_TARGET),beos) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -666,6 +718,7 @@ FPCMADE=fpcmade.be ZIPSUFFIX=be endif ifeq ($(OS_TARGET),sunos) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -676,6 +729,7 @@ FPCMADE=fpcmade.sun ZIPSUFFIX=sun endif ifeq ($(OS_TARGET),qnx) +BATCHEXT=.sh PPUEXT=.ppu ASMEXT=.s OEXT=.o @@ -698,13 +752,15 @@ ZIPSUFFIX=nw EXEEXT=.nlm endif ifeq ($(OS_TARGET),macos) +BATCHEXT= PPUEXT=.ppu ASMEXT=.s OEXT=.o SMARTEXT=.sl STATICLIBEXT=.a EXEEXT= -FPCMADE=fpcmade.mcc +DEBUGSYMEXT=.xcoff +FPCMADE=fpcmade.macos endif endif ifndef ECHO @@ -712,7 +768,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) -ECHO= +ECHO= __missing_command__ else ECHO:=$(firstword $(ECHO)) endif @@ -726,7 +782,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(DATE),) DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(DATE),) -DATE= +DATE= __missing_command__ else DATE:=$(firstword $(DATE)) endif @@ -740,7 +796,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(GINSTALL),) GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(GINSTALL),) -GINSTALL= +GINSTALL= __missing_command__ else GINSTALL:=$(firstword $(GINSTALL)) endif @@ -752,7 +808,7 @@ export GINSTALL ifndef CPPROG CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(CPPROG),) -CPPROG= +CPPROG= __missing_command__ else CPPROG:=$(firstword $(CPPROG)) endif @@ -761,7 +817,7 @@ export CPPROG ifndef RMPROG RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(RMPROG),) -RMPROG= +RMPROG= __missing_command__ else RMPROG:=$(firstword $(RMPROG)) endif @@ -770,7 +826,7 @@ export RMPROG ifndef MVPROG MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(MVPROG),) -MVPROG= +MVPROG= __missing_command__ else MVPROG:=$(firstword $(MVPROG)) endif @@ -819,7 +875,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ifndef PPUMOVE PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(PPUMOVE),) -PPUMOVE= +PPUMOVE= __missing_command__ else PPUMOVE:=$(firstword $(PPUMOVE)) endif @@ -828,7 +884,7 @@ export PPUMOVE ifndef FPCMAKE FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(FPCMAKE),) -FPCMAKE= +FPCMAKE= __missing_command__ else FPCMAKE:=$(firstword $(FPCMAKE)) endif @@ -837,7 +893,7 @@ export FPCMAKE ifndef ZIPPROG ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ZIPPROG),) -ZIPPROG= +ZIPPROG= __missing_command__ else ZIPPROG:=$(firstword $(ZIPPROG)) endif @@ -846,7 +902,7 @@ export ZIPPROG ifndef TARPROG TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(TARPROG),) -TARPROG= +TARPROG= __missing_command__ else TARPROG:=$(firstword $(TARPROG)) endif @@ -858,9 +914,11 @@ ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc ifneq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) -ASNAME=as -LDNAME=ld -ARNAME=ar +ifeq ($(CROSSBINDIR),) +ASNAME=asw +LDNAME=ldw +ARNAME=arw +endif endif endif ifndef ASPROG @@ -895,7 +953,7 @@ AS=$(ASPROG) LD=$(LDPROG) RC=$(RCPROG) AR=$(ARPROG) -PPAS=ppas$(BATCHEXT) +PPAS=ppas$(SRCBATCHEXT) ifdef inUnix LDCONFIG=ldconfig else @@ -1154,8 +1212,12 @@ ifdef RELEASE ifeq ($(CPU_TARGET),i386) FPCCPUOPT:=-OG2p3 else +ifeq ($(CPU_TARGET),powerpc) +FPCCPUOPT:=-O1 +else FPCCPUOPT:= endif +endif override FPCOPT+=-Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif @@ -1405,7 +1467,7 @@ USEZIPWRAPPER=1 endif ifdef USEZIPWRAPPER ZIPPATHSEP=$(PATHSEP) -ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT)) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) else ZIPPATHSEP=/ endif @@ -1480,6 +1542,9 @@ ifdef CLEAN_FILES endif ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) +endif +ifdef DEBUGSYMEXT + -$(DEL) *$(DEBUGSYMEXT) endif -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) fpc_distclean: clean @@ -1493,6 +1558,7 @@ endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) *_ppas$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) endif diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index d469f909da..040b5fd401 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..191] of string[240]=( +const fpcmakeini : array[0..192] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..191,1..240] of char=( +const fpcmakeini : array[0..192,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -696,11 +696,27 @@ const fpcmakeini : array[0..191,1..240] of char=( '# On linux, try to find where libgcc.a is.'#010+ 'ifeq ($(OS_SOURCE),linux)'#010+ 'ifndef GCCLIBDIR'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -print-li','bgcc-file-name`)'#010+ + 'ifeq ($(CPU_TARGET),i386)'#010+ + 'ifneq ($(findst','ring x86_64,$(shell uname -a)),)'#010+ + '# try debian biarch'#010+ + 'ifeq ($(BINUTILSPREFIX),)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ + 'else'#010+ + 'GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-na'+ + 'me`)'#010+ + 'endif'#010+ + 'else'#010+ + 'GCCLIBD','IR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-'+ + 'name`)'#010+ + 'endif'#010+ + 'else'#010+ + 'GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-na'+ + 'me`)'#010+ + 'endif'#010+ 'endif'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ - '"; print $1 }'#039')'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | aw','k '#039'{ ORS='+ + '" "; print $1 }'#039')'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -709,17 +725,17 @@ const fpcmakeini : array[0..191,1..240] of char=( 'OTHERLIBDIR+=/usr/pkg/lib'#010+ 'endif'#010+ 'export GCCLIBDIR OTHERLIB'#010+ - 'endif',#010+ + 'endif'#010+ #010+ #010+ '[extensions]'#010+ '#####################################################################'#010+ - '# Default extensions'#010+ + '# Default e','xtensions'#010+ '#####################################################################'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ 'BATCHEXT=.bat'#010+ - 'LOADE','REXT=.as'#010+ + 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ @@ -727,28 +743,28 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ - 'SHAREDLIBEXT=.so'#010+ + 'SHARE','DLIBEXT=.so'#010+ 'STATICLIBPREFIX=libp'#010+ 'RSTEXT=.rst'#010+ 'FPCMADE=fpcmade'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ #010+ - '#',' 1.0.x has target specific extensions for ppu files and objects'#010+ - 'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ + '# 1.0.x has target specific extensions for ppu files and objects'#010+ + 'ifeq ($(findstring 1.0.,$(FPC_VER','SION)),)'#010+ '# short version for 1.1 and above - no target specific extensions'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmad','e.v1'#010+ + 'FPCMADE=fpcmade.v1'#010+ 'PACKAGESUFFIX=v1'#010+ 'endif'#010+ #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmade.dos'#010+ + 'FPCMADE=fpcmade','.dos'#010+ 'ZIPSUFFIX=go32'#010+ 'endif'#010+ #010+ @@ -759,7 +775,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ZIPSUFFIX=watc'#010+ 'OEXT=.obj'#010+ 'ASMEXT=.asm'#010+ - 'SHARED','LIBEXT=.dll'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'endif'#010+ #010+ '# Linux'#010+ @@ -767,165 +783,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'FPCMADE=fpcmade.lnx'#010+ - 'ZIPSUFFIX=linux'#010+ - 'endif'#010+ - #010+ - '# FreeBSD'#010+ - 'ifeq ($(OS_TARGET),freebsd)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ - 'FPCMADE=fpcmade.freebsd'#010+ - 'ZIPSUFFIX=','freebsd'#010+ - 'endif'#010+ - #010+ - '# NetBSD'#010+ - 'ifeq ($(OS_TARGET),netbsd)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ - 'FPCMADE=fpcmade.netbsd'#010+ - 'ZIPSUFFIX=netbsd'#010+ - 'endif'#010+ - #010+ - '# OpenBSD'#010+ - 'ifeq ($(OS_TARGET),openbsd)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ - 'FPCMADE=fpcmade.openbsd'#010+ - 'ZIPSUFFI','X=openbsd'#010+ - 'endif'#010+ - #010+ - '# Win32'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ - 'SHAREDLIBEXT=.dll'#010+ - 'FPCMADE=fpcmade.w32'#010+ - 'ZIPSUFFIX=w32'#010+ - 'endif'#010+ - #010+ - '# OS/2'#010+ - 'ifeq ($(OS_TARGET),os2)'#010+ - 'BATCHEXT=.cmd'#010+ - 'AOUTEXT=.out'#010+ - 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ - 'FPCMADE=fpcmade.os2'#010+ - 'ZIPSUFFIX=os2'#010+ - 'ECH','O=echo'#010+ - 'endif'#010+ - #010+ - '# EMX'#010+ - 'ifeq ($(OS_TARGET),emx)'#010+ - 'BATCHEXT=.cmd'#010+ - 'AOUTEXT=.out'#010+ - 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ - 'FPCMADE=fpcmade.emx'#010+ - 'ZIPSUFFIX=emx'#010+ - 'ECHO=echo'#010+ - 'endif'#010+ - #010+ - '# Amiga'#010+ - 'ifeq ($(OS_TARGET),amiga)'#010+ - 'EXEEXT='#010+ - 'SHAREDLIBEXT=.library'#010+ - 'FPCMADE=fpcmade.amg',#010+ - 'endif'#010+ - #010+ - '# Atari'#010+ - 'ifeq ($(OS_TARGET),atari)'#010+ - 'EXEEXT=.ttp'#010+ - 'FPCMADE=fpcmade.ata'#010+ - 'endif'#010+ - #010+ - '# BeOS'#010+ - 'ifeq ($(OS_TARGET),beos)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'FPCMADE=fpcmade.be'#010+ - 'ZIPSUFFIX=be'#010+ - 'endif'#010+ - #010+ - '# Solaris'#010+ - 'ifeq ($(OS_TARGET),sunos)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'FPCMADE=fp','cmade.sun'#010+ - 'ZIPSUFFIX=sun'#010+ - 'endif'#010+ - #010+ - '# QNX'#010+ - 'ifeq ($(OS_TARGET),qnx)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'FPCMADE=fpcmade.qnx'#010+ - 'ZIPSUFFIX=qnx'#010+ - 'endif'#010+ - #010+ - '# Netware'#010+ - 'ifeq ($(OS_TARGET),netware)'#010+ - 'EXEEXT=.nlm'#010+ - 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmade.nw'#010+ - 'ZIPSUFFIX=nw'#010+ - 'endif'#010+ - #010+ - '# MacOS'#010+ - 'ife','q ($(OS_TARGET),macos)'#010+ - 'BATCHEXT='#010+ - 'EXEEXT='#010+ - 'FPCMADE=fpcmade.macos'#010+ - 'ZIPSUFFIX=macos'#010+ - 'DEBUGSYMEXT=.xcoff'#010+ - 'endif'#010+ - #010+ - '# Darwin'#010+ - 'ifeq ($(OS_TARGET),darwin)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ - 'FPCMADE=fpcmade.darwin'#010+ - 'ZIPSUFFIX=darwin'#010+ - 'endif'#010+ - #010+ - 'else'#010+ - '# long vers','ion for 1.0.x - target specific extensions'#010+ - #010+ - '# Go32v1'#010+ - 'ifeq ($(OS_TARGET),go32v1)'#010+ - 'PPUEXT=.pp1'#010+ - 'OEXT=.o1'#010+ - 'ASMEXT=.s1'#010+ - 'SMARTEXT=.sl1'#010+ - 'STATICLIBEXT=.a1'#010+ - 'SHAREDLIBEXT=.so1'#010+ - 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmade.v1'#010+ - 'PACKAGESUFFIX=v1'#010+ - 'endif'#010+ - #010+ - '# Go32v2'#010+ - 'ifeq ($(OS','_TARGET),go32v2)'#010+ - 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmade.dos'#010+ - 'ZIPSUFFIX=go32'#010+ - 'endif'#010+ - #010+ - '# watcom'#010+ - 'ifeq ($(OS_TARGET),watcom)'#010+ - 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmade.dos'#010+ - 'ZIPSUFFIX=watcom'#010+ - 'endif'#010+ - #010+ - '# Linux'#010+ - 'ifeq ($(OS_TARGET),linux)'#010+ - 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'HASSHAREDLIB','=1'#010+ - 'FPCMADE=fpcmade.lnx'#010+ + 'FPCMADE=','fpcmade.lnx'#010+ 'ZIPSUFFIX=linux'#010+ 'endif'#010+ #010+ @@ -942,8 +800,8 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1',#010+ - 'FPCMADE=fpcmade.netbsd'#010+ + 'HASSHAREDLIB=1'#010+ + 'FPCMADE=fp','cmade.netbsd'#010+ 'ZIPSUFFIX=netbsd'#010+ 'endif'#010+ #010+ @@ -958,10 +816,168 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ + 'SHAREDLIBEXT=.dll'#010+ + 'FPCMADE=fpcmade.w32'#010+ + 'ZIPSUFFI','X=w32'#010+ + 'endif'#010+ + #010+ + '# OS/2'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ + 'BATCHEXT=.cmd'#010+ + 'AOUTEXT=.out'#010+ + 'STATICLIBPREFIX='#010+ + 'SHAREDLIBEXT=.dll'#010+ + 'FPCMADE=fpcmade.os2'#010+ + 'ZIPSUFFIX=os2'#010+ + 'ECHO=echo'#010+ + 'endif'#010+ + #010+ + '# EMX'#010+ + 'ifeq ($(OS_TARGET),emx)'#010+ + 'BATCHEXT=.cmd'#010+ + 'AOUTEXT=.out'#010+ + 'STATICLIBPREFIX='#010+ + 'SHAREDLIB','EXT=.dll'#010+ + 'FPCMADE=fpcmade.emx'#010+ + 'ZIPSUFFIX=emx'#010+ + 'ECHO=echo'#010+ + 'endif'#010+ + #010+ + '# Amiga'#010+ + 'ifeq ($(OS_TARGET),amiga)'#010+ + 'EXEEXT='#010+ + 'SHAREDLIBEXT=.library'#010+ + 'FPCMADE=fpcmade.amg'#010+ + 'endif'#010+ + #010+ + '# Atari'#010+ + 'ifeq ($(OS_TARGET),atari)'#010+ + 'EXEEXT=.ttp'#010+ + 'FPCMADE=fpcmade.ata'#010+ + 'endif'#010+ + #010+ + '# BeOS'#010+ + 'ifeq ($(O','S_TARGET),beos)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'FPCMADE=fpcmade.be'#010+ + 'ZIPSUFFIX=be'#010+ + 'endif'#010+ + #010+ + '# Solaris'#010+ + 'ifeq ($(OS_TARGET),sunos)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'FPCMADE=fpcmade.sun'#010+ + 'ZIPSUFFIX=sun'#010+ + 'endif'#010+ + #010+ + '# QNX'#010+ + 'ifeq ($(OS_TARGET),qnx)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'FPCMADE=fpcmade','.qnx'#010+ + 'ZIPSUFFIX=qnx'#010+ + 'endif'#010+ + #010+ + '# Netware'#010+ + 'ifeq ($(OS_TARGET),netware)'#010+ + 'EXEEXT=.nlm'#010+ + 'STATICLIBPREFIX='#010+ + 'FPCMADE=fpcmade.nw'#010+ + 'ZIPSUFFIX=nw'#010+ + 'endif'#010+ + #010+ + '# MacOS'#010+ + 'ifeq ($(OS_TARGET),macos)'#010+ + 'BATCHEXT='#010+ + 'EXEEXT='#010+ + 'FPCMADE=fpcmade.macos'#010+ + 'ZIPSUFFIX=macos'#010+ + 'DEBUGSYMEXT=.xcoff',#010+ + 'endif'#010+ + #010+ + '# Darwin'#010+ + 'ifeq ($(OS_TARGET),darwin)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ + 'FPCMADE=fpcmade.darwin'#010+ + 'ZIPSUFFIX=darwin'#010+ + 'endif'#010+ + #010+ + 'else'#010+ + '# long version for 1.0.x - target specific extensions'#010+ + #010+ + '# Go32v1'#010+ + 'ifeq ($(OS_TARGET),go32v1)'#010+ + 'PPUEXT=.pp1'#010+ + 'OEXT=','.o1'#010+ + 'ASMEXT=.s1'#010+ + 'SMARTEXT=.sl1'#010+ + 'STATICLIBEXT=.a1'#010+ + 'SHAREDLIBEXT=.so1'#010+ + 'STATICLIBPREFIX='#010+ + 'FPCMADE=fpcmade.v1'#010+ + 'PACKAGESUFFIX=v1'#010+ + 'endif'#010+ + #010+ + '# Go32v2'#010+ + 'ifeq ($(OS_TARGET),go32v2)'#010+ + 'STATICLIBPREFIX='#010+ + 'FPCMADE=fpcmade.dos'#010+ + 'ZIPSUFFIX=go32'#010+ + 'endif'#010+ + #010+ + '# watcom'#010+ + 'ifeq ($(OS_T','ARGET),watcom)'#010+ + 'STATICLIBPREFIX='#010+ + 'FPCMADE=fpcmade.dos'#010+ + 'ZIPSUFFIX=watcom'#010+ + 'endif'#010+ + #010+ + '# Linux'#010+ + 'ifeq ($(OS_TARGET),linux)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ + 'FPCMADE=fpcmade.lnx'#010+ + 'ZIPSUFFIX=linux'#010+ + 'endif'#010+ + #010+ + '# FreeBSD'#010+ + 'ifeq ($(OS_TARGET),freebsd)'#010+ + 'BATCHEXT=.sh'#010, + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ + 'FPCMADE=fpcmade.freebsd'#010+ + 'ZIPSUFFIX=freebsd'#010+ + 'endif'#010+ + #010+ + '# NetBSD'#010+ + 'ifeq ($(OS_TARGET),netbsd)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ + 'FPCMADE=fpcmade.netbsd'#010+ + 'ZIPSUFFIX=netbsd'#010+ + 'endif'#010+ + #010+ + '# OpenBSD'#010+ + 'ifeq ($(OS_TARGET),openbsd)'#010+ + 'BATCHEXT=.s','h'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ + 'FPCMADE=fpcmade.openbsd'#010+ + 'ZIPSUFFIX=openbsd'#010+ + 'endif'#010+ + #010+ + '# Win32'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ 'PPUEXT=.ppw'#010+ 'OEXT=.ow'#010+ 'ASMEXT=.sw'#010+ - 'SMA','RTEXT=.slw'#010+ + 'SMARTEXT=.slw'#010+ 'STATICLIBEXT=.aw'#010+ 'SHAREDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.w32'#010+ @@ -969,7 +985,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ '# OS/2'#010+ - 'ifeq ($(OS_TARGET),os2)'#010+ + 'ife','q ($(OS_TARGET),os2)'#010+ 'BATCHEXT=.cmd'#010+ 'PPUEXT=.ppo'#010+ 'ASMEXT=.so2'#010+ @@ -978,7 +994,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'SMARTEXT=.sl2'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.ao2'#010+ - 'SHAREDLIBEXT','=.dll'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.os2'#010+ 'ZIPSUFFIX=emx'#010+ 'ECHO=echo'#010+ @@ -986,7 +1002,7 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Amiga'#010+ 'ifeq ($(OS_TARGET),amiga)'#010+ - 'EXEEXT='#010+ + 'EXEEXT','='#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.asm'#010+ 'OEXT=.o'#010+ @@ -997,7 +1013,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS_TARGET),atar','i)'#010+ + 'ifeq ($(OS_TARGET),atari)'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ @@ -1005,7 +1021,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'STATICLIBEXT=.a'#010+ 'EXEEXT=.ttp'#010+ 'FPCMADE=fpcmade.ata'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ '# BeOS'#010+ 'ifeq ($(OS_TARGET),beos)'#010+ @@ -1017,7 +1033,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ 'FPCMADE=fpcmade.be'#010+ - 'ZIPSUFFI','X=be'#010+ + 'ZIPSUFFIX=be'#010+ 'endif'#010+ #010+ '# Solaris'#010+ @@ -1026,7 +1042,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ - 'SMARTEXT=.sl'#010+ + 'SMARTE','XT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ 'FPCMADE=fpcmade.sun'#010+ @@ -1038,7 +1054,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'BATCHEXT=.sh'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ - 'OEXT=.','o'#010+ + 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ @@ -1047,7 +1063,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ '# Netware'#010+ - 'ifeq ($(OS_TARGET),netware)'#010+ + 'ifeq ($','(OS_TARGET),netware)'#010+ 'STATICLIBPREFIX='#010+ 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ @@ -1056,7 +1072,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.nlm'#010+ 'FPCMADE=fpcmade.nw'#010+ - 'ZIPSUFFIX','=nw'#010+ + 'ZIPSUFFIX=nw'#010+ 'EXEEXT=.nlm'#010+ 'endif'#010+ #010+ @@ -1065,7 +1081,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'BATCHEXT='#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ - 'OEXT=.o'#010+ + 'OEXT=.o'#010, 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ @@ -1077,18 +1093,18 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ '[defaulttools]'#010+ - '###','#################################################################'+ - '#'#010+ - '# Default Tools'#010+ '#####################################################################'#010+ + '# Default Tools'#010+ + '##############','######################################################'+ + '#'#010+ #010+ '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ - 'AR','NAME=$(BINUTILSPREFIX)ar'#010+ + 'ARNAME=$(BINUTILSPREFIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ + 'if','eq ($(OS_TARGET),win32)'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'ASNAME=asw'#010+ 'LDNAME=ldw'#010+ @@ -1097,12 +1113,12 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# assembler, redefine it if cross compiling'#010, + '# assembler, redefine it if cross compiling'#010+ 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'ASPROG=$(ASNAME)'#010+ + 'ASPROG=$(ASNAME)',#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1111,14 +1127,14 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'LDPROG=$(LDNAME)',#010+ + 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Resource compiler'#010+ 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ + 'RCPROG=$(CROSSBINDIR)/$(RCNAME)','$(SRCEXEEXT)'#010+ 'else'#010+ 'RCPROG=$(RCNAME)'#010+ 'endif'#010+ @@ -1129,7 +1145,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'ARP','ROG=$(ARNAME)'#010+ + 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1137,7 +1153,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'AS=$(ASPROG)'#010+ 'LD=$(LDPROG)'#010+ 'RC=$(RCPROG)'#010+ - 'AR=$(ARPROG)'#010+ + 'AR=$(ARPROG',')'#010+ #010+ '# ppas.bat / ppas.sh'#010+ 'PPAS=ppas$(SRCBATCHEXT)'#010+ @@ -1149,25 +1165,25 @@ const fpcmakeini : array[0..191,1..240] of char=( 'LDCONFIG='#010+ 'endif'#010+ #010+ - 'ifdef DAT','E'#010+ + 'ifdef DATE'#010+ 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ 'endif'#010+ #010+ - '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+ - 'uase'#010+ + '# Look if UPX is found for go32v2 and wi','n32. We can'#039't use $UPX b'+ + 'ecuase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),w','in32)'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ 'ifdef UPXPROG'#010+ - 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ - ')))'#010+ + 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(S','EARCHPAT'+ + 'H))))'#010+ 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ 'else'#010+ @@ -1180,7 +1196,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'export UPXPROG'#010+ #010+ '# Zip options'#010+ - 'Z','IPOPT=-9'#010+ + 'ZIPOPT=-9'#010+ 'ZIPEXT=.zip'#010+ #010+ '# Tar options'#010+ @@ -1188,7 +1204,7 @@ const fpcmakeini : array[0..191,1..240] of char=( 'TAROPT=vI'#010+ 'TAREXT=.tar.bz2'#010+ 'else'#010+ - 'TAROPT=vz'#010+ + 'TAROPT=vz',#010+ 'TAREXT=.tar.gz'#010+ 'endif'#010+ #010+ @@ -1196,19 +1212,18 @@ const fpcmakeini : array[0..191,1..240] of char=( '[command_begin]'#010+ '#####################################################################'#010+ '# Compiler Command Line'#010+ - '#########','###########################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ + '# Load commandline OPTDEF and add F','PC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ #010+ - '# Load command','line OPT and add target and unit dir to be sure'#010+ + '# Load commandline OPT and add target and unit dir to be sure'#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'override FPCOPT+=-T$(OS_TARGET)'#010+ + 'override FPCOPT','+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ @@ -1216,23 +1231,23 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ - 'ifneq ($(BINUTILSPREF','IX),)'#010+ + 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc'#010+ 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ + 'override FPCOPT+','=-Xr$(RLINKPATH)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# User dirs should be first, so they are looked at first'#010+ 'ifdef UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR','))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ + 'override FPC','OPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ @@ -1240,7 +1255,7 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Smartlinking'#010+ 'ifdef LINKSMART'#010+ - 'override F','PCOPT+=-XX'#010+ + 'override FPCOPT+=-XX'#010+ 'endif'#010+ #010+ '# Smartlinking creation'#010+ @@ -1249,20 +1264,20 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ '# Debug'#010+ - 'ifdef DEBUG'#010+ + 'i','fdef DEBUG'#010+ 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ #010+ '# Release mode (strip, optimize and don'#039't load fpc.cfg)'#010+ 'ifdef RELEASE'#010+ - 'ifeq ($(','CPU_TARGET),i386)'#010+ + 'ifeq ($(CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ 'else'#010+ 'ifeq ($(CPU_TARGET),powerpc)'#010+ 'FPCCPUOPT:=-O1'#010+ 'else'#010+ - 'FPCCPUOPT:='#010+ + 'FPCCPUO','PT:='#010+ 'endif'#010+ 'endif'#010+ 'override FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+ @@ -1274,11 +1289,11 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ - '# Opti','mizer (i386 only for now)'#010+ + '# Optimizer (i386 only for now)'#010+ 'ifdef OPTIMIZE'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'override FPCOPT+=-OG2p3'#010+ - 'endif'#010+ + 'endif'#010, 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ @@ -1288,19 +1303,19 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'over','ride FPCOPT+=$(COMPILER_OPTIONS)'#010+ + 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(','COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'over','ride FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ + 'override FPCO','PT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ @@ -1308,9 +1323,9 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target ','dirs and the prefix to use for clean/install'#010+ + '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ + 'override FPCOPT+=-FE$(COMPI','LER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ @@ -1318,31 +1333,31 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Uni','t target dir'#010+ + '# Unit target dir'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ - 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ + 'ifeq ($(C','OMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ - 'ifdef COMPILER_','TARGETDIR'#010+ + 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ + 'override UNITTARGETDIRPREFIX=$(TA','RGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Temporary hack to add HASUNIX define for linux 1.0.6 compiler'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ - 'ifeq ($(FPC_VERSION),1.0.','6)'#010+ + 'ifeq ($(FPC_VERSION),1.0.6)'#010+ 'override FPCOPTDEF+=HASUNIX'#010+ 'endif'#010+ 'endif'#010+ #010+ '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ - 'ifdef GCCLIBDIR'#010+ + 'ifdef GCCL','IBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ @@ -1351,23 +1366,23 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[command_end]'#010+ - '# Add com','mandline options last so they can override'#010+ + '# Add commandline options last so they can override'#010+ 'ifdef OPT'#010+ 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Add defines from FPCOPTDEF to FPCOPT'#010+ + '# Add defines',' from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'ov','erride FPCOPT+=@$(CFGFILE)'#010+ + 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ - 'ifdef USEENV'#010+ + 'ifdef USEENV',#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ @@ -1375,9 +1390,9 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ - #010, + #010+ '# also call ppas if with command option -s'#010+ - '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ + '# but only if the FULL_SOURCE and FULL_TARGET are equa','l'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -1388,19 +1403,19 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '####','################################################################'+ - '#'#010+ - '# Loaders'#010+ '#####################################################################'#010+ + '# Loaders'#010+ + '#####################','###############################################'+ + '#'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ 'ifdef TARGET_LOADERS'#010+ 'override ALLTARGET+=fpc_loaders'#010+ - 'override CLEANTARGE','T+=fpc_loaders_clean'#010+ + 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'override LOADEROFILES:=$(addsuf','fix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ @@ -1409,28 +1424,27 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ - ' ',' -$(DEL) $(LOADEROFILES)'#010+ + ' -$(DEL) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + ' ','$(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ #010+ #010+ '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ - '#####','###############################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ - 'ifdef TARGET_UNITS'#010+ + 'ifdef TARGET','_UNITS'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ - 'override IMPLICITUNITPPUFILES=$(addsuffix $(','PPUEXT),$(TARGET_IMPLICI'+ - 'TUNITS))'#010+ - 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ + 'NITS))'#010+ + 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES',')'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ @@ -1438,26 +1452,26 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[exerules]'#010+ - '##############################','######################################'+ - '#'#010+ - '# Exes'#010+ '#####################################################################'#010+ + '# Exes'#010+ + '##################################################','##################'+ + '#'#010+ #010+ '.PHONY: fpc_exes'#010+ #010+ 'ifdef TARGET_PROGRAMS'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ - 'override EXEOFILES:=$(','addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+ - 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ + 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),','$(TARGET_PROGRAMS))'+ ')'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ - 'ifeq ','($(OS_TARGET),os2)'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),emx)'#010+ + 'ifeq ','($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'endif'#010+ @@ -1466,60 +1480,62 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '#########','###########################################################'+ - '#'#010+ - '# Resource strings'#010+ '#####################################################################'#010+ + '# Resource strings'#010+ + '#################','###################################################'+ + '#'#010+ #010+ 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEAN','RSTFILES+=$(RSTFILES)'#010+ + 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ '[examplerules]'#010+ - '#####################################################################'#010+ + '####################################################','################'+ + '#'#010+ '# Examples'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifdef TARGET_EXAMPLES',#010+ + 'ifdef TARGET_EXAMPLES'#010+ 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ - 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_E'+ - 'XAMPLES)))'#010+ + 'LES)) $(adds','uffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET'+ + '_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ - 'override ','EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+ - 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ + 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ + 'refix $(STATICLIBPREFIX),$(addsuffix',' $(STATICLIBEXT),$(TARGET_EXAMPL'+ 'ES)))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+','=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+','=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsu','ffix _all,$(TARGET_EXAMPLED'+ - 'IRS))'#010+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ + 'S))'#010+ #010+ #010+ '[compilerules]'#010+ - '#####################################################################'#010+ + '###############################################','#####################'+ + '#'#010+ '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_all fpc_smart',' fpc_debug fpc_release'#010+ + '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ - ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ + ' @$(ECHOREDIR) Compile','d > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ #010+ @@ -1529,11 +1545,11 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ #010+ - 'fpc_rele','ase:'#010+ + 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rules, available for both possible .pp and .pas exte'+ - 'nsions'#010+ + '# General compile rules, available for both possible .pp and ','.pas ex'+ + 'tensions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res'#010+ #010+ @@ -1541,12 +1557,12 @@ const fpcmakeini : array[0..191,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$','(PPUEXT): %.pas'#010+ + '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ - ' $(COMPILER) $<'#010+ + ' $(COMPILER) ','$<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ @@ -1555,161 +1571,161 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '%$(EXEEXT): %.dpr'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPP','AS)'#010+ + ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ '# Search paths for .ppu and .pp and .pas .dpr'#010+ - 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath',' %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $','(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[libraryrules]'#010+ - '#####################################################################'#010+ + '################','####################################################'+ + '#'#010+ '# Library'#010+ '#####################################################################'#010+ #010+ - '.PHONY: ','fpc_shared'#010+ + '.PHONY: fpc_shared'#010+ #010+ 'ifndef LIB_FULLNAME'#010+ 'ifdef LIB_VERSION'#010+ 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ 'else'#010+ - 'LIB_FULLNAME=$(LIB_NAME)'#010+ + 'LI','B_FULLNAME=$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef LIB_SHAREDUNITS'#010+ 'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ 'fpc_shared: all'#010+ 'ifdef HASSHAREDLIB'#010+ ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ - 'else'#010+ + 'els','e'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ '[installrules]'#010+ - '#####################################################################'#010, + '#####################################################################'#010+ '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ + '.PHONY: fp','c_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ - 'if','def INSTALL_BUILDUNIT'#010+ + 'ifdef INSTALL_BUILDUNIT'#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ - '(INSTALLPPUFILES))'#010+ + '(INST','ALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(STATICLIBP','REFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ - 'T),$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ - 'PPUFILES))'#010+ + 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+ + ',$(INSTALLPPUFILES)))'#010+ + 'override INSTALLPPUFILES:=$(addpref','ix $(UNITTARGETDIRPREFIX),$(INSTA'+ + 'LLPPUFILES))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ - 'EFIX),$(INSTALLPPULINKFILES',')))'#010+ + 'EFIX),$(INSTALLPPULINKFILES)))'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ - 'ifdef INSTALLEXEFILES'#010+ + 'ifdef INSTALLEXEF','ILES'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+ 'ILES))'#010+ 'endif'#010+ #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ - 'ifdef INSTALLEXEFILE','S'#010+ + 'ifdef INSTALLEXEFILES'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ - ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ + ' ','-$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ - 'ifdef FPCM','AKE'#010+ + 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ - '# a safety check is done if Makefile.fpc is available'#010+ + '# a safety check is ','done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+ - ' ',' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ + 'en','dif'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'ifneq ($(INSTALLPP','ULINKFILES),)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ + 'ifneq ($(wildcar','d $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_','FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL_DATADIR)'#010+ + ' $(MKDIR) $(','INSTALL_DATADIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ - ' $(MKDIR) $(INSTALL_SOURCEDI','R)'#010+ + ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distcl','ean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ - ' $(COPY) $(EXAMPLESOU','RCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ - 'AMPLEDIR)'#010+ + ' $(COPYTREE) $(addsuffix /*',',$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ + 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ - '#',' Dist Install'#010+ + '# Dist Install'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_distinstall'#010+ + '.PHONY: fpc_','distinstall'#010+ #010+ 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ '[zipinstallrules]'#010+ - '#####################################################################'#010, + '#####################################################################'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinsta','ll fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ - '# subdir, because the deltree can'#039't ','see the whole tree to remove'+ - #010+ + '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ - 'PACKDIR=/tmp/fpc-pack'#010+ + 'PAC','KDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1717,14 +1733,14 @@ const fpcmakeini : array[0..191,1..240] of char=( 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ - 'else'#010, + 'else'#010+ 'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ - 'ifdef DIST_ZIPTARGET'#010+ + 'ifdef D','IST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ @@ -1734,7 +1750,7 @@ const fpcmakeini : array[0..191,1..240] of char=( '# Use tar by default under linux'#010+ 'ifndef USEZIP'#010+ 'ifdef inUnix'#010+ - 'USETAR=1',#010+ + 'USETAR=1'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1743,45 +1759,44 @@ const fpcmakeini : array[0..191,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able to run in the current OS so fix'#010+ + '# W','e need to be able to run in the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP','),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+ - ')'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ - '# Create commands to create the zip/tar file'#010+ + '# Create commands to create the ','zip/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFI','LE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ - 'else'#010+ + 'else'#010, 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ 'endif'#010+ #010+ - 'fpc_zipi','nstall:'#010+ + 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ - ' $(MKDIR) $(DIST_DESTDIR)'#010+ + ' $(MKDIR) $(DI','ST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ - 'ifneq ($(ECHOREDIR),echo)'#010, + 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ - #010+ + ' $(ECHOREDIR) -e ','"$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ + 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZI','PCMD_CDPACK) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CD','BASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -1790,30 +1805,28 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' ',' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zipsourceinstall:'#010+ + 'fpc_','zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE',') fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=ex'+ - 'm'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+ 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ + ' $(MAKE',') fpc_zipinstall ZIPTARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ '#####################################################################'#010+ '# Clean rules'#010+ - '#####','###############################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall ','fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ @@ -1821,72 +1834,72 @@ const fpcmakeini : array[0..191,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'override CLEANP','PUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ + 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ - 'LEANPPUFILES)))'#010+ - 'override C','LEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+ - 'UFILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ - 'IX),$(CLEANPPULINKFILES)))'#010+ + 'override CLEANPPULINKFI','LES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + '(CLEANPPUFILES)))'#010+ + 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ + 'ILES))'#010+ + 'override CLEANPPULINKFILES:=$(','wildcard $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEAN','EXEFILES)'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ + 'ifneq ($(CLEANPPULINKF','ILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ - 'end','if'#010+ + 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ + ' -$(DEL) $(LIB_NA','ME) $(LIB_FULLNAME)'#010+ 'endif'#010+ 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res lin','k.res $'+ - '(FPCEXTFILE) $(REDIRFILE)'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ + 'PCEXTFILE) $(REDIRFILE)'#010+ #009#009#010+ 'fpc_distclean: clean'#010+ #010+ - '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ + '# Also run clean first if targetdir is ','set. Unittargetdir is always'#010+ '# set if targetdir or unittargetdir is specified'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ - 'fpc_','cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ + 'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ - 'endif'#010+ + 'e','ndif'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' ',' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $'+ - '(FPCEXTFILE) $(REDIRFILE)'#010+ - ' -$(DEL) *_ppas$(BATCHEXT)'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ + 'PCEXTFILE) $(REDIRFILE)'#010+ + ' ',' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ #010+ #010+ '[baseinforules]'#010+ - '################################################','####################'+ - '#'#010+ - '# Base info rules'#010+ '#####################################################################'#010+ + '# Base info rules'#010+ + '#########################################################','###########'+ + '#'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ @@ -1895,91 +1908,91 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' ',' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ + ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ + ' @$(ECHO) Package Version.. $(PACKAGE_VERS','ION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ - ' @$(ECHO) FPC ','Version.. $(FPC_VERSION)'#010+ + ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ - ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ + ' @$(ECHO) Target C','PU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ - ' @$(ECHO) Full Source.. $','(FULL_SOURCE)'#010+ + ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Directory info =='#010+ + ' @$(ECHO) =','= Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Basedir.........',' $(BASEDIR)'#010+ + ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ - ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ + ' @$(ECHO) CrossBinDir..... $(CRO','SSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) G','CC library..... $(GCCLIBDIR)'#010+ + ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Tools info =='#010+ + ' ',' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ - ' @$(ECHO) Ar..','...... $(AR)'#010+ + ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Mv........ $(MVPROG)'#010+ + ' @$(ECHO) Mv........ $(M','VPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ - ' @$(ECHO) ',' Echo...... $(ECHO)'#010+ + ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ + ' ',' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ - ' @$(ECHO) Zip....','... $(ZIPPROG)'#010+ + ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ + ' @$(E','CHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ - ' @$(ECHO) Target Implicit Units','. $(TARGET_IMPLICITUNITS)'#010+ + ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ - ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ + ' @$(','ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ - ' @$(ECHO) Target ExampleDirs..','.. $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ - ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ + ' ',' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ - ' @$(ECHO) ',' Install Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ - ' @$(ECHO)'#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECHO) ZipSuffi','x............ $(ZIPSUFFIX)'#010+ + ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ - ' @$(ECHO)'#010+ + ' ','@$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ - ' @$(ECHO) ',' Install library dir.. $(INSTALL_LIBDIR)'#010+ - ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ + ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ + ' @$(ECHO) Install units dir.... $(INSTALL_UNITDI','R)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ - ' @$(ECHO) Ins','tall example dir.. $(INSTALL_EXAMPLEDIR)'#010+ - ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(ECHO) Install data dir..... $(INSTALL_DATADI','R)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ - ' @$(','ECHO)'#010+ + ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ - '# Info rules'#010+ + '# Info r','ules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_info'#010+ @@ -1987,55 +2000,57 @@ const fpcmakeini : array[0..191,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '#########','###########################################################'+ - '#'#010+ - '# Rebuild Makefile'#010+ '#####################################################################'#010+ + '# Rebuild Makefile'#010+ + '#################','###################################################'+ + '#'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' fpc_make','file_dirs'#010+ + ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ - 'ifdef TARGET_DIRS'#010+ + 'if','def TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE',') -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ - 'GET_EXAMPLEDIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ - 'EXAMPLEDIRS))'#010+ + 'fpc_makefile_sub2: $(','addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefiles: fpc_make','file fpc_makefile_dirs'#010+ + 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ - '#####################################################################'#010+ + '#########################################################','###########'+ + '#'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ - 'include f','pcmake.loc'#010+ + 'include fpcmake.loc'#010+ 'endif'#010+ #010+ #010+ '[userrules]'#010+ - '#####################################################################'#010+ + '##################################################################','##'+ + '#'#010+ '# Users rules'#010+ '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '###########################################','#########################'+ - '#'#010+ - '# LCL Rules'#010+ '#####################################################################'#010+ + '# LCL Rules'#010+ + '##########################################################','##########'+ + '#'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ @@ -2045,11 +2060,11 @@ const fpcmakeini : array[0..191,1..240] of char=( 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ 'endif'#010+ - 'export LCL_PLATF','ORM'#010+ + 'export LCL_PLATFORM'#010+ #010+ '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ - 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(LCLDI','R))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2057,18 +2072,18 @@ const fpcmakeini : array[0..191,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ #010+ - '# Check if the default LC','LDIR is correct'#010+ + '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ - 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'ifeq ($(wild','card $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Check for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLD','IR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ - 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BA','SEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2076,38 +2091,39 @@ const fpcmakeini : array[0..191,1..240] of char=( #010+ '# Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLD','IR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ - 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PL','ATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/unit','s/$(LCL_PLATFORM) $(LC'+ - 'LDIR)/units)'#010+ - 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ - 'nts $(LCLDIR)/components)'#010+ + 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ + 'IR)/units)'#010+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/..','/compo'+ + 'nents $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONEN','TDIR)'#010+ + 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '#####################################################################'#010+ + '##################################','##################################'+ + '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ - 'override INFORULES+=','lclinfo'#010+ + 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ + ' @$(E','CHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Unit dir......... $(LCLUNIT','DIR)'#010+ + ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index be53dd6691..df5329135e 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -662,7 +662,20 @@ endif # On linux, try to find where libgcc.a is. ifeq ($(OS_SOURCE),linux) ifndef GCCLIBDIR -GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +ifeq ($(CPU_TARGET),i386) +ifneq ($(findstring x86_64,$(shell uname -a)),) +# try debian biarch +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif +else +GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`) +endif endif ifndef OTHERLIBDIR OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')