diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 2d2c0a5d91..336f5ec9e3 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..206] of string[240]=( +const fpcmakeini : array[0..207] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..206,1..240] of char=( +const fpcmakeini : array[0..207,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -777,14 +777,15 @@ const fpcmakeini : array[0..206,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ - 'STATICLIBPREFIX=libp'#010+ + 'SHAREDLIBPREFIX=libfp'#010+ + 'STATICLIBPREFIX=li','bp'#010+ 'RSTEXT=.rst'#010+ - '#DEBUGS','YMEXT #for debugger symbol files, define only for targets whi'+ - 'ch has this'#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+ - '# short version for 1.1 and above - no target specific exte','nsions'#010+ + '# short version for 1.1 and above - n','o target specific extensions'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -801,9 +802,9 @@ const fpcmakeini : array[0..206,1..240] of char=( '# watcom'#010+ 'ifeq ($(OS_TARGET),watcom)'#010+ 'STATICLIBPREFIX='#010+ - 'OEXT=.obj'#010+ + 'OEXT=.','obj'#010+ 'ASMEXT=.asm'#010+ - 'SHARED','LIBEXT=.dll'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=wat'#010+ 'endif'#010+ #010+ @@ -820,11 +821,11 @@ const fpcmakeini : array[0..206,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=fbs'#010+ + 'SHORTSUFFIX=fbs'#010, 'endif'#010+ #010+ '# NetBSD'#010+ - 'ifeq (','$(OS_TARGET),netbsd)'#010+ + 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -841,8 +842,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '# Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ - 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUFFIX','=w32'#010+ + 'SHAREDL','IBEXT=.dll'#010+ + 'SHORTSUFFIX=w32'#010+ 'endif'#010+ #010+ '# OS/2'#010+ @@ -860,8 +861,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUFFI','X=emx'#010+ + 'SHARED','LIBEXT=.dll'#010+ + 'SHORTSUFFIX=emx'#010+ 'ECHO=echo'#010+ 'endif'#010+ #010+ @@ -880,8 +881,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS_TARGET),atari)'#010+ - 'EXEEX','T=.ttp'#010+ + 'ifeq ($(O','S_TARGET),atari)'#010+ + 'EXEEXT=.ttp'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ #010+ @@ -901,9 +902,9 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '# QNX'#010+ 'ifeq ($(OS_TARGET),qnx)'#010+ - 'BATCHEXT=.sh'#010+ + 'B','ATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SH','ORTSUFFIX=qnx'#010+ + 'SHORTSUFFIX=qnx'#010+ 'endif'#010+ #010+ '# Netware clib'#010+ @@ -920,8 +921,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'SHORTSUFFIX=nwl'#010+ 'endif'#010+ #010+ - '# MacOS'#010+ - 'ifeq ($(OS_TARGET),ma','cos)'#010+ + '# MacOS',#010+ + 'ifeq ($(OS_TARGET),macos)'#010+ 'BATCHEXT='#010+ 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ @@ -937,10 +938,10 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ 'else'#010+ - '# long version for 1.0.x - target specific extensions'#010+ + '# long version for 1.0.x - target specific extensions',#010+ #010+ '# Go32v1'#010+ - 'ifeq ($(OS_','TARGET),go32v1)'#010+ + 'ifeq ($(OS_TARGET),go32v1)'#010+ 'PPUEXT=.pp1'#010+ 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ @@ -957,8 +958,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'SHORTSUFFIX=dos'#010+ 'endif'#010+ #010+ - '# watcom'#010+ - 'ifeq ($(OS_TARGET),','watcom)'#010+ + '# watc','om'#010+ + 'ifeq ($(OS_TARGET),watcom)'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=wat'#010+ 'endif'#010+ @@ -976,10 +977,10 @@ const fpcmakeini : array[0..206,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=fbs'#010+ + 'SHO','RTSUFFIX=fbs'#010+ 'endif'#010+ #010+ - '# ','NetBSD'#010+ + '# NetBSD'#010+ 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ @@ -996,9 +997,9 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ '# Win32'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ + 'ifeq ($(OS_TARGET),w','in32)'#010+ 'PPUEXT=.ppw'#010+ - 'OEXT','=.ow'#010+ + 'OEXT=.ow'#010+ 'ASMEXT=.sw'#010+ 'SMARTEXT=.slw'#010+ 'STATICLIBEXT=.aw'#010+ @@ -1015,8 +1016,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'AOUTEXT=.out'#010+ 'SMARTEXT=.sl2'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBEXT=.ao2'#010+ - 'SHAREDLIBEX','T=.dll'#010+ + 'STATICL','IBEXT=.ao2'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'endif'#010+ @@ -1034,9 +1035,9 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS_TARGET),atari)'#010+ + 'ifeq ($(OS_TARGET),ata','ri)'#010+ 'PPUEXT=.ppu'#010+ - 'ASMEXT','=.s'#010+ + 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ @@ -1056,8 +1057,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'SHORTSUFFIX=be'#010+ 'endif'#010+ #010+ - '# Solaris'#010+ - 'ifeq ($(OS_TARGET),s','olaris)'#010+ + '# Solari','s'#010+ + 'ifeq ($(OS_TARGET),solaris)'#010+ 'BATCHEXT=.sh'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ @@ -1076,9 +1077,9 @@ const fpcmakeini : array[0..206,1..240] of char=( 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ - 'EXEEXT='#010+ + 'EXEEX','T='#010+ 'SHORTSUFFIX=qnx'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ '# Netware'#010+ 'ifeq ($(OS_TARGET),netware)'#010+ @@ -1095,8 +1096,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '# Netware libc'#010+ 'ifeq ($(OS_TARGET),netwlibc)'#010+ - 'STATICLIBPREFIX='#010+ - 'PPUEXT=.p','pu'#010+ + 'STAT','ICLIBPREFIX='#010+ + 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ @@ -1115,8 +1116,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ - 'DEBUGSYMEXT=.xcoff'#010+ - 'SHORTSU','FFIX=mac'#010+ + 'DEBU','GSYMEXT=.xcoff'#010+ + 'SHORTSUFFIX=mac'#010+ 'endif'#010+ #010+ '#end of target specific settings'#010+ @@ -1125,8 +1126,8 @@ const fpcmakeini : array[0..206,1..240] of char=( '# For 8.3 limited OS'#039's the short suffixes'#010+ '# Otherwise use the full source/target names'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ - 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ - 'ZIPSUFFIX=$(SHORT','SUFFIX)'#010+ + 'FPCMADE=fpcmade.$(SHORTSUF','FIX)'#010+ + 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ @@ -1136,9 +1137,9 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ - 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ + 'ZIPCROSSPREFIX=$(TA','RGETSUFFIX)-'#010+ 'else'#010+ - 'ZIPS','UFFIX=.$(TARGETSUFFIX)'#010+ + 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'endif'#010+ 'endif'#010+ @@ -1146,9 +1147,10 @@ const fpcmakeini : array[0..206,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '#####################################################################'#010+ + '#################################################################','###'+ + '#'#010+ #010+ - '# Names of the b','inutils tools'#010+ + '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ @@ -1156,9 +1158,9 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ - 'ASNAME=asw'#010+ + 'ASNA','ME=asw'#010+ 'LDNAME=ldw'#010+ - 'ARNA','ME=arw'#010+ + 'ARNAME=arw'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1173,8 +1175,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ '# linker, but probably not used'#010+ - 'ifndef LDPROG'#010+ - 'ifdef CROSSBI','NDIR'#010+ + 'ifnde','f LDPROG'#010+ + 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'LDPROG=$(LDNAME)'#010+ @@ -1190,8 +1192,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Archiver'#010+ - 'ifndef ARPROG'#010, + '# A','rchiver'#010+ + 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1208,7 +1210,7 @@ const fpcmakeini : array[0..206,1..240] of char=( '# ppas.bat / ppas.sh'#010+ 'PPAS=ppas$(SRCBATCHEXT)'#010+ #010+ - '# ldconfig to rebuild .s','o cache'#010+ + '# ','ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ 'LDCONFIG=ldconfig'#010+ 'else'#010+ @@ -1223,8 +1225,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+ 'uase'#010+ - '# upx uses that one itself (PFV)'#010+ - 'ifndef UP','XPROG'#010+ + '# upx uses that one ','itself (PFV)'#010+ + 'ifndef UPXPROG'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ @@ -1237,7 +1239,7 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ 'else'#010+ - 'UPXPROG:=$(firstword $(UPX','PROG))'#010+ + 'UPXP','ROG:=$(firstword $(UPXPROG))'#010+ 'endif'#010+ 'else'#010+ 'UPXPROG='#010+ @@ -1260,14 +1262,14 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '#################################','###################################'+ + '###########','#########################################################'+ '#'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ - '# compiler this needs to be turned off'#010+ - 'i','fndef NOCPUDEF'#010+ + '# compiler this ne','eds to be turned off'#010+ + 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ @@ -1277,8 +1279,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ - 'ifeq ($(OS_SOURCE),openbsd)'#010+ - 'override FPCOPT+=-FD$','(NEW_BINUTILS_PATH)'#010+ + 'ifeq ($(OS_SOURCE),openbsd)',#010+ + 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ @@ -1290,7 +1292,7 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# User dirs should be first, so they are lo','oked at first'#010+ + '# User dirs should be',' first, so they are looked at first'#010+ 'ifdef UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ @@ -1300,8 +1302,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ifdef OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ - 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(add','prefix -Fi,$(INCDIR))'#010+ + 'ifdef INCDIR'#010, + 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ '# Smartlinking'#010+ @@ -1317,10 +1319,10 @@ const fpcmakeini : array[0..206,1..240] of char=( '# Debug'#010+ 'ifdef DEBUG'#010+ 'override FPCOPT+=-gl'#010+ - 'override FPCOPTDEF+=DEBUG'#010+ + 'override FPCOPTDEF+','=DEBUG'#010+ 'endif'#010+ #010+ - '# Releas','e mode (strip, optimize and don'#039't load fpc.cfg)'#010+ + '# Release mode (strip, optimize and don'#039't load fpc.cfg)'#010+ 'ifdef RELEASE'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ @@ -1331,8 +1333,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'FPCCPUOPT:='#010+ 'endif'#010+ 'endif'#010+ - 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ - 'override FPCOP','TDEF+=RELEASE'#010+ + 'override FPCOPT+=-Ur -Xs $(FPCCPU','OPT) -n'#010+ + 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ '# Strip'#010+ @@ -1347,9 +1349,9 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Verbose settings (warning,note,info)'#010+ + '# Verbose settings (warning,note,info)'#010, 'ifdef VERBOSE'#010+ - 'override',' FPCOPT+=-vwni'#010+ + 'override FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ '# Needed compiler options'#010+ @@ -1359,17 +1361,17 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_LIBRARYDIR'#010+ - 'override FPCOPT+=','$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ + 'ifdef COMPILER_LIBRAR','YDIR'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef 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+ + 'en','dif'#010+ #010+ - '# Cross compiler ','utils'#010+ + '# Cross compiler utils'#010+ 'ifdef CROSSBINDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ @@ -1377,8 +1379,8 @@ const fpcmakeini : array[0..206,1..240] of char=( '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ - 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ - 'override TARGETDIRPREF','IX='#010+ + 'ifeq ($(COMPILER_TARGETDIR),.)'#010, + 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ @@ -1387,8 +1389,8 @@ const fpcmakeini : array[0..206,1..240] of char=( '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ - 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ - 'override UNI','TTARGETDIRPREFIX='#010+ + 'ifeq ($(COMPILER_UNITTARG','ETDIR),.)'#010+ + 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ @@ -1396,10 +1398,10 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'endif'#010+ #010+ - '# Temporar','y hack to add HASUNIX define for linux 1.0.6 compiler'#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+ 'override FPCOPTDEF+=HASUNIX'#010+ @@ -1409,7 +1411,7 @@ const fpcmakeini : array[0..206,1..240] of char=( '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ - 'override FPCOPT+=-Fl$(GCCLIBDIR)',#010+ + 'override F','PCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ @@ -1422,8 +1424,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Add defines from FPCOPTDEF to FPCOPT'#010+ - 'ifdef FPCOPT','DEF'#010+ + '# Add defines from FPCOPTDEF ','to FPCOPT'#010+ + 'ifdef FPCOPTDEF'#010+ 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ @@ -1434,8 +1436,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ - 'override FPCEXTCMD:=$(FPCOPT)'#010+ - 'overrid','e FPCOPT:=!FPCEXTCMD'#010+ + 'override FPCEXT','CMD:=$(FPCOPT)'#010+ + 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ @@ -1446,8 +1448,8 @@ const fpcmakeini : array[0..206,1..240] of char=( 'override ACROSSCOMPILE=1'#010+ 'endif'#010+ #010+ - 'ifdef ACROSSCOMPILE'#010+ - 'over','ride FPCOPT+=$(CROSSOPT)'#010+ + 'if','def ACROSSCOMPILE'#010+ + 'override FPCOPT+=$(CROSSOPT)'#010+ 'endif'#010+ #010+ '# Compiler commandline'#010+ @@ -1455,9 +1457,9 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '# also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ - 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ + 'ifeq (,$(findstring -s ,$(C','OMPILER)))'#010+ 'EXECPPAS='#010+ - 'e','lse'#010+ + 'else'#010+ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ @@ -1467,19 +1469,20 @@ const fpcmakeini : array[0..206,1..240] of char=( '[loaderrules]'#010+ '#####################################################################'#010+ '# Loaders'#010+ - '#####################################################################'#010+ + '##################################################','##################'+ + '#'#010+ #010+ - '.','PHONY: fpc_loaders'#010+ + '.PHONY: fpc_loaders'#010+ #010+ 'ifneq ($(TARGET_LOADERS),)'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LO','ADERS))'#010+ 'endif'#010+ #010+ - '%$(OEXT','): %$(LOADEREXT)'#010+ + '%$(OEXT): %$(LOADEREXT)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ @@ -1488,8 +1491,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ - 'fpc_loaders_clean:'#010+ - 'ifdef COMPILER_UNITTA','RGETDIR'#010+ + 'fpc_loaders_clean:',#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ ')'#010+ 'else'#010+ @@ -1499,7 +1502,7 @@ const fpcmakeini : array[0..206,1..240] of char=( 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(INSTALL) $(addprefix',' $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+ + ' ','$(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+ 'ILES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ @@ -1508,9 +1511,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '[unitrules]'#010+ '#####################################################################'#010+ - '# Units'#010+ - '###################','#################################################'+ - '#'#010+ + '# Uni','ts'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ @@ -1518,7 +1520,7 @@ const fpcmakeini : array[0..206,1..240] of char=( 'override ALLTARGET+=fpc_units'#010+ #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ - 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),','$(TARGET_IMPLICI'+ + 'override IMPLICITUNITPPUFILES=','$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+ 'TUNITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ @@ -1527,29 +1529,28 @@ const fpcmakeini : array[0..206,1..240] of char=( 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ - '[exerules]'#010+ - '############','########################################################'+ - '#'#010+ + '[','exerules]'#010+ + '#####################################################################'#010+ '# Exes'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_exes'#010+ #010+ '# Programs are not needed for a cross installation'#010+ - 'ifndef CROSSINSTALL'#010+ - 'ifneq ($(TARGET','_PROGRAMS),)'#010+ + 'ifndef CROSSI','NSTALL'#010+ + 'ifneq ($(TARGET_PROGRAMS),)'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ #010+ - 'override ALLTARGET+=fpc_ex','es'#010+ + 'over','ride ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(add','suffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'overrid','e CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1559,9 +1560,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '[rstrules]'#010+ '#####################################################################'#010+ - '# Resource strings'#010+ - '###########','#########################################################'+ - '#'#010+ + '# Resour','ce strings'#010+ + '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ @@ -1571,7 +1571,7 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ #010+ '[examplerules]'#010+ - '##############################################','######################'+ + '########################','############################################'+ '#'#010+ '# Examples'#010+ '#####################################################################'#010+ @@ -1580,18 +1580,18 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ - 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP', - 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+ - 'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuf','fix .pp,$(TARGET_EXA'+ + 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ + '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAM','PLES)) $(ad'+ + 'override EXAMPLEOFILES:=$(addsuffix',' $(OEXT),$(TARGET_EXAMPLES)) $(ad'+ 'dprefix $(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+ - 'endi','f'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(','TARGET_EXAMPLES))'#010+ + 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ @@ -1600,18 +1600,18 @@ const fpcmakeini : array[0..206,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ - 'S))'#010+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_E','XAMPLED'+ + 'IRS))'#010+ #010+ #010+ - '[compil','erules]'#010+ + '[compilerules]'#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_relea','se'#010+ #010+ - '$(FPCMADE): $(ALLD','EPENDENCIES) $(ALLTARGET)'#010+ + '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ @@ -1623,18 +1623,18 @@ const fpcmakeini : array[0..206,1..240] of char=( ' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ - ' $(MAKE) all RELEASE=1'#010+ + ' $(MAKE)',' all RELEASE=1'#010+ #010+ - '# Gene','ral compile rules, available for both possible .pp and .pas ex'+ - 'tensions'#010+ + '# General compile rules, available for both possible .pp and .pas exte'+ + 'nsions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ - '$(COMPILER_TARGETDIR):'#010+ - ' ',' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ + '$(C','OMPILER_TARGETDIR):'#010+ + ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ #010+ '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ @@ -1646,9 +1646,9 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(EXE','CPPAS)'#010+ #010+ - '%$(EXEEXT): %.','pas'#010+ + '%$(EXEEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1663,69 +1663,76 @@ const fpcmakeini : array[0..206,1..240] of char=( '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ - '# Search paths for .ppu, .p','p, .pas, .lpr, .dpr'#010+ + '# Sea','rch paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLU','DEDIR)'#010+ + 'vpath %.dpr $(COMPILER_SOURC','EDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[libraryrules]'#010+ '#####################################################################'#010+ '# Library'#010+ - '#####################################################','###############'+ + '###############################','#####################################'+ '#'#010+ #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+ + 'ifndef SHARED_LIBVERSION'#010+ + 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ + #010+ + 'ifndef $(SHARED_LIBNAME)'#010+ + 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ + 'endif'#010+ + #010+ + 'ifndef LIB_FULLNAME'#010+ + 'SHARED_FULLNAME=$(SHAREDLIBPREFI','X)$(SHARED_LIBNAME)-$(SHARED_LIBVERS'+ + 'ION)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ - 'ifndef LIB_SHAREDUNITS'#010+ - 'LIB_SHAREDU','NITS:=$(TARGET_UNITS)'#010+ + 'ifndef SHARED_LIBUNITS'#010+ + 'SHARED_LIBUNITS:=$(TARGET_UNITS)'#010+ 'endif'#010+ #010+ - 'fpc_shared: all'#010+ + 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ - ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ + ' $(MAKE) all $(SHAREDOPTS)'#010+ + ' $(PPUMOVE',') $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o'+ + '$(SHARED_FULLNAME)'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ '[installrules]'#010+ - '############################################','########################'+ - '#'#010+ - '# Install rules'#010+ '#####################################################################'#010+ + '# Install rules'#010+ + '########','############################################################'+ + '#'#010+ #010+ '.PHONY: fpc_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+ + 'ov','erride INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT)'+ + ',$(INSTALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)',') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT)',',$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES)))'#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ '$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPULINKFILES:','=$(wildcard $(addprefix $(UNITTARGETDIR'+ - 'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ + 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(n','otdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ @@ -1733,8 +1740,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ - 'override INSTALLEXEFILES:=','$(addprefix $(TARGETDIRPREFIX),$(notdir $('+ - 'INSTALLEXEFILES)))'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ + 'STALLE','XEFILES)))'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1743,32 +1750,32 @@ const fpcmakeini : array[0..206,1..240] of char=( ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ - ' -$(UPXPROG) $(I','NSTALLEXEFILES)'#010+ + ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ - ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ + ' $(INSTALLEXE) $(INST','ALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#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 Makefil','e.fpc is available'#010+ + '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ - 'ifneq ($(wildcard Makefile.fpc),)'#010+ + 'ifneq ($(','wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ - 'end','if'#010+ + 'endif'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(','INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard',' $(LIB_FULLNAME)),)'#010+ - ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ + 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ + ' $(MKDIR) $(INSTALL_LIB','DIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ @@ -1776,34 +1783,34 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(I','NSTALL_DATADIR)'#010+ - ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ + ' $(MKDIR) $(INSTALL_DATADIR)'#010+ + ' $(INSTALL) $(INSTALL_FILES',') $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distcle','an,$(TARGET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ + ' ',' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,','$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ - 'EXAMPLEDIR)'#010+ - 'endif'#010+ + ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ + 'AMPLEDIR)'#010+ + 'endif',#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_d','istinstall'#010+ + '.PHONY: fpc_distinstall'#010+ #010+ - 'fpc_distinstall: install exampleinstall'#010+ + 'fpc_distinstall: install exampleinstal','l'#010+ #010+ #010+ '[zipinstallrules]'#010+ @@ -1811,19 +1818,19 @@ const fpcmakeini : array[0..206,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstal','l fpc_zipsourceinstall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ - '# Temporary path to pack a file, can only use a single deep'#010+ + '# Te','mporary 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+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ - 'PACK','DIR=/tmp/fpc-pack'#010+ + 'PACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Maybe create default zipname from packagename'#010+ + '# Maybe create defa','ult zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ @@ -1833,11 +1840,11 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$','(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ - 'ifndef ZIPTARGET'#010+ + 'ifndef ZI','PTARGET'#010+ 'ifdef DIST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ @@ -1852,27 +1859,26 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use a wrapper sc','ript by default for Os/2'#010+ + '# Use a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ - 'USEZIPWRAPPER=1'#010+ + 'USEZIPWRAPP','ER=1'#010+ 'endif'#010+ #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$(SRCBAT','CHEXT)'+ - ')'#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+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAM','E)$(TAREXT)'#010+ - 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ + 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(Z','IPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ @@ -1880,22 +1886,22 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ - ' $(MAKE) ','$(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=','1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(ECHOREDIR) -e ','"$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ - 'PER)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ - #010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ + 'R)'#010+ + ' ',' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ + 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAP','PER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ + ' ',' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -1904,9 +1910,9 @@ const fpcmakeini : array[0..206,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+ + ' $(DE','LTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ @@ -1914,8 +1920,8 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zip','install ZIPTARGET=exampleinstall ZIPSUFFIX=$('+ - 'ZIPEXAMPLESUFFIX)'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ + 'PEX','AMPLESUFFIX)'#010+ 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ @@ -1924,8 +1930,9 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ '[cleanrules]'#010+ '#####################################################################'#010+ - '# Clean rule','s'#010+ - '#####################################################################'#010+ + '# Clean rules'#010+ + '################################################','####################'+ + '#'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ @@ -1935,24 +1942,24 @@ const fpcmakeini : array[0..206,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'override',' CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ + 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNIT','S))'#010+ 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ 'LEANPPUFILES)))'#010+ - 'ifd','ef DEBUGSYMEXT'#010+ - 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ - 'UFILES))'#010+ + 'ifdef DEBUGSYMEXT'#010+ + 'override CLEANPPULINKFILES+=$(subst',' $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ + 'PPUFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGET','DIRPR'+ - 'EFIX),$(CLEANPPULINKFILES)))'#010+ + 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ + 'IX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ - 'fpc_clean: $(CLEANTARGET)'#010+ + 'fpc_clean',': $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ @@ -1960,44 +1967,45 @@ const fpcmakeini : array[0..206,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL) $(CLEANPP','ULINKFILES)'#010+ - 'endif'#010+ - 'ifdef CLEANRSTFILES'#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+ - 'endif'#010+ - ' ',' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $'+ - '(FPCEXTFILE) $(REDIRFILE)'#010+ - ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ - #010+ - 'fpc_cleanall: $(CLEANTARGET)'#010+ - 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ - 'endif'#010+ - 'ifdef COMPILER_UNIT','TARGETDIR'#010+ - 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL) $(CLEANPPUFILES)'#010+ - 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ + 'endif'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(D','EL) $(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+ + 'endif'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res',' link.res $'+ + '(FPCEXTFILE) $(REDIRFILE)'#010+ + ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ + #010+ + 'fpc_cleanall: $(CLEANTARGET)'#010+ + 'ifdef CLEANEXEFILES'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ + 'endif'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ + 'ifdef CLEANPPUFILES'#010+ + ' -$(DEL) $(CL','EANPPUFILES)'#010+ + 'endif'#010+ + 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ - 'end','if'#010+ + 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OE','XT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) ','fpcmade.* Package.fpc $(PPAS) script.res link.res $('+ + ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res ','$('+ 'FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ @@ -2007,11 +2015,12 @@ const fpcmakeini : array[0..206,1..240] of char=( ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ #010+ - 'fpc_distclean: cleanall'#010, + 'fpc_distclean: cleanall'#010+ #010+ #010+ '[baseinforules]'#010+ - '#####################################################################'#010+ + '################################','####################################'+ + '#'#010+ '# Base info rules'#010+ '#####################################################################'#010+ #010+ @@ -2019,112 +2028,111 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ 'override INFORULES+=fpc_baseinfo'#010+ #010+ - 'fpc_bas','einfo:'#010+ + 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Package info =='#010+ + ' @$(ECHO) == Packa','ge info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ - ' @$(E','CHO)'#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) Source OS.... $(OS_SOURCE)'#010+ - ' @$(E','CHO) Target OS.... $(OS_TARGET)'#010+ - ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ + ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ + ' @$(ECHO) ',' Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ - ' @$(ECHO)'#010, - ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ + ' @$(ECHO) == Directory info =='#010+ + ' @$(','ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ - ' @$(ECHO) Cro','ssBinDir..... $(CROSSBINDIR)'#010+ - ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ + ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ + ' @$(ECHO) Uni','tsDir........ $(UNITSDIR)'#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) == Tools info ','=='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ - ' @$(EC','HO) Mv........ $(MVPROG)'#010+ - ' @$(ECHO) Cp........ $(CPPROG)'#010+ + ' @$(ECHO) Mv........ $(MVPROG)'#010+ + ' @$(ECHO) Cp....','.... $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ - ' @$(ECHO) Da','te...... $(DATE)'#010+ - ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ + ' @$(ECHO) Date...... $(DATE)'#010+ + ' @$(ECHO) FPCMake... $(FP','CMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ - ' @$','(ECHO)'#010+ - ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Target Loaders........ $(','TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ - ' @$(ECHO) Target Programs....... $(TARGET_PR','OGRAMS)'#010+ - ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ + ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ + ' @$(ECHO) Target Dirs........... $','(TARGET_DIRS)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Clean Units.......','.. $(CLEAN_UNITS)'#010+ - ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ + ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO) Clean Files...','...... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install 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) ','DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPRE','FIX)'#010+ - ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ + ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ + ' @$(ECHO) ZipSuffix............ $(ZIP','SUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install base dir..... $(INSTAL','L_BASEDIR)'#010+ - ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#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 source dir... $(INSTALL_SOUR','CEDIR)'#010+ - ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ + ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ + ' @$(ECHO) Install doc dir...... $(I','NSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Dist destination di','r. $(DIST_DESTDIR)'#010+ - ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ + ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ + ' @$(ECHO) Dist zip name','........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ - '####################################################','################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_info'#010+ #010+ - 'fpc_info: $(INFORULES)'#010+ + 'fpc_info: $(I','NFORULES)'#010+ #010+ '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ - '.PH','ONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+ + '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 ','fpc_makefile_su'+ 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ @@ -2133,28 +2141,27 @@ const fpcmakeini : array[0..206,1..240] of char=( #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(ad','dsuffix /Makefile.fpc,$(TAR'+ - 'GET_DIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_DIRS))'#010+ 'endif'#010+ - 'ifdef TARGET_EXAMPLEDIRS'#010+ + 'ifdef ','TARGET_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_'+ - 'EXAMPLED','IRS))'#010+ + 'EXAMPLEDIRS))'#010+ #010+ - 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ + 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_ma','kefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ - '###########################','#########################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc),)'#010+ + 'ifneq ','($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -2162,20 +2169,20 @@ const fpcmakeini : array[0..206,1..240] of char=( '[userrules]'#010+ '#####################################################################'#010+ '# Users rules'#010+ - '#######################################','#############################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '#####################################################################'#010+ + '#######','#############################################################'+ + '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ - 'ifeq ($(O','S_TARGET),win32)'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLATFORM=gtk'#010+ + 'LCL_PLATF','ORM=gtk'#010+ 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ @@ -2184,53 +2191,53 @@ const fpcmakeini : array[0..206,1..240] of char=( 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ - 'o','verride LCLDIR=wrong'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override LCLDIR=wrong'#010+ + 'override LCLDIR=wr','ong'#010+ 'endif'#010+ #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+ - 'override LCLDIR=w','rong'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Check for development version'#010+ + '# Check for development version'#010, 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ - 'override LCLD','IR=wrong'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Check for release version'#010+ + '# Check for release version'#010, 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ - 'override LC','LDIR=wrong'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ - 'IR)/units)'#010+ + 'override L','CLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ + 'LDIR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#010+ - 'export LCLDIR LCLUNITDI','R LCLCOMPONENTDIR'#010+ + 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'overrid','e REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '####','################################################################'+ + '######################################################','##############'+ '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ @@ -2240,8 +2247,8 @@ const fpcmakeini : array[0..206,1..240] of char=( ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ - ' @$(EC','HO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ + ' @$(EC','HO) 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 a3efb53b74..71084f0573 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -737,6 +737,7 @@ ASMEXT=.s SMARTEXT=.sl STATICLIBEXT=.a SHAREDLIBEXT=.so +SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp RSTEXT=.rst #DEBUGSYMEXT #for debugger symbol files, define only for targets which has this @@ -1620,22 +1621,27 @@ vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) .PHONY: fpc_shared -ifndef LIB_FULLNAME -ifdef LIB_VERSION -LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION) -else -LIB_FULLNAME=$(LIB_NAME) +ifndef SHARED_LIBVERSION +SHARED_LIBVERSION=$(FPC_VERSION) endif + +ifndef $(SHARED_LIBNAME) +SHARED_LIBNAME=$(PACKAGE_NAME) +endif + +ifndef LIB_FULLNAME +SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION) endif # Default sharedlib units are all unit objects -ifndef LIB_SHAREDUNITS -LIB_SHAREDUNITS:=$(TARGET_UNITS) +ifndef SHARED_LIBUNITS +SHARED_LIBUNITS:=$(TARGET_UNITS) endif -fpc_shared: all +fpc_shared: ifdef HASSHAREDLIB - $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME) + $(MAKE) all $(SHAREDOPTS) + $(PPUMOVE) $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) else @$(ECHO) Shared Libraries not supported endif diff --git a/utils/fpcm/fpcmwr.pp b/utils/fpcm/fpcmwr.pp index e4ab797150..908012529c 100644 --- a/utils/fpcm/fpcmwr.pp +++ b/utils/fpcm/fpcmwr.pp @@ -641,7 +641,9 @@ implementation FHasSection[sec_zipinstall]:=false; FHasSection[sec_distinstall]:=false; end; - FHasSection[sec_libs]:=FInput.HasVariable('lib_name'); + { can't get shared lib generation working without it (FK) + FHasSection[sec_libs]:=FInput.HasVariable('lib_name'); + } { Remove unused sections for targets } SkippedSecs:=0; if (not FInput.HasTargetVariable('target_units')) then @@ -779,6 +781,10 @@ implementation AddTargetVariable('compiler_librarydir'); AddTargetVariable('compiler_targetdir'); AddTargetVariable('compiler_unittargetdir'); + { shared } + AddTargetVariable('shared_libname'); + AddTargetVariable('shared_libversion'); + AddTargetVariable('shared_libunits'); { default Dirs and extensions } AddIniSection('defaultdirs'); if FInput.CheckLibcRequire then @@ -808,7 +814,7 @@ implementation if FHasSection[sec_compile] then AddIniSection('compilerules'); if FHasSection[sec_libs] then - AddIniSection('libraryrules'); + AddIniSection('libraryrules'); { install } if FHasSection[sec_install] then AddIniSection('installrules');