From d03b33169943755de773976a4870b3f67afc8820 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 7 Jun 2001 21:21:38 +0000 Subject: [PATCH] * remove ppufiles * fix staticlib prefix that is now libp instead of lib --- utils/fpcm/fpcmake.inc | 496 ++++++++++++++++++++--------------------- utils/fpcm/fpcmake.ini | 31 +-- utils/fpcm/fpcmwr.pp | 7 +- 3 files changed, 257 insertions(+), 277 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index b122ae1cce..3370426c03 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..122] of string[240]=( +const fpcmakeini : array[0..121] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..122,1..240] of char=( +const fpcmakeini : array[0..121,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -25,21 +25,21 @@ const fpcmakeini : array[0..122,1..240] of char=( '# that normally doesn'#039't exists in path names.'#010+ 'ifeq ($(findst','ring ;,$(PATH)),)'#010+ 'inUnix=1'#010+ - 'SEARCHPATH:=$(subst .,,$(subst :, ,$(PATH)))'#010+ + 'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+ 'else'#010+ 'SEARCHPATH:=$(subst ;, ,$(PATH))'#010+ 'endif'#010+ #010+ '# Search for PWD and determine also if we are under linux'#010+ - 'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#010+ - 'ife','q ($(PWD),)'#010+ + 'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))',#010+ + 'ifeq ($(PWD),)'#010+ 'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))'#010+ 'ifeq ($(PWD),)'#010+ 'nopwd:'#010+ ' @echo You need the GNU utils package to use this Makefile!'#010+ ' @echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo3'+ '2.zip'#010+ - ' ',' @exit'#010+ + ' ',' @exit'#010+ 'else'#010+ 'PWD:=$(firstword $(PWD))'#010+ 'SRCEXEEXT='#010+ @@ -53,8 +53,8 @@ const fpcmakeini : array[0..122,1..240] of char=( '# Detect OS/2 - OS/2 has OS2_SHELL defined'#010+ 'ifndef inUnix'#010+ 'ifeq ($(OS),Windows_NT)'#010+ - 'inWinNT=1'#010+ - 'el','se'#010+ + 'inWinNT=','1'#010+ + 'else'#010+ 'ifdef OS2_SHELL'#010+ 'inOS2=1'#010+ 'endif'#010+ @@ -74,7 +74,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'else'#010+ 'BATCHEXT=.bat'#010+ 'endif'#010+ - 'endif'#010, + 'en','dif'#010+ #010+ '# Path Separator, the subst trick is necessary for the \ that can'#039't'+ ' exists'#010+ @@ -90,16 +90,16 @@ const fpcmakeini : array[0..122,1..240] of char=( 'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#010+ 'else'#010+ 'BASEDIR=.'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '[','fpcdetect]'#010+ + '[fpcdetect]'#010+ '#####################################################################'#010+ '# FPC version/target Detection'#010+ '#####################################################################'#010+ #010+ '# What compiler to use ?'#010+ 'ifndef FPC'#010+ - '# Compatibility with ','old makefiles'#010+ + '# Compatibility w','ith old makefiles'#010+ 'ifdef PP'#010+ 'FPC=$(PP)'#010+ 'else'#010+ @@ -115,7 +115,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ #010+ '# Source OS'#010+ - 'ifndef O','S_SOURCE'#010+ + 'ifnd','ef OS_SOURCE'#010+ 'OS_SOURCE:=$(shell $(FPC) -iSO)'#010+ 'endif'#010+ #010+ @@ -131,7 +131,7 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '# FPC version'#010+ 'ifndef FPC_VERSION'#010+ - 'FPC_VERSION:=$(sh','ell $(FPC) -iV)'#010+ + 'FPC_VERSION:=','$(shell $(FPC) -iV)'#010+ 'endif'#010+ #010+ 'export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION'#010+ @@ -140,7 +140,7 @@ const fpcmakeini : array[0..122,1..240] of char=( '[fpcdircheckenv]'#010+ '#####################################################################'#010+ '# FPCDIR Setting'#010+ - '##############################################','######################'+ + '##########################################','##########################'+ '#'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ @@ -151,10 +151,10 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ 'else'#010+ 'override FPCDIR=wrong'#010+ - 'endif'#010+ + 'endif',#010+ #010+ #010+ - '[','fpcdirdetect]'#010+ + '[fpcdirdetect]'#010+ '# Detect FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ @@ -163,13 +163,13 @@ const fpcmakeini : array[0..122,1..240] of char=( 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'override FPCDIR:=$(subst /$(FPC),',',$(firstword $(strip $(wildcard $(a'+ + 'override FPCDIR:=$(subst /$(F','PC),,$(firstword $(strip $(wildcard $(a'+ 'ddsuffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ - 'o','verride FPCDIR=c:/pp'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units))',',)'#010+ + 'override FPCDIR=c:/pp'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -183,7 +183,7 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ #010+ '[shelltools]'#010+ - '##############################################','######################'+ + '##########################################','##########################'+ '#'#010+ '# Shell tools'#010+ '#####################################################################'#010+ @@ -191,9 +191,9 @@ const fpcmakeini : array[0..122,1..240] of char=( '# Echo that can redir (must be able run in the default OS shell)'#010+ 'ifndef ECHOREDIR'#010+ 'ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '#',' To copy pograms'#010+ + '# To copy pograms'#010+ 'ifndef COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ @@ -211,9 +211,9 @@ const fpcmakeini : array[0..122,1..240] of char=( '# Check delete program'#010+ 'ifndef DEL'#010+ 'DEL:=$(RMPROG) -f'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '#',' Check deltree program'#010+ + '# Check deltree program'#010+ 'ifndef DELTREE'#010+ 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ @@ -230,7 +230,7 @@ const fpcmakeini : array[0..122,1..240] of char=( '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ - 'INSTAL','LEXE:=$(GINSTALL) -c -m 755'#010+ + 'IN','STALLEXE:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -246,7 +246,7 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ #010+ '[defaulttools]'#010+ - '############','########################################################'+ + '########','############################################################'+ '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ @@ -256,7 +256,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'AS=as'#010+ 'endif'#010+ #010+ - '# linker, but probably not u','sed'#010+ + '# linker, but probably n','ot used'#010+ 'ifndef LD'#010+ 'LD=ld'#010+ 'endif'#010+ @@ -277,7 +277,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=$(shell $(DATE) +%Y%m%','d)'#010+ + 'DATESTR:=$(shell $(DATE) +%','Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ 'endif'#010+ @@ -292,7 +292,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifeq ($(OS_TARGET),win32)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ - 'ifdef UPXP','ROG'#010+ + 'ifdef ','UPXPROG'#010+ 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ 'ifeq ($(UPXPROG),)'#010+ @@ -310,7 +310,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ZIPOPT=-9'#010+ 'ZIPEXT=.zip'#010+ #010+ - '# Tar optio','ns'#010+ + '# Tar o','ptions'#010+ 'ifeq ($(USETAR),bz2)'#010+ 'TAROPT=vI'#010+ 'TAREXT=.tar.bz2'#010+ @@ -323,7 +323,7 @@ const fpcmakeini : array[0..122,1..240] of char=( '[extensions]'#010+ '#####################################################################'#010+ '# Default extensions'#010+ - '################################################','####################'+ + '############################################','########################'+ '#'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ @@ -336,30 +336,30 @@ const fpcmakeini : array[0..122,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ - 'LIBPREFIX=lib'#010+ + 'STATICLIBPREFIX=libp'#010+ 'RSTEXT=.rst'#010+ 'FPCMADE=fpcmade'#010+ #010+ #010+ - '# Go32v1'#010+ - 'ifeq ($','(OS_TARGET),go32v1)'#010+ + '# Go3','2v1'#010+ + 'ifeq ($(OS_TARGET),go32v1)'#010+ 'PPUEXT=.pp1'#010+ 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ 'SMARTEXT=.sl1'#010+ 'STATICLIBEXT=.a1'#010+ 'SHAREDLIBEXT=.so1'#010+ - 'LIBPREFIX='#010+ + 'STATICLIBPREFIX='#010+ 'FPCMADE=fpcmade.v1'#010+ 'PACKAGESUFFIX=v1'#010+ 'endif'#010+ #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'LIBPREFIX='#010+ - 'FPCMADE=fpcmade.dos'#010+ + 'STATICLIBPREFIX='#010+ + 'FPCMADE=fpcmade','.dos'#010+ 'ZIPSUFFIX=go32'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ '# Linux'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ @@ -377,8 +377,8 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ZIPSUFFIX=freebsd'#010+ 'endif'#010+ #010+ - '# Win32'#010+ - 'ifeq ($(OS_TARGET),w','in32)'#010+ + '# Win','32'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ 'PPUEXT=.ppw'#010+ 'OEXT=.ow'#010+ 'ASMEXT=.sw'#010+ @@ -395,9 +395,9 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ASMEXT=.so2'#010+ 'OEXT=.oo2'#010+ 'AOUTEXT=.out'#010+ - 'SMARTEXT=.so'#010+ + 'SMARTEXT=.s','o'#010+ 'STATICLIBEXT=.ao2'#010+ - 'SHA','REDLIBEXT=.dll'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.os2'#010+ 'ZIPSUFFIX=emx'#010+ 'endif'#010+ @@ -405,9 +405,10 @@ const fpcmakeini : array[0..122,1..240] of char=( '[defaultdirs]'#010+ '#####################################################################'#010+ '# Default Directories'#010+ - '#####################################################################'#010+ + '#######################################################','#############'+ + '#'#010+ #010+ - '# Units',' dir'#010+ + '# Units dir'#010+ 'ifdef REQUIRE_UNITSDIR'#010+ 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ @@ -418,8 +419,8 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ #010+ #010+ - '# Linux and freebsd use unix dirs with /usr/bin, /usr/lib'#010+ - '# When zipping us','e the target as default, when normal install then'#010+ + '# Linux and freebsd use unix dirs with /usr/bin, /us','r/lib'#010+ + '# When zipping use the target as default, when normal install then'#010+ '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ @@ -430,8 +431,8 @@ const fpcmakeini : array[0..122,1..240] of char=( 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'else'#010+ - '# Normal install'#010+ - 'ifeq ($','(OS_SOURCE),linux)'#010+ + '#',' Normal install'#010+ + 'ifeq ($(OS_SOURCE),linux)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'ifeq ($(OS_SOURCE),freebsd)'#010+ @@ -442,9 +443,9 @@ const fpcmakeini : array[0..122,1..240] of char=( '# set the prefix directory where to install everything'#010+ 'ifndef INSTALL_PREFIX'#010+ 'ifdef UNIXINSTALLDIR'#010+ - 'INSTALL_PREFIX=/usr/local'#010+ + 'INSTALL_PREFIX=/usr','/local'#010+ 'else'#010+ - 'ifdef INSTA','LL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ @@ -457,17 +458,16 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ - 'export DIST_DESTDIR'#010+ + 'export DIS','T_DESTDIR'#010+ #010+ #010+ - '###########','#########################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Install Directories'#010+ '#####################################################################'#010+ #010+ '# set the base directory where to install everything'#010+ - 'ifndef INSTALL_BASEDIR'#010+ - 'ifdef UNIXIN','STALLDIR'#010+ + 'ifndef INSTA','LL_BASEDIR'#010+ + 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ @@ -478,14 +478,14 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# set the directory where to ','install the binaries'#010+ + '# set ','the directory where to install the binaries'#010+ 'ifndef INSTALL_BINDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ '# for FPC packages install the binaries under their os target subdir'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010, + 'if','def INSTALL_FPCPACKAGE'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)'#010+ 'endif'#010+ 'endif'#010+ @@ -494,8 +494,10 @@ const fpcmakeini : array[0..122,1..240] of char=( '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_UNITDIR:=$(INST','ALL_UNITDIR)/$(PACKAGE_NAME)'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010, + 'ifdef PACKAGE_NAME'#010+ + 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ + 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -504,19 +506,19 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ - 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ + 'INSTALL_LIBDIR:=$(INSTALL_UN','ITDIR)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Where the source files wil','l be stored'#010+ + '# Where the source files will be stored'#010+ 'ifndef INSTALL_SOURCEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_'+ 'NAME)'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VER'+ - 'SION)'#010, + 'INSTALL_SOURCEDIR:=$(INSTALL','_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_V'+ + 'ERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -527,9 +529,9 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the doc files will be stored'#010+ + '# Where the doc files wil','l be stored'#010+ 'ifndef INSTALL_DOCDIR'#010+ - 'ifdef UNIXINST','ALLDIR'#010+ + 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAM'+ 'E)'#010+ @@ -537,9 +539,9 @@ const fpcmakeini : array[0..122,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSIO'+ 'N)'#010+ 'endif'#010+ - 'else'#010+ + 'els','e'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DOCDIR:=$(INS','TALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ @@ -547,18 +549,18 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ #010+ '# 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_EXAMP','LEDIR'#010+ + '# because the copytree command ','will create a subdir itself'#010+ + 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ '$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ - 'RSION)'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKA','GE_NAME)-$(PACKAGE_'+ + 'VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'ifdef INS','TALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ @@ -566,9 +568,9 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the some extra (data)files will be stored'#010+ + '# Where the some extra (data)files will ','be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ - 'INSTALL_DATADIR','=$(INSTALL_BASEDIR)'#010+ + 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -578,10 +580,10 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifndef GCCLIBDIR'#010+ 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ print'+ ' $$4 } '#039'`)'#010+ - 'endif'#010+ + 'endi','f'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -','v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+ - '" "; print $1 }'#039')'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ + '"; print $1 }'#039')'#010+ 'endif'#010+ 'export GCCLIBDIR OTHERLIB'#010+ 'endif'#010+ @@ -589,16 +591,15 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '[command_begin]'#010+ '#####################################################################'#010+ - '# Compiler Command Line'#010+ - '###################################','#################################'+ - '#'#010+ + '# Compiler ','Command Line'#010+ + '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define'#010+ 'override FPCOPTDEF=$(CPU_TARGET)'#010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ - 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'override FPCOPT+=-T$(OS_T','ARGET)'#010+ + 'ifneq ($(OS','_TARGET),$(OS_SOURCE))'#010+ + 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ '# User dirs should be first, so they are looked at first'#010+ @@ -606,10 +607,10 @@ const fpcmakeini : array[0..122,1..240] of char=( 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))',#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix',' -Fo,$(OBJDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ @@ -622,12 +623,12 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ - 'override FPCOPT+=-CX'#010+ + 'overr','ide FPCOPT+=-CX'#010+ 'endif'#010+ #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ - 'overr','ide FPCOPT+=-gl'#010+ + 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ #010+ @@ -637,12 +638,12 @@ const fpcmakeini : array[0..122,1..240] of char=( 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ - '# Strip'#010+ + '# St','rip'#010+ 'ifdef STRIP'#010+ 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ - '# Op','timizer'#010+ + '# Optimizer'#010+ 'ifdef OPTIMIZE'#010+ 'override FPCOPT+=-OG2p3'#010+ 'endif'#010+ @@ -654,16 +655,16 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ + 'overri','de FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ - 'ifdef COMPI','LER_UNITDIR'#010+ + 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR)',')'#010+ + 'overri','de FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ @@ -671,8 +672,8 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ - 'ifeq ($(COMPILER_TARG','ETDIR),.)'#010+ + 'override FPCOPT','+=-FE$(COMPILER_TARGETDIR)'#010+ + 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ @@ -681,20 +682,20 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '# Unit target dir'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ + 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDI','R)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ - 'override U','NITTARGETDIRPREFIX='#010+ + 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ + 'override UNITTARGETDIRPRE','FIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '[command_lib','c]'#010+ + '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ @@ -705,9 +706,9 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ #010+ '[command_end]'#010+ - '# Add commandline options last so they can override'#010+ + '# Add commandline',' options last so they can override'#010+ 'ifdef OPT'#010+ - 'ove','rride FPCOPT+=$(OPT)'#010+ + 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ @@ -717,10 +718,10 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCOPT+=@$(CFGFILE)'#010+ + 'override F','PCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ - '# Use the environment ','to pass commandline options?'#010+ + '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ @@ -730,8 +731,8 @@ const fpcmakeini : array[0..122,1..240] of char=( '# Compiler commandline'#010+ 'override 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+ + '# also c','all ppas if with command option -s'#010+ + '# but only if the OS_SOURCE and OS_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -742,8 +743,8 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '####################################################################','#'+ - #010+ + '####################','################################################'+ + '#'#010+ '# Loaders'#010+ '#####################################################################'#010+ #010+ @@ -751,8 +752,8 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ 'ifdef TARGET_LOADERS'#010+ 'override ALLTARGET+=fpc_loaders'#010+ - 'override CLEANTARGET+=fpc_loaders_clean'#010+ - 'override INSTALLTARGET+=fpc_loaders_install',#010+ + 'override CLEANTARGET+=fpc_loaders_c','lean'#010+ + 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ @@ -763,18 +764,18 @@ const fpcmakeini : array[0..122,1..240] of char=( 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ - ' -$(DEL) $(LOADEROFILES)'#010+ + ' -$(DEL) $','(LOADEROFILES)'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(M','KDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ #010+ #010+ '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ - '#####################################################################', - #010+ + '#####################','###############################################'+ + '#'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ @@ -783,10 +784,10 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+ + 'override CLEANPPUF','ILES+=$(UNITPPUFILES)'#010+ 'endif'#010+ #010+ - 'fpc_units: $(UNITPP','UFILES)'#010+ + 'fpc_units: $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -796,14 +797,14 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '.PHONY: fpc_exes'#010+ #010+ - 'ifdef TARGET_PROGRAMS'#010+ - 'override EXEFILES=$(addsuffix $','(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'ifdef',' TARGET_PROGRAMS'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ - 'x $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ + 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ #010+ - 'override ALLTARGET+=fpc_exes'#010+ + 'override ALLTARGET+=fp','c_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'override ','CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ @@ -813,7 +814,7 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '#############################################################','#######'+ + '#######','#############################################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -821,33 +822,33 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILES)'#010+ + 'override CLE','ANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ '[examplerules]'#010+ - '#######','#############################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Examples'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifdef TARGET_EXAMPLES'#010+ + 'ifdef TARGET_EXAMPL','ES'#010+ 'HASEXAMPLES=1'#010+ - 'override EXAMPLESOURCEFILES:=$(wildca','rd $(addsuffix .pp,$(TARGET_EXA'+ - 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ + 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ - 'refix $(LIBPREFIX),$(addsuff','ix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ + '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+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EX','AMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - 'HASEXAMPLES=1'#010, + 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ @@ -856,9 +857,8 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ '[compilerules]'#010+ '#####################################################################'#010+ - '# General compile rules'#010+ - '################################################','####################'+ - '#'#010+ + '# General co','mpile rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_packages fpc_all fpc_smart fpc_debug'#010+ #010+ @@ -867,10 +867,10 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ 'fpc_packages: $(COMPILEPACKAGES)'#010+ #010+ - 'fpc_all: fpc_packages $(FPCMADE)'#010+ + 'fpc','_all: fpc_packages $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' $(MAKE) al','l LINKSMART=1 CREATESMART=1'#010+ + ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ @@ -878,11 +878,11 @@ const fpcmakeini : array[0..122,1..240] of char=( '# General compile rules, available for both possible .pp and .pas exte'+ 'nsions'#010+ #010+ - '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+ + '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(','OEXT) .pas .pp'#010+ #010+ '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ - ' ',' $(EXECPPAS)'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ @@ -893,17 +893,17 @@ const fpcmakeini : array[0..122,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ - ' $(COMPILER) $<'#010+ + ' $(COMPILER) $<',#010+ ' $(EXECPPAS)'#010+ #010+ - '# Search paths for .ppu and .pp and .p','as'#010+ + '# Search paths for .ppu and .pp and .pas'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ #010+ '[libraryrules]'#010+ - '################################################################','####'+ + '####','################################################################'+ '#'#010+ '# Library'#010+ '#####################################################################'#010+ @@ -912,107 +912,101 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ 'ifndef LIB_FULLNAME'#010+ 'ifdef LIB_VERSION'#010+ - 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ + 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERS','ION)'#010+ 'else'#010+ 'LIB_FULLNAME=$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Default sh','aredlib units are all unit objects'#010+ + '# Default sharedlib units are all unit objects'#010+ 'ifndef LIB_SHAREDUNITS'#010+ 'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+ 'endif'#010+ #010+ 'fpc_shared: all'#010+ 'ifdef HASSHAREDLIB'#010+ - ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ + ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_F','ULLNAME)'#010+ 'else'#010+ - ' @$(ECHO) Shared Libraries not supporte','d'#010+ + ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '#####################################################################'#010+ + '#####################################################################', + #010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ - #010, + #010+ 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - 'ifdef PPUFILES'#010+ + 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALL','PPU'+ + 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'T),$(INSTALLPPUFILES)))'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ 'PPUFILES))'#010+ - 'override INSTALLPPULINKFILES:','=$(addprefix $(UNITTARGETDIRPREFIX),$(s'+ - 'hell $(PPUFILES) -S -O $(INSTALLPPUFILES)))'#010+ - 'else'#010+ - 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INS'+ - 'TALLPPUFILES',')))'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ - 'PPUFILES))'#010+ - 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ - 'EFIX),$(INSTALLPPULINKFILES)))'#010+ - 'endif'#010+ + 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTAR','GETDIR'+ + 'PREFIX),$(INSTALLPPULINKFILES)))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'override INSTALLEXE','FILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+ - 'EFILES))'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+ + 'ILES))'#010+ 'endif'#010+ #010+ #010+ 'fpc_install: $(INSTALLTARGET)'#010+ '# Create UnitInstallFiles'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(INSTALL_BINDIR)'#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 INSTALLPPUFILES'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INSTALL_UNI','TDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'ifneq ($(INSTALLPPULINKF','ILES),)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ - ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ + ' ',' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNA','ME) $(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+ - ' $(INSTALL) $(INSTALL_FILES) $(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+ + ' $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+ #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+ + ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ 'AMPLEDIR)'#010+ 'endif'#010+ #010+ - '[distinstallrules]'#010+ + '[distinstal','lrules]'#010+ '#####################################################################'#010+ - '# Dist In','stall'#010+ + '# Dist Install'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_distinstall'#010+ @@ -1020,17 +1014,15 @@ const fpcmakeini : array[0..122,1..240] of char=( 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ - '[zipinstallrules]'#010+ + '[zipinsta','llrules]'#010+ '#####################################################################'#010+ '# Zip'#010+ - '##','##################################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ - '# Temporary path to pack a file, can only use a single deep'#010+ - '# subdir, because the deltree can'#039't see the ','whole tree to remove'+ - #010+ + '# Temporary path ','to pack a file, can only use a single deep'#010+ + '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ @@ -1039,12 +1031,12 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Maybe create default zipname from packagename'#010+ + '# Maybe create default zipname f','rom packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ - 'ZIPNAME=','$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ + 'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1054,7 +1046,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ - 'endif'#010+ + 'en','dif'#010+ 'endif'#010+ #010+ '# Use tar by default under linux'#010+ @@ -1062,7 +1054,7 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifdef inUnix'#010+ 'USETAR=1'#010+ 'endif'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ '# Use a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ @@ -1070,61 +1062,60 @@ const fpcmakeini : array[0..122,1..240] of char=( 'endif'#010+ #010+ '# We need to be able to run in the current OS so fix'#010+ - '# the path separator'#010+ + '# the path sep','arator'#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+ - 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010, 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_','DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ - 'TFILE) *'#010+ + 'ZIPCMD_ZIP:=$(subs','t /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+ + 'ESTFILE) *'#010+ 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ - ' ',' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ - '# Handle gecho separate as we need to espace \ with \\'#010+ + '# Handle gecho separate as we need to ','espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPC','MD_CDPACK))" > $(ZIPWRAP'+ - 'PER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ + 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ - 'ER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE','))" >> $(ZIPWRA'+ + 'PPER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ - ' echo $(','ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPWRAPPER)'#010+ - 'endif'#010+ + 'e','ndif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIP','CMD_CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+ #010+ - 'fpc_zipexampleinstall:'#010+ + 'fpc_zipexamp','leinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZI','PSUFFIX=ex'+ - 'm'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+ 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ @@ -1132,38 +1123,33 @@ const fpcmakeini : array[0..122,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '#####################################################################'#010+ - '# Clean rules'#010+ - '#################################################','###################'+ + '##############################################','######################'+ '#'#010+ + '# Clean rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ + 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES', '))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'override 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),$'+ + '(CLEANPPUFILES)))'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ - '# Get the .o and .a files created for the units'#010+ - 'ifdef PPUFILES'#010+ - 'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+ - 'else'#010+ - 'CLEANPPU','LINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFI'+ - 'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+ - 'ANPPUFILES))))'#010+ + 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ + 'IX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ - 'override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN'+ - 'PPULINKFILES))'#010+ - 'endi','f'#010+ #010+ - 'fpc_clean: $(CLEANTARGET)'#010+ + 'fpc_clean: $(CLEANTARGET)'#010, 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ @@ -1173,8 +1159,9 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRSTFILES'#010, - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(DEL) $(addprefix $','(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+ + #010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ @@ -1182,10 +1169,10 @@ const fpcmakeini : array[0..122,1..240] of char=( 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) $(PPAS) link.res $','(FPCEXTFILE) $(REDIRFIL'+ - 'E)'#010+ + ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ #010+ - 'fpc_distclean: clean'#010+ + #010+ + 'fp','c_distclean: clean'#010+ #010+ '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ '# set if targetdir or unittargetdir is specified'#010+ @@ -1193,14 +1180,14 @@ const fpcmakeini : array[0..122,1..240] of char=( 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ - 'fpc_cleanall:',' $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ + 'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCL','EAN)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(','DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+ + ' -$(DEL) $(FPCMADE) $(PPAS) link.','res $(FPCEXTFILE) $(REDIRFIL'+ 'E)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ @@ -1210,7 +1197,7 @@ const fpcmakeini : array[0..122,1..240] of char=( '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ - '###################################','#################################'+ + '################################################################','####'+ '#'#010+ #010+ '.PHONY: fpc_info'#010+ @@ -1220,89 +1207,88 @@ const fpcmakeini : array[0..122,1..240] of char=( ' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ - ' @$(ECHO',')'#010+ - ' @$(ECHO) == Configuration info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Config','uration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#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+ + ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ + ' @$(ECHO) Source OS..','.. $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ - ' @$(ECHO) FPCDir.......','... $(FPCDIR)'#010+ - ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ + ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ + ' @$(ECHO',') UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ - ' @$(ECH','O)'#010+ - ' @$(ECHO) == Tools info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Tools',' info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Pwd....... $(PWD)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' @$(ECHO) GInstall.. $(G','INSTALL)'#010+ - ' @$(ECHO) Echo...... $(ECHO)'#010+ + ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ + ' @$(ECHO) Ec','ho...... $(ECHO)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+ - ' @$(ECHO) Upx....... $(UPXPR','OG)'#010+ + ' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Object info =='#010+ + ' @','$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders...... $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+ - ' @$(ECH','O) Target Programs..... $(TARGET_PROGRAMS)'#010+ - ' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+ + ' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+ + ' @$(ECHO) Target D','irs......... $(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) Clea','n Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ - ' @','$(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ + ' ','@$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) Ins','tall FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ + ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ + ' @$(E','CHO) 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_SOURCEDIR)'#010+ + ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ + ' @$(ECHO) ','Install source dir... $(INSTALL_SOURCEDIR)'#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 destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[localmakefile]'#010+ - '#########################','###########################################'+ - '#'#010+ - '# Local Makefile'#010+ '#####################################################################'#010+ + '# Local Makefile'#010+ + '########','############################################################'+ + '#'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ '[userrules]'#010+ - '###################################','#################################'+ - '#'#010+ + '#####################################################################'#010+ '# Users rules'#010+ - '#####################################################################'#010 + '#####################','###############################################'+ + '#'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 9ed45ad07a..874e1fb09f 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -19,7 +19,7 @@ override PATH:=$(subst \,/,$(PATH)) # that normally doesn't exists in path names. ifeq ($(findstring ;,$(PATH)),) inUnix=1 -SEARCHPATH:=$(subst .,,$(subst :, ,$(PATH))) +SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH))) else SEARCHPATH:=$(subst ;, ,$(PATH)) endif @@ -320,7 +320,7 @@ ASMEXT=.s SMARTEXT=.sl STATICLIBEXT=.a SHAREDLIBEXT=.so -LIBPREFIX=lib +STATICLIBPREFIX=libp RSTEXT=.rst FPCMADE=fpcmade @@ -333,14 +333,14 @@ ASMEXT=.s1 SMARTEXT=.sl1 STATICLIBEXT=.a1 SHAREDLIBEXT=.so1 -LIBPREFIX= +STATICLIBPREFIX= FPCMADE=fpcmade.v1 PACKAGESUFFIX=v1 endif # Go32v2 ifeq ($(OS_TARGET),go32v2) -LIBPREFIX= +STATICLIBPREFIX= FPCMADE=fpcmade.dos ZIPSUFFIX=go32 endif @@ -478,9 +478,11 @@ endif ifndef INSTALL_UNITDIR INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET) ifdef INSTALL_FPCPACKAGE +ifdef PACKAGE_NAME INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME) endif endif +endif # Where to install shared libraries ifndef INSTALL_LIBDIR @@ -770,7 +772,7 @@ fpc_units: $(UNITPPUFILES) ifdef TARGET_PROGRAMS override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) -override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) +override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) override ALLTARGET+=fpc_exes override INSTALLEXEFILES+=$(EXEFILES) @@ -806,7 +808,7 @@ ifdef TARGET_EXAMPLES HASEXAMPLES=1 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES))) override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) +override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) ifeq ($(OS_TARGET),os2) @@ -906,15 +908,10 @@ override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) endif ifdef INSTALLPPUFILES -ifdef PPUFILES -override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES)) -override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))) -else -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES)) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES))) endif -endif ifdef INSTALLEXEFILES override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES)) @@ -1095,14 +1092,9 @@ override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) endif ifdef CLEANPPUFILES +override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) -# Get the .o and .a files created for the units -ifdef PPUFILES -CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES)) -else -CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))) -endif -override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)) +override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) endif fpc_clean: $(CLEANTARGET) @@ -1189,7 +1181,6 @@ fpc_info: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) PPUFiles.. $(PPUFILES) @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) diff --git a/utils/fpcm/fpcmwr.pp b/utils/fpcm/fpcmwr.pp index 7538c269d5..6a93e0217b 100644 --- a/utils/fpcm/fpcmwr.pp +++ b/utils/fpcm/fpcmwr.pp @@ -663,7 +663,6 @@ implementation AddTool('RMPROG','rm',''); AddTool('MVPROG','mv',''); AddIniSection('shelltools'); - AddTool('PPUFILES','ppufiles',''); AddTool('PPUMOVE','ppumove',''); AddTool('FPCMAKE','fpcmake',''); AddTool('ZIPPROG','zip',''); @@ -863,7 +862,11 @@ implementation end. { $Log$ - Revision 1.11 2001-06-06 21:58:25 peter + Revision 1.12 2001-06-07 21:21:38 peter + * remove ppufiles + * fix staticlib prefix that is now libp instead of lib + + Revision 1.11 2001/06/06 21:58:25 peter * Win32 fixes for Makefile so it doesn't require sh.exe Revision 1.10 2001/06/04 22:18:16 peter