From f19b32a165e1831a29c90409dacc154fd77acbc4 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 13 Jan 2003 15:09:16 +0000 Subject: [PATCH] + macos and macosx target * fixed target detection, first we should try the default target --- utils/fpcm/fpcmake.inc | 618 ++++++++++++++++++++--------------------- utils/fpcm/fpcmake.ini | 39 ++- utils/fpcm/fpcmmain.pp | 12 +- 3 files changed, 340 insertions(+), 329 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index ece5c90d44..cb228925fa 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -189,13 +189,27 @@ const fpcmakeini : array[0..173,1..240] of char=( '######################################','##############################'+ '#'#010+ #010+ + '# Fall back to default values if needed'#010+ + 'ifndef CPU_TARGET'#010+ + 'ifdef CPU_TARGET_DEFAULT'#010+ + 'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + 'ifndef OS_TARGET'#010+ + 'ifdef OS_TARGET_DEFAULT'#010+ + 'OS_TARGET=$(OS_TARGET_DEFAULT)'#010+ + 'endif'#010, + 'endif'#010+ + #010+ + #010+ '# For 1.1 and up we can use a single compiler call to retrieve'#010+ '# all needed information'#010+ 'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ #010+ 'COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)'#010+ #010+ - '# Retrieve Target/Source ','CPU and Target/Source OS'#010+ + '# Retrieve Target/Source CPU and Target/Source OS'#010, 'ifndef CPU_SOURCE'#010+ 'CPU_SOURCE:=$(word 1,$(COMPILERINFO))'#010+ 'endif'#010+ @@ -206,8 +220,8 @@ const fpcmakeini : array[0..173,1..240] of char=( 'OS_SOURCE:=$(word 3,$(COMPILERINFO))'#010+ 'endif'#010+ 'ifndef OS_TARGET'#010+ - 'OS_TARGET:=$(w','ord 4,$(COMPILERINFO))'#010+ - 'endif'#010+ + 'OS_TARGET:=$(word 4,$(COMPILERINFO))'#010+ + 'en','dif'#010+ #010+ 'else'#010+ #010+ @@ -219,36 +233,21 @@ const fpcmakeini : array[0..173,1..240] of char=( 'CPU_TARGET:=$(shell $(FPC) -iTP)'#010+ 'endif'#010+ 'ifndef OS_SOURCE'#010+ - 'OS_SOURCE:=$(shell $(FP','C) -iSO)'#010+ + 'OS_SOURCE:=$(shell $(FPC) -iSO)'#010+ 'endif'#010+ - 'ifndef OS_TARGET'#010+ + 'ifndef OS_','TARGET'#010+ 'OS_TARGET:=$(shell $(FPC) -iTO)'#010+ 'endif'#010+ #010+ 'endif'#010+ #010+ - '# Fall back to default values if needed'#010+ - 'ifndef CPU_TARGET'#010+ - 'ifdef CPU_TARGET_DEFAULT'#010+ - 'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#010+ - 'endif'#010+ - 'endif'#010+ - #010+ - 'ifndef OS_TARGET'#010+ - 'ifdef OS_TARGET_','DEFAULT'#010+ - 'OS_TARGET=$(OS_TARGET_DEFAULT)'#010+ - 'endif'#010+ - 'endif'#010+ - #010+ - #010+ - #010+ #010+ '# Full name of the target, including CPU and OS'#010+ 'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ 'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ '# Cross compile flag'#010+ - 'ifneq ($(FULL_TARGET),$(FULL_SOURCE))',#010+ + 'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#010, 'CROSSCOMPILE=1'#010+ 'endif'#010+ #010+ @@ -256,7 +255,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# when the make target is to rebuild the makefile'#010+ 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ 'ifeq ($(findstring $(OS_TARGET),$(MAKEFILETARGETS)),)'#010+ - '$(error The ','Makefile doesn'#039't support target $(OS_TARGET), please'+ + '$(error The M','akefile doesn'#039't support target $(OS_TARGET), please'+ ' run fpcmake first)'#010+ 'endif'#010+ 'endif'#010+ @@ -266,7 +265,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ #010+ '[fpcdircheckenv]'#010+ - '##################################################','##################'+ + '###################################################','#################'+ '#'#010+ '# FPCDIR Setting'#010+ '#####################################################################'#010+ @@ -274,7 +273,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ - 'ifeq ($(wildcard $(addprefix $(FPCD','IR)/,rtl units)),)'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDI','R)/,rtl units)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ 'else'#010+ @@ -285,7 +284,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ - 'ifeq ($(wildcard $(addprefix $(F','PCDIR)/,rtl units)),)'#010+ + 'ifeq ($(wildcard $(addprefix $(FP','CDIR)/,rtl units)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -297,14 +296,14 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ - 'override FPCDIR=/usr/lib','/fpc/$(FPC_VERSION)'#010+ + 'override FPCDIR=/usr/lib/','fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ - 'override FPCDIR:=$(FP','CDIR)/..'#010+ + 'override FPCDIR:=$(FPC','DIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR=c:/pp'#010+ 'endif'#010+ @@ -319,7 +318,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Cross target dir'#010+ 'ifndef CROSSTARGETDIR'#010+ - 'CROS','STARGETDIR=$(CROSSDIR)/$(FULL_TARGET)'#010+ + 'CROSS','TARGETDIR=$(CROSSDIR)/$(FULL_TARGET)'#010+ 'endif'#010+ #010+ '# Units dir, when cross compiling try first the'#010+ @@ -328,8 +327,8 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifeq ($(UNITSDIR),)'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ - 'else'#010, - 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ + 'else'#010+ + 'U','NITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ #010+ '# Packages dir'#010+ @@ -338,7 +337,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ #010+ '[shelltools]'#010+ - '####################################################################','#'+ + '#####################################################################', #010+ '# Shell tools'#010+ '#####################################################################'#010+ @@ -349,7 +348,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ #010+ '# To copy pograms'#010+ - 'ifnde','f COPY'#010+ + 'ifndef',' COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ @@ -368,7 +367,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'DEL:=$(RMPROG) -f'#010+ 'endif'#010+ #010+ - '# Check deltree program',#010+ + '# Check deltree program'#010, 'ifndef DELTREE'#010+ 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ @@ -385,7 +384,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ - 'INSTALLEXE:=$(GINSTALL) -c -','m 755'#010+ + 'INSTALLEXE:=$(GINSTALL) -c -m',' 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -401,7 +400,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ #010+ '[defaultdirs]'#010+ - '###################################','#################################'+ + '####################################','################################'+ '#'#010+ '# Default Directories'#010+ '#####################################################################'#010+ @@ -412,7 +411,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ #010+ '# Units dir'#010+ - 'ifdef REQUIRE_PACKA','GESDIR'#010+ + 'ifdef REQUIRE_PACKAG','ESDIR'#010+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ 'endif'#010+ #010+ @@ -420,7 +419,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# Linux, netbsd and freebsd use unix dirs with /usr/bin, /usr/lib'#010+ '# When zipping use the target as default, when normal install then'#010+ '# use the source os as default'#010+ - 'ifdef ZIPINSTALL',#010+ + 'ifdef ZIPINSTALL'#010, '# Zipinstall'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ 'UNIXINSTALLDIR=1'#010+ @@ -435,7 +434,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ #010+ - 'ifeq ($(OS_TARGET),sunos',')'#010+ + 'ifeq ($(OS_TARGET),sunos)',#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),qnx)'#010+ @@ -451,7 +450,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'ifeq ($(OS_SOURCE),netbsd)'#010+ 'UNIXINSTALLDIR=1'#010+ - 'en','dif'#010+ + 'end','if'#010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ @@ -465,7 +464,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# When install prefix is not set try to use prefix'#010+ 'ifndef INSTALL_PREFIX'#010+ - 'ifdef PRE','FIX'#010+ + 'ifdef PREF','IX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ 'endif'#010+ 'endif'#010+ @@ -478,7 +477,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=/','$(PACKAGE_NAME)'#010+ + 'INSTALL_BASEDIR:=/$','(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -490,7 +489,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'export INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ - '# Where to place the resulting zip file','s'#010+ + '# Where to place the resulting zip files',#010+ 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ @@ -501,14 +500,14 @@ const fpcmakeini : array[0..173,1..240] of char=( '# Install Directories'#010+ '#####################################################################'#010+ #010+ - '# ','set the base directory where to install everything'#010+ + '# s','et the base directory where to install everything'#010+ 'ifndef INSTALL_BASEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ - 'en','dif'#010+ + 'end','if'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ 'endif'#010+ @@ -520,7 +519,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ - '# for FP','C packages install the binaries under their os target subdir'+ + '# for FPC',' packages install the binaries under their os target subdir'+ #010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)'#010+ @@ -530,7 +529,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ - '# If cross compil','ing install in the cross compile directory'#010+ + '# If cross compili','ng install in the cross compile directory'#010+ 'ifdef CROSSCOMPILE'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/units'#010+ 'else'#010+ @@ -538,7 +537,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ - 'INSTA','LL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ + 'INSTAL','L_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -552,7 +551,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Wh','ere the source files will be stored'#010+ + '# Whe','re the source files will be stored'#010+ 'ifndef INSTALL_SOURCEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef BSDhier'#010+ @@ -562,7 +561,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPR','EFIXDIR)/fpc-$(FPC_VERSI'+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPRE','FIXDIR)/fpc-$(FPC_VERSI'+ 'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ @@ -570,7 +569,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ - '(','PACKAGE_VERSION)'#010+ + '(P','ACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -581,7 +580,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INST','ALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ + 'INSTA','LL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -595,7 +594,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'DOCPREFIXDIR=doc'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DO','CDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)'+ + 'INSTALL_DOC','DIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)'+ '/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ @@ -603,7 +602,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/','$(PACKAGE_NAME)'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$','(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ @@ -613,7 +612,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# Where to install the examples, under linux we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ 'ifndef INSTALL_EXAMPLEDIR'#010+ - 'ifdef UNIXIN','STALLDIR'#010+ + 'ifdef UNIXINS','TALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef BSDhier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ @@ -623,7 +622,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'if','def BSDhier'#010+ + 'ifd','ef BSDhier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ '(PACKAGE_VERSION)'#010+ 'else'#010+ @@ -633,7 +632,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_EXAMPLED','IR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ + 'INSTALL_EXAMPLEDI','R:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ 'endif'#010+ @@ -645,20 +644,20 @@ const fpcmakeini : array[0..173,1..240] of char=( 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ - '#####','###############################################################'+ + '######','##############################################################'+ '#'#010+ '# Cross compile dirs'#010+ '#####################################################################'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ '# Directory where the cross compile tools are stored.'#010+ - '# First ch','eck if they are available in FPCDIR. If no targets/ subdir'+ + '# First che','ck if they are available in FPCDIR. If no targets/ subdir'+ #010+ '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ - 'CROSSBINDIR:=$(wildcar','d $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/'+ + 'CROSSBINDIR:=$(wildcard',' $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/'+ '$(FULL_SOURCE))'#010+ 'endif'#010+ 'endif'#010+ @@ -671,8 +670,8 @@ const fpcmakeini : array[0..173,1..240] of char=( '# On linux, try to find where libgcc.a is.'#010+ 'ifdef inUnix'#010+ 'ifndef GCCLIBDIR'#010+ - 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk',' '#039'{ pri'+ - 'nt $$4 } '#039'`)'#010+ + 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk ',#039'{ print'+ + ' $$4 } '#039'`)'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ 'ifndef OTHERLIBDIR'#010+ @@ -683,7 +682,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifeq ($(OS_TARGET),netbsd)'#010+ 'OTHERLIBDIR+=/usr/pkg/lib'#010+ 'endif'#010+ - 'export GCCLIBDIR',' OTHERLIB'#010+ + 'export GCCLIBDIR ','OTHERLIB'#010+ 'endif'#010+ #010+ #010+ @@ -693,7 +692,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '#####################################################################'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ - 'LOAD','EREXT=.as'#010+ + 'LOADE','REXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ @@ -712,7 +711,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'PPUEXT=.pp1'#010+ 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ - 'SMARTEXT=.s','l1'#010+ + 'SMARTEXT=.sl','1'#010+ 'STATICLIBEXT=.a1'#010+ 'SHAREDLIBEXT=.so1'#010+ 'STATICLIBPREFIX='#010+ @@ -730,7 +729,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# Linux'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ 'EXEEXT='#010+ - 'HASSH','AREDLIB=1'#010+ + 'HASSHA','REDLIB=1'#010+ 'FPCMADE=fpcmade.lnx'#010+ 'ZIPSUFFIX=linux'#010+ 'endif'#010+ @@ -747,7 +746,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifeq ($(OS_TARGET),netbsd)'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'FPCMADE=fpcmade.ne','tbsd'#010+ + 'FPCMADE=fpcmade.net','bsd'#010+ 'ZIPSUFFIX=netbsd'#010+ 'endif'#010+ #010+ @@ -766,7 +765,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ASMEXT=.sw'#010+ 'SMARTEXT=.slw'#010+ 'STATICLIBEXT=.aw'#010+ - 'SHAR','EDLIBEXT=.dll'#010+ + 'SHARE','DLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.w32'#010+ 'ZIPSUFFIX=w32'#010+ 'endif'#010+ @@ -783,7 +782,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'SHAREDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.os2'#010+ 'ZIPSUFFIX=emx'#010+ - 'ECHO=e','cho'#010+ + 'ECHO=ec','ho'#010+ 'endif'#010+ #010+ '# Amiga'#010+ @@ -803,8 +802,8 @@ const fpcmakeini : array[0..173,1..240] of char=( 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ - 'SMARTEXT=.sl'#010, - 'STATICLIBEXT=.a'#010+ + 'SMARTEXT=.sl'#010+ + 'S','TATICLIBEXT=.a'#010+ 'EXEEXT=.ttp'#010+ 'FPCMADE=fpcmade.ata'#010+ 'endif'#010+ @@ -823,7 +822,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Solaris'#010+ 'ifeq ($(OS_TARGET),sunos)'#010+ - 'PPUEXT=.ppu',#010+ + 'PPUEXT=.ppu'#010, 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ @@ -845,7 +844,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ZIPSUFFIX=qnx'#010+ 'endif'#010+ #010+ - '# Net','ware'#010+ + '# Netw','are'#010+ 'ifeq ($(OS_TARGET),netware)'#010+ 'STATICLIBPREFIX='#010+ 'PPUEXT=.ppn'#010+ @@ -859,14 +858,23 @@ const fpcmakeini : array[0..173,1..240] of char=( 'EXEEXT=.nlm'#010+ 'endif'#010+ #010+ + '# MacOS'#010+ + 'ifeq ($(OS_TARGET),macos)'#010+ + 'PPUEXT=.pput'#010+ + 'ASMEXT=.s'#010+ + 'OEXT=','.o'#010+ + 'SMARTEXT=.sl'#010+ + 'STATICLIBEXT=.a'#010+ + 'EXEEXT='#010+ + 'FPCMADE=fpcmade.mcc'#010+ + 'endif'#010+ #010+ '[defaulttools]'#010+ - '#############################################','#######################'+ - '#'#010+ + '#####################################################################'#010+ '# Default Tools'#010+ '#####################################################################'#010+ #010+ - '# Names of the binutils tools'#010+ + '#',' Names of the binutils tools'#010+ 'ASNAME=as'#010+ 'LDNAME=ld'#010+ 'ARNAME=ar'#010+ @@ -874,13 +882,13 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifeq ($(OS_TARGET),win32)'#010+ 'ASNAME=asw'#010+ 'LDNAME=ldw'#010+ - 'ARNAME=arw',#010+ + 'ARNAME=arw'#010+ 'endif'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ + 'ASPROG=$(CROSSBINDIR)/$(ASNAM','E)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ @@ -889,7 +897,7 @@ const fpcmakeini : array[0..173,1..240] of char=( '# linker, but probably not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'LDPROG=$(CROS','SBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ + 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ @@ -897,7 +905,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Resource compiler'#010+ 'ifndef RCPROG'#010+ - 'ifdef CROSSBINDIR'#010+ + 'ifdef CROSSBI','NDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'RCPROG=$(RCNAME)'#010+ @@ -906,7 +914,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Archiver'#010+ 'ifndef ARPROG'#010+ - 'ifdef CROSSBINDIR'#010, + 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ARPROG=$(ARNAME)'#010+ @@ -915,7 +923,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ - 'LD=$(LDPROG)'#010+ + 'L','D=$(LDPROG)'#010+ 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ #010+ @@ -923,7 +931,7 @@ const fpcmakeini : array[0..173,1..240] of char=( 'PPAS=ppas$(BATCHEXT)'#010+ #010+ '# ldconfig to rebuild .so cache'#010+ - 'ifdef inUnix'#010, + 'ifdef inUnix'#010+ 'LDCONFIG=ldconfig'#010+ 'else'#010+ 'LDCONFIG='#010+ @@ -935,26 +943,26 @@ const fpcmakeini : array[0..173,1..240] of char=( '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 win32. We can'#039't use $UPX b'+ + 'ecuase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ - 'ifeq ($(OS_TARG','ET),go32v2)'#010+ + 'ifeq ($(OS_TARGET),go32v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#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),$(SEARCHPAT'+ + 'H))))'#010+ 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ 'else'#010+ 'UPXPROG:=$(firstword $(UPXPROG))'#010+ 'endif'#010+ 'else'#010+ - 'UPX','PROG='#010+ + 'UPXPROG='#010+ 'endif'#010+ 'endif'#010+ 'export UPXPROG'#010+ @@ -965,7 +973,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ - 'TAROPT=vI'#010+ + 'TAROPT=','vI'#010+ 'TAREXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ @@ -974,35 +982,34 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '######################################################','##############'+ - '#'#010+ + '#####################################################################'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ + '# ','Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ - 'overri','de FPCOPTDEF=$(CPU_TARGET)'#010+ + 'override FPCOPTDEF=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ - 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ + 'ifneq ($(OS_TARGE','T),$(OS_SOURCE))'#010+ 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ - 'en','dif'#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,$(UN','ITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(OB','JDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ @@ -1010,7 +1017,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Smartlinking'#010+ 'ifdef LINKSMART'#010+ - 'override FPCOPT+=-XX'#010+ + 'overr','ide FPCOPT+=-XX'#010+ 'endif'#010+ #010+ '# Smartlinking creation'#010+ @@ -1020,19 +1027,19 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ - 'override FPCOP','T+=-gl'#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+ + 'ife','q ($(CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ 'else'#010+ 'FPCCPUOPT:='#010+ 'endif'#010+ 'override FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+ - 'override FPCOPTDEF+=RELEAS','E'#010+ + 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ '# Strip'#010+ @@ -1042,70 +1049,70 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Optimizer (i386 only for now)'#010+ 'ifdef OPTIMIZE'#010+ - 'ifeq ($(CPU_TARGET),i386)'#010+ + 'ifeq ($(C','PU_TARGET),i386)'#010+ 'override FPCOPT+=-OG2p3'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ - 'override FPCOPT+=-vw','ni'#010+ + 'override FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ - 'ifdef COMPILER_UNITDIR'#010+ + 'ifdef COMPI','LER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ - 'override FPCOPT+=$(addprefix ','-Fl,$(COMPILER_LIBRARYDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'override 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+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ - 'ifdef ','CROSSBINDIR'#010+ + 'ifdef CROSSBINDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ '# Target dirs and the prefix to use for clean/install'#010+ - 'ifdef COMPILER_TARGETDIR'#010+ + 'ifdef',' COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ - 'ove','rride TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Unit target dir'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ + 'override',' FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGET','DIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ + 'override COMPILER_UNITTARGETDIR=$(COMPIL','ER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ - 'ifdef GCC','LIBDIR'#010+ + 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010, 'endif'#010+ #010+ #010+ @@ -1115,162 +1122,162 @@ const fpcmakeini : array[0..173,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Add define','s 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+ + '# Was a config fi','le specified ?'#010+ 'ifdef CFGFILE'#010+ 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ - 'ifdef USEEN','V'#010+ + 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ '# Compiler commandline'#010+ - 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ + 'overri','de COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ '# also call ppas if with command option -s'#010+ '# but only if the OS_SOURCE and OS_TARGET are equal'#010+ - 'i','feq (,$(findstring -s ,$(COMPILER)))'#010+ + 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ 'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+ 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ #010+ '[loaderrules]'#010+ '#####################################################################'#010+ '# Loaders'#010+ - '############################','########################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ 'ifdef TARGET_LOADERS'#010+ - 'override ALLTARGET+=fpc_loaders'#010+ + 'override ALLTARGET+=fpc_load','ers'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(addsuffix $(O','EXT),$(TARGET_LOADERS))'#010+ + 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ #010+ - 'fpc_loaders: $(LOADEROFILES)'#010+ + 'fpc_loaders: $(LOADEROFILES',')'#010+ #010+ 'fpc_loaders_clean:'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTA','LL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ #010+ #010+ '[unitrules]'#010+ - '#####################################################################'#010+ + '############################################################','########'+ + '#'#010+ '# Units'#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_IMPLICITU'+ - 'NITS))'#010+ + 'override IMPLICITUNIT','PPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+ + 'TUNITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'overr','ide CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(UNITPPUFILES)'#010+ #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 EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))',#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ - 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGE','T_PROGRAMS))'+ - ')'#010+ + 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override CLEANEXEFILES+=$(EXEFI','LES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'fpc_e','xes: $(EXEFILES)'#010+ + 'fpc_exes: $(EXEFILES)'#010+ #010+ #010+ '[rstrules]'#010+ '#####################################################################'#010+ - '# Resource strings'#010+ + '# Resource st','rings'#010+ '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ - 'override RSTFILES=$(addsuffix $(','RSTEXT),$(TARGET_RSTS))'#010+ + 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ '[examplerules]'#010+ - '#####################################################################'#010+ + '#############################','#######################################'+ + '#'#010+ '# Examples'#010+ '#####################################################################'#010+ #010+ - '.PHO','NY: fpc_examples'#010+ + '.PHONY: fpc_examples'#010+ #010+ 'ifdef TARGET_EXAMPLES'#010+ 'HASEXAMPLES=1'#010+ - 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ - 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(T','ARGET_EXA'+ + 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ - 'overrid','e EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+ - 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ + 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ + 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEX','T),$(TARGET_EXAMPL'+ 'ES)))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILE','S+=$(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) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ - 'S))'#010+ + 'fpc_examp','les: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'IRS))'#010+ #010+ #010+ '[compilerules]'#010+ - '#############################################','#######################'+ - '#'#010+ - '# General compile rules'#010+ '#####################################################################'#010+ + '# General compile rules'#010+ + '################################################################','####'+ + '#'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ - ' @$(ECHOREDIR) Compi','led > $(FPCMADE)'#010+ + ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ #010+ @@ -1278,18 +1285,18 @@ const fpcmakeini : array[0..173,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all DEBUG=1'#010+ + ' ',' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rules, available for both possible .pp an','d .pas ex'+ - 'tensions'#010+ + '# General compile rules, available for both possible .pp and .pas exte'+ + 'nsions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res'#010+ #010+ '%$(PPUEXT): %.pp'#010+ - ' $(COMPILER) $<'#010+ + ' $(COMPILER)',' $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ @@ -1297,7 +1304,7 @@ const fpcmakeini : array[0..173,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ - ' $(COMPILER) $<'#010, + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ @@ -1305,19 +1312,19 @@ const fpcmakeini : array[0..173,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ - ' windres -i $< -o $@'#010+ + ' windres -i',' $< -o $@'#010+ #010+ '# Search paths for .ppu and .pp and .pas'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.pas $(COMPI','LER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ #010+ '[libraryrules]'#010+ - '#####################################################################'#010+ - '# Library'#010+ - '##############################################################','######'+ + '###############','#####################################################'+ '#'#010+ + '# Library'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_shared'#010+ #010+ @@ -1325,149 +1332,145 @@ const fpcmakeini : array[0..173,1..240] of char=( 'ifdef LIB_VERSION'#010+ 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ 'else'#010+ - 'LIB_FULLNAME=$(LIB_NAME)'#010+ + 'L','IB_FULLNAME=$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef LIB_SHAREDUNITS'#010+ - 'LIB_SHAREDUNITS:=$(T','ARGET_UNITS)'#010+ + 'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+ 'endif'#010+ #010+ 'fpc_shared: all'#010+ 'ifdef HASSHAREDLIB'#010+ ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ - 'else'#010+ + 'el','se'#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: f','pc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_','UNITS))'#010+ + 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ - '(INSTALLPPUFILES))'#010+ + '(INS','TALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addpr','efix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ - 'T),$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ - 'PPUFILES))'#010+ + 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+ + ',$(INSTALLPPUFILES)))'#010+ + 'override INSTALLPPUFILES:=$(addpre','fix $(UNITTARGETDIRPREFIX),$(INSTA'+ + 'LLPPUFILES))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ - 'EFIX),$(IN','STALLPPULINKFILES)))'#010+ + 'EFIX),$(INSTALLPPULINKFILES)))'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ - 'ifdef INSTALLEXEFILES'#010+ + 'ifdef INSTALLEXE','FILES'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+ 'ILES))'#010+ 'endif'#010+ #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ - 'ifd','ef INSTALLEXEFILES'#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_CREATEPACK','AGEFPC'#010+ + 'ifdef INSTALL_CREATEPACKAGEFPC'#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+ + ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'i','fneq ($(INSTALLPPULINKFILES),)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ + 'ifneq ($(wildca','rd $(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_SOURCEDIR)'#010+ + ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distc','lean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ - ' $(C','OPY) $(EXAMPLESOURCEFILES) $(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+ + '#####################################################################'#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_zipinst','all fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ - '# subdir, because t','he 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+ + 'PA','CKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ - 'ZIPNAME=$(DI','ST_ZIPNAME)'#010+ + 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ 'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ @@ -1475,7 +1478,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ - 'ifdef DIST_ZIPTARGET'#010+ + 'ifdef ','DIST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ @@ -1484,7 +1487,7 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Use tar by default under linux'#010+ 'ifndef USEZIP'#010+ - 'ifde','f inUnix'#010+ + 'ifdef inUnix'#010+ 'USETAR=1'#010+ 'endif'#010+ 'endif'#010+ @@ -1494,74 +1497,74 @@ const fpcmakeini : array[0..173,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able to run in the current OS so fix'#010+ + '# ','We 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$(BATCHEXT))'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT))'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ - '# Create commands to create the zip/tar file'#010+ + '# Create commands to create the zi','p/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ - 'ifdef US','ETAR'#010+ + 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ + 'ZI','PDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ - ' $(MKDIR) $(DIST_DESTDIR)'#010+ + ' $(MKDIR) $(DIST','_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ - 'ifneq ($(ECH','OREDIR),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 $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDBA','SE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPWRAPPER)'#010+ 'endif'#010+ - ' $(DEL) $(ZIPWRAP','PER)'#010+ + ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zipsourceinstall:'#010+ + 'fpc_zi','psourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+ #010+ 'fpc_zipexampleinstall:'#010+ - 'ifdef HASEXAMPLES'#010, + 'ifdef HASEXAMPLES'#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+ - '# Cle','an rules'#010+ + '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall fp','c_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ @@ -1569,203 +1572,200 @@ const fpcmakeini : array[0..173,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'o','verride CLEANPPUFILES+=$(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 CLEANPPULINKFILE','S:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + '(CLEANPPUFILES)))'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ - 'IX),$(CLEANPPULINKFILES)))'#010+ + 'override CLEANPPULINKFILES:=$(wi','ldcard $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -','$(DEL) $(CLEANEXEFILES)'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ + 'ifneq ($(CLEANPPULINKFIL','ES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN','RSTFILES))'+ - #010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#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_NAME',') $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ #010+ - 'fpc_dist','clean: clean'#010+ + 'fpc_distclean: clean'#010+ #010+ '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ - '# set if targetdir or unittargetdir is specified'#010+ + '# set if targetdir or unittarge','tdir is specified'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ - 'i','fdef CLEANEXEFILES'#010+ + 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEX','T) *$(STATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS)',' script.res link.res $'+ - '(FPCEXTFILE) $(REDIRFILE)'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ + 'PCEXTFILE) $(REDIRFILE)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ #010+ #010+ - '[baseinforules]'#010+ + '[baseinforules]',#010+ '#####################################################################'#010+ '# Base info rules'#010+ - '######################################','##############################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ 'override INFORULES+=fpc_baseinfo'#010+ #010+ 'fpc_baseinfo:'#010+ - ' @$(ECHO)'#010+ + ' @$','(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' @$(ECHO) Package Versi','on.. $(PACKAGE_VERSION)'#010+ + ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) FPC.......... $(FPC)'#010+ + ' @$(E','CHO) FPC.......... $(FPC)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ - ' ',' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ + ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ - ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ + ' @$(ECHO) Target OS..','.. $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ - ' @$(ECHO)'#010, + ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ - ' @$(ECHO)'#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ - ' @$(ECHO) Cro','ssBinDir..... $(CROSSBINDIR)'#010+ + ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ + ' @$(ECHO) PackagesDir..... $(','PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ - ' @$(ECHO) Other library... $(OTHERLIBDIR)',#010+ + ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ - ' @$(ECHO) Ld........ $(LD)'#010+ + ' ','@$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ - ' @$(EC','HO) Mv........ $(MVPROG)'#010+ + ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ + ' @','$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ - ' @$(ECHO) Da','te...... $(DATE)'#010+ + ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) Upx....... $(UPXPROG)'#010+ + ' @$(ECHO)',' Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ - ' @$','(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ - ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ + ' @$(ECHO) Target Units.......... $(TARG','ET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ - ' @$(ECHO) Target Programs....... $(TARGET_PR','OGRAMS)'#010+ + ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ + ' @$(ECHO) Target Examples....... $(TARGET','_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Clean Units.......','.. $(CLEAN_UNITS)'#010+ + ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ + ' @$(ECHO) Instal','l Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == I','nstall info =='#010+ + ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ + ' @$(ECHO) ZipPrefix...','......... $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) Install FPC Package.. $(INSTALL_F','PCPACKAGE)'#010+ + ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ - ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ + ' @$(ECHO) Install ','binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ - ' @$(ECHO) Install units dir..','.. $(INSTALL_UNITDIR)'#010+ + ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ - ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ + ' @$(ECHO) Install doc ','dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ - ' @$(ECHO) Install data dir...','.. $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ - ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ + ' @$(ECHO) ','Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ - '###########################################################','#########'+ - '#'#010+ + '#####################################################################'#010+ '# Info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_info'#010+ - #010+ + #010, 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ '#####################################################################'#010+ - '# Rebuild Makefil','e'#010+ + '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ - ' \'#010+ + '.PHONY: fpc_makefile fpc_makefiles fpc_m','akefile_sub1 fpc_makefile_su'+ + 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ - 'fp','c_makefile_sub1:'#010+ + 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_DIRS))'#010+ + 'T_DIRS))',#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fp','c_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+ - 'T_EXAMPLEDIRS))'#010+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ + 'EXAMPLEDIRS))'#010+ #010+ - 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ + 'fpc_makefile_dirs: fpc_makefil','e_sub1 fpc_makefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ - '######################################','##############################'+ - '#'#010+ - '# Local Makefile'#010+ '#####################################################################'#010+ + '# Local Makefile'#010+ + '################################################################','####'+ + '#'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ @@ -1773,22 +1773,20 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ #010+ '[userrules]'#010+ - '###############################################','#####################'+ - '#'#010+ + '#####################################################################'#010+ '# Users rules'#010+ '#####################################################################'#010+ #010+ - '[lclrules]'#010+ + '[lclr','ules]'#010+ '#####################################################################'#010+ '# LCL Rules'#010+ - '#######################################','#############################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'LCL_PLATFORM=win32'#010+ - 'else'#010+ + 'e','lse'#010+ 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ 'endif'#010+ @@ -1796,66 +1794,66 @@ const fpcmakeini : array[0..173,1..240] of char=( #010+ '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ - 'override LCLDIR:=','$(subst \,/,$(LCLDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override LCLDIR=wrong'#010+ + 'overr','ide LCLDIR=wrong'#010+ 'endif'#010+ #010+ '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ - 'override LCLDIR:=$(subst \,/,$(DEFAULT_LC','LDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Check for development version'#010+ + '# Check for develop','ment version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ - ' $(addsuffix /units/$','(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Check for release version'#010+ + '# Check for rel','ease version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ - ' $(addsuffix /lib/laz','arus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Generate dirs'#010+ + '# Generate di','rs'#010+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ 'IR)/units)'#010+ - 'override LCLCOMPONENTDIR:=$(wildcard $(LCLD','IR)/.. $(LCLDIR)/../compo'+ - 'nents $(LCLDIR)/components)'#010+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ + 'nts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ - '# Add LCL dirs to paths'#010+ + '# Add LCL dirs to ','paths'#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '###############','#####################################################'+ - '#'#010+ - '# LCL Info rules'#010+ '#####################################################################'#010+ + '# LCL Info rules'#010+ + '#########################################','###########################'+ + '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ ' @$(ECHO) == LCL info =='#010+ - ' @$','(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ - ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ + ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010, ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ - ' @$(ECH','O)'#010 + ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 77c27e677c..0f6c4afb97 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -176,6 +176,20 @@ unexport CHECKDEPEND ALLDEPENDENCIES # FPC Target Detection ##################################################################### +# Fall back to default values if needed +ifndef CPU_TARGET +ifdef CPU_TARGET_DEFAULT +CPU_TARGET=$(CPU_TARGET_DEFAULT) +endif +endif + +ifndef OS_TARGET +ifdef OS_TARGET_DEFAULT +OS_TARGET=$(OS_TARGET_DEFAULT) +endif +endif + + # For 1.1 and up we can use a single compiler call to retrieve # all needed information ifeq ($(findstring 1.0.,$(FPC_VERSION)),) @@ -214,21 +228,6 @@ endif endif -# Fall back to default values if needed -ifndef CPU_TARGET -ifdef CPU_TARGET_DEFAULT -CPU_TARGET=$(CPU_TARGET_DEFAULT) -endif -endif - -ifndef OS_TARGET -ifdef OS_TARGET_DEFAULT -OS_TARGET=$(OS_TARGET_DEFAULT) -endif -endif - - - # Full name of the target, including CPU and OS FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) @@ -822,6 +821,16 @@ ZIPSUFFIX=nw EXEEXT=.nlm endif +# MacOS +ifeq ($(OS_TARGET),macos) +PPUEXT=.pput +ASMEXT=.s +OEXT=.o +SMARTEXT=.sl +STATICLIBEXT=.a +EXEEXT= +FPCMADE=fpcmade.mcc +endif [defaulttools] ##################################################################### diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp index 670e3df8c9..44b4b9485d 100644 --- a/utils/fpcm/fpcmmain.pp +++ b/utils/fpcm/fpcmmain.pp @@ -55,7 +55,7 @@ interface TTarget=( t_linux,t_go32v2,t_win32,t_os2,t_freebsd,t_beos,t_netbsd, t_amiga,t_atari, t_sunos, t_qnx, t_netware, t_openbsd,t_wdosx, - t_palmos + t_palmos,t_macos,t_macosx ); TTargetSet=set of TTarget; @@ -63,13 +63,13 @@ interface TargetStr : array[TTarget] of string=( 'linux','go32v2','win32','os2','freebsd','beos','netbsd', 'amiga','atari','sunos', 'qnx', 'netware','openbsd','wdosx', - 'palmos' + 'palmos','macos','macosx' ); TargetSuffix : array[TTarget] of string=( '_linux','_go32v2','_win32','_os2','_freebsd','_beos','_netbsd', '_amiga','_atari','_sunos', '_qnx', '_netware','_openbsd','_wdosx', - '_palmos' + '_palmos','_macos','_macosx' ); @@ -1486,7 +1486,11 @@ implementation end. { $Log$ - Revision 1.28 2003-01-13 11:54:02 pierre + Revision 1.29 2003-01-13 15:09:16 florian + + macos and macosx target + * fixed target detection, first we should try the default target + + Revision 1.28 2003/01/13 11:54:02 pierre + palmos target added Revision 1.27 2002/10/07 18:41:02 peter