mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-21 20:09:25 +02:00
* Fixed ld.so.conf and added /usr/pkg/lib for netbsd
This commit is contained in:
marco
parent
4a4d7cd40d
commit
a4bf3d5bbe
@ -634,26 +634,31 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ print'+
|
||||
' $$4 } '#039'`)'#010+
|
||||
'endif'#010+
|
||||
'ifeq ($(OS_TARGET),linux)'#010+
|
||||
'ifndef OTHERLIBDIR'#010+
|
||||
'OTHERLIBDIR:=$(shell grep -v "','^\#" /etc/ld.so.conf | awk '#039'{ ORS='+
|
||||
'OTHE','RLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+
|
||||
'" "; print $1 }'#039')'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'ifeq ($(OS_TARGET),netbsd)'#010+
|
||||
'OTHERLIBDIR+=/usr/pkg/lib'#010+
|
||||
'endif'#010+
|
||||
'export GCCLIBDIR OTHERLIB'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
#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+
|
||||
'# Load commandline OPT and add ta','rget and unit dir to be sure'#010+
|
||||
'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
|
||||
'override FPCOPT+=-T$(OS_TARG','ET)'#010+
|
||||
'override FPCOPT+=-T$(OS_TARGET)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# User dirs should be first, so they are looked at first'#010+
|
||||
@ -661,10 +666,10 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
|
||||
'endif'#010+
|
||||
'ifdef LIBDIR'#010+
|
||||
'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
|
||||
'ove','rride FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
|
||||
'endif'#010+
|
||||
'ifdef OBJDIR'#010+
|
||||
'override FPCOPT+=$(addprefix -F','o,$(OBJDIR))'#010+
|
||||
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
|
||||
'endif'#010+
|
||||
'ifdef INCDIR'#010+
|
||||
'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
|
||||
@ -675,26 +680,26 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'override FPCOPT+=-XX'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Smartlinking creation'#010+
|
||||
'# Smart','linking creation'#010+
|
||||
'ifdef CREATESMART'#010+
|
||||
'override FPCOPT+=-CX'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Debug'#010+
|
||||
'ifdef DEBUG'#010+
|
||||
'override',' FPCOPT+=-gl'#010+
|
||||
'override FPCOPT+=-gl'#010+
|
||||
'override FPCOPTDEF+=DEBUG'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
|
||||
'ifdef RELEASE'#010+
|
||||
'ifeq ($(CPU_TARGET),i386)'#010+
|
||||
'FPCCPUOPT:=-OG2p3'#010+
|
||||
'FPCC','PUOPT:=-OG2p3'#010+
|
||||
'else'#010+
|
||||
'FPCCPUOPT:='#010+
|
||||
'endif'#010+
|
||||
'override FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+
|
||||
'override FPCOPTDE','F+=RELEASE'#010+
|
||||
'override FPCOPTDEF+=RELEASE'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Strip'#010+
|
||||
@ -705,13 +710,13 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'# Optimizer (i386 only for now)'#010+
|
||||
'ifdef OPTIMIZE'#010+
|
||||
'ifeq ($(CPU_TARGET),i386)'#010+
|
||||
'override FPCOPT+=-OG2p3'#010+
|
||||
'override F','PCOPT+=-OG2p3'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Verbose settings (warning,note,info)'#010+
|
||||
'ifdef VERBOSE'#010+
|
||||
'override FP','COPT+=-vwni'#010+
|
||||
'override FPCOPT+=-vwni'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Needed compiler options'#010+
|
||||
@ -719,50 +724,50 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
|
||||
'endif'#010+
|
||||
'ifdef COMPILER_UNITDIR'#010+
|
||||
'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
|
||||
'override FPCOPT','+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
|
||||
'endif'#010+
|
||||
'ifdef COMPILER_LIBRARYDIR'#010+
|
||||
'override FPCOPT+=$(a','ddprefix -Fl,$(COMPILER_LIBRARYDIR))'#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+
|
||||
'ifdef COMPILER_INCL','UDEDIR'#010+
|
||||
'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Target dirs and th','e prefix to use for clean/install'#010+
|
||||
'# Target dirs and the prefix to use for clean/install'#010+
|
||||
'ifdef COMPILER_TARGETDIR'#010+
|
||||
'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
|
||||
'ifeq ($(COMPILER_TARGETDIR),.)'#010+
|
||||
'override TARGETDIRPREFIX='#010+
|
||||
'override TARGETDI','RPREFIX='#010+
|
||||
'else'#010+
|
||||
'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Unit target di','r'#010+
|
||||
'# Unit target dir'#010+
|
||||
'ifdef COMPILER_UNITTARGETDIR'#010+
|
||||
'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
|
||||
'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
|
||||
'override UNITTARGETDIRPREFIX='#010+
|
||||
'else'#010+
|
||||
'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
|
||||
'ov','erride UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
|
||||
'endif'#010+
|
||||
'else'#010+
|
||||
'ifdef COMPILER_TARGETDIR'#010+
|
||||
'o','verride COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
|
||||
'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
|
||||
'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'[command_libc]'#010+
|
||||
'# Add GCC lib path if asked'#010+
|
||||
'# Add GCC lib path i','f asked'#010+
|
||||
'ifdef GCCLIBDIR'#010+
|
||||
'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
|
||||
'endif'#010+
|
||||
'ifdef OTHERLIBDIR'#010+
|
||||
'override F','PCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
|
||||
'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
#010+
|
||||
@ -770,11 +775,11 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'# Add commandline options last so they can override'#010+
|
||||
'ifdef OPT'#010+
|
||||
'override FPCOPT+=$(OPT)'#010+
|
||||
'endif'#010+
|
||||
'en','dif'#010+
|
||||
#010+
|
||||
'# Add defines from FPCOPTDEF to FPCOPT'#010+
|
||||
'ifdef FPCOPTDEF'#010+
|
||||
'override FPCOPT+=$(addprefix -d',',$(FPCOPTDEF))'#010+
|
||||
'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Was a config file specified ?'#010+
|
||||
@ -782,22 +787,22 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'override FPCOPT+=@$(CFGFILE)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Use the environment to pass commandline options?'#010+
|
||||
'# Use the environment to pass commandline opt','ions?'#010+
|
||||
'ifdef USEENV'#010+
|
||||
'override FPCEXTCMD:=$(FPCOPT)'#010+
|
||||
'override FPCOPT:=!FPCEXTCMD'#010+
|
||||
'export FPCEXTC','MD'#010+
|
||||
'export FPCEXTCMD'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# 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+
|
||||
'# but only if the OS_SOURCE and OS_T','ARGET are equal'#010+
|
||||
'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
|
||||
'EXECPPAS='#010+
|
||||
'else'#010+
|
||||
'ifeq ($(OS_SOURCE),$(O','S_TARGET))'#010+
|
||||
'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+
|
||||
'EXECPPAS:=@$(PPAS)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
@ -806,20 +811,21 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'[loaderrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Loaders'#010+
|
||||
'#####################################################################'#010+
|
||||
'###########','#########################################################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_loaders'#010+
|
||||
#010+
|
||||
'ifdef TARG','ET_LOADERS'#010+
|
||||
'ifdef 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_LOADERS))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'%$(OEXT): %$(LOADEREXT)'#010+
|
||||
' $(AS) -o $*','$(OEXT) $<'#010+
|
||||
' $(AS) -o $*$(OEXT) $<'#010+
|
||||
#010+
|
||||
'fpc_loaders: $(LOADEROFILES)'#010+
|
||||
#010+
|
||||
@ -827,22 +833,21 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
' -$(DEL) $(LOADEROFILES)'#010+
|
||||
#010+
|
||||
'fpc_loaders_install:'#010+
|
||||
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
||||
' $(MKDIR) $(INSTALL_UNITDIR',')'#010+
|
||||
' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[unitrules]'#010+
|
||||
'#####################','###############################################'+
|
||||
'#'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Units'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_units'#010+
|
||||
#010+
|
||||
'ifdef TARGET_UNITS'#010+
|
||||
'if','def TARGET_UNITS'#010+
|
||||
'override ALLTARGET+=fpc_units'#010+
|
||||
#010+
|
||||
'override UNITPPUFILES=$(addsuffix $(PPUEXT)',',$(TARGET_UNITS))'#010+
|
||||
'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
|
||||
'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
|
||||
'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
|
||||
'endif'#010+
|
||||
@ -851,24 +856,23 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
#010+
|
||||
#010+
|
||||
'[exerules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Exes'#010+
|
||||
'################','####################################################'+
|
||||
'##','##################################################################'+
|
||||
'#'#010+
|
||||
'# Exes'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_exes'#010+
|
||||
#010+
|
||||
'ifdef TARGET_PROGRAMS'#010+
|
||||
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
|
||||
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGR','AMS))'#010+
|
||||
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
|
||||
'x $(STATICLIBPR','EFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
|
||||
')'#010+
|
||||
'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
|
||||
#010+
|
||||
'override ALLTARGET+=fpc_exes'#010+
|
||||
'override INSTALLEXEFILES+=$(EXEFILES)'#010+
|
||||
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
|
||||
'override CLEANEXEFILES+=$(','EXEFILES) $(EXEOFILES)'#010+
|
||||
'ifeq ($(OS_TARGET),os2)'#010+
|
||||
'override CLEANEXEFILES+=$(addsuffix $(AOUTEX','T),$(TARGET_PROGRAMS))'#010+
|
||||
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
@ -877,10 +881,10 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
#010+
|
||||
'[rstrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Resource strings'#010+
|
||||
'# Resour','ce strings'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'ifdef TAR','GET_RSTS'#010+
|
||||
'ifdef TARGET_RSTS'#010+
|
||||
'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
|
||||
#010+
|
||||
'override CLEANRSTFILES+=$(RSTFILES)'#010+
|
||||
@ -888,24 +892,24 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
#010+
|
||||
#010+
|
||||
'[examplerules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Examples'#010+
|
||||
'##################################','##################################'+
|
||||
'########################','############################################'+
|
||||
'#'#010+
|
||||
'# Examples'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_examples'#010+
|
||||
#010+
|
||||
'ifdef TARGET_EXAMPLES'#010+
|
||||
'HASEXAMPLES=1'#010+
|
||||
'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
|
||||
'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+
|
||||
'override EXAMPLEFILES:=$(addsuf','fix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
|
||||
'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .p','p,$(TARGET_EXA'+
|
||||
'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+
|
||||
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
|
||||
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
|
||||
'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+
|
||||
')))'#010+
|
||||
'refix $(STATICLIBPREFIX),$(addsuffix $(STATIC','LIBEXT),$(TARGET_EXAMPL'+
|
||||
'ES)))'#010+
|
||||
#010+
|
||||
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
|
||||
'ifeq',' ($(OS_TARGET),os2)'#010+
|
||||
'ifeq ($(OS_TARGET),os2)'#010+
|
||||
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
@ -913,46 +917,46 @@ const fpcmakeini : array[0..127,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_EXAMPLED'+
|
||||
'IRS))'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[compilerules]'#010+
|
||||
'####','################################################################'+
|
||||
'#'#010+
|
||||
'# General compile rules'#010+
|
||||
'#####################################################################'#010+
|
||||
'# General compile rules'#010+
|
||||
'###########################################################','#########'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_packages fpc_all fpc_smart fpc_debug'#010+
|
||||
#010+
|
||||
'$(FPCMADE): $(ALLTARGET)'#010+
|
||||
' ',' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
|
||||
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
|
||||
#010+
|
||||
'fpc_packages: $(COMPILEPACKAGES)'#010+
|
||||
#010+
|
||||
'fpc_all: fpc_packages $(FPCMADE)'#010+
|
||||
#010+
|
||||
'fpc_smart:'#010+
|
||||
' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
|
||||
' $(MAKE) all LINKSMART','=1 CREATESMART=1'#010+
|
||||
#010+
|
||||
'fpc_debug:'#010+
|
||||
' $(MAKE) all DEBUG=1'#010+
|
||||
#010+
|
||||
'# General compile rules, availabl','e 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 .pp'#010+
|
||||
#010+
|
||||
'%$(PPUEXT): %.pp'#010+
|
||||
' $(COMPILER) $<'#010+
|
||||
' $(EXECPPAS)'#010+
|
||||
' $(EXECP','PAS)'#010+
|
||||
#010+
|
||||
'%$(PPUEXT): %.pas'#010+
|
||||
' $(COMPILER) $<'#010+
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'%$(EXEEXT): %.pp'#010+
|
||||
' ',' $(COMPILER) $<'#010+
|
||||
' $(COMPILER) $<'#010+
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'%$(EXEEXT): %.pas'#010+
|
||||
@ -960,17 +964,17 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
' $(EXECPPAS)'#010+
|
||||
#010+
|
||||
'# Search paths for .ppu and .pp and .pas'#010+
|
||||
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
|
||||
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILE','R_INCLUDEDIR)'#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+
|
||||
'# Lib','rary'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_sha','red'#010+
|
||||
'.PHONY: fpc_shared'#010+
|
||||
#010+
|
||||
'ifndef LIB_FULLNAME'#010+
|
||||
'ifdef LIB_VERSION'#010+
|
||||
@ -980,12 +984,12 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Default sharedlib units are all unit objects'#010+
|
||||
'# Default sharedlib uni','ts are all unit objects'#010+
|
||||
'ifndef LIB_SHAREDUNITS'#010+
|
||||
'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_','shared: all'#010+
|
||||
'fpc_shared: all'#010+
|
||||
'ifdef HASSHAREDLIB'#010+
|
||||
' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
|
||||
'else'#010+
|
||||
@ -993,132 +997,134 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'endif'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[installrules]'#010+
|
||||
'[','installrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Insta','ll rules'#010+
|
||||
'# Install rules'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
|
||||
#010+
|
||||
'ifdef INSTALL_UNITS'#010+
|
||||
'ifdef INSTA','LL_UNITS'#010+
|
||||
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'ifdef INS','TALLPPUFILES'#010+
|
||||
'ifdef INSTALLPPUFILES'#010+
|
||||
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
|
||||
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
|
||||
',$(INSTALLPPUFILES)))'#010+
|
||||
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(IN','STA'+
|
||||
'LLPPUFILES))'#010+
|
||||
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIB','EX'+
|
||||
'T),$(INSTALLPPUFILES)))'#010+
|
||||
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
|
||||
'PPUFILES))'#010+
|
||||
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
|
||||
'EFIX),$(INSTALLPPULINKFILES)))'#010+
|
||||
'# Implicitly install Package.fpc'#010+
|
||||
'# Implicitly install Package.fpc',#010+
|
||||
'override INSTALL_CREATEPACKAGEFPC=1'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'ifdef INSTALLEXEFILES'#010+
|
||||
'override INSTALLEXEFILES:','=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+
|
||||
'EFILES))'#010+
|
||||
'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+
|
||||
'ILES))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_install: all $(INSTALLTARGET)'#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 INSTALL_CREATEPACKAGEFPC'#010+
|
||||
'ifdef FPCMAKE'#010+
|
||||
'# If the fpcpackage variable is set then create and install Package.fp'+
|
||||
'c,'#010+
|
||||
'# a safety check is done if Makefile.fpc is availa','ble'#010+
|
||||
'# If the fpcpackage variable is ','set then create and install Package.'+
|
||||
'fpc,'#010+
|
||||
'# a safety check is done if Makefile.fpc is available'#010+
|
||||
'ifdef PACKAGE_VERSION'#010+
|
||||
'ifneq ($(wildcard Makefile.fpc),)'#010+
|
||||
' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+
|
||||
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
||||
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
||||
' ',' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'ifdef INSTALLPPUFILE','S'#010+
|
||||
'ifdef INSTALLPPUFILES'#010+
|
||||
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
|
||||
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
|
||||
'ifneq ($(INSTALLPPULINKFILES),)'#010+
|
||||
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
||||
' $(INSTALL) $(I','NSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
|
||||
'endif'#010+
|
||||
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
|
||||
' $','(MKDIR) $(INSTALL_LIBDIR)'#010+
|
||||
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
|
||||
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
|
||||
'ifdef inUnix'#010+
|
||||
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
|
||||
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NA','ME)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
'ifdef INSTALL_FILES'#010+
|
||||
' $(MKDIR) $(INSTALL_DATADIR)'#010+
|
||||
' $(INS','TALL) $(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+
|
||||
'ifdef HASEXAMPLES'#010+
|
||||
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
|
||||
'endif'#010+
|
||||
'ifdef EXAMPLESOURCEFILES'#010+
|
||||
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010,
|
||||
'ifdef TARGET_EXAMPLEDIRS'#010+
|
||||
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTAL','L_'+
|
||||
'EXAMPLEDIR)'#010+
|
||||
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
|
||||
'AMPLEDIR)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'[distinstallrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Dist Install'#010+
|
||||
'#####################################################################'#010+
|
||||
'########################','############################################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_distinstall'#010+
|
||||
#010+
|
||||
'fpc_distinstall: in','stall exampleinstall'#010+
|
||||
'fpc_distinstall: install exampleinstall'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[zipinstallrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Zip'#010+
|
||||
'#####################################################################'#010+
|
||||
'################################','####################################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipe','xampleinstall'#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+
|
||||
'ifndef PACKDIR'#010+
|
||||
'ifndef PA','CKDIR'#010+
|
||||
'ifndef inUnix'#010+
|
||||
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
|
||||
'else'#010+
|
||||
'PACKDIR=/tmp/fpc-pack'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010,
|
||||
#010+
|
||||
'# Maybe create default zipname from 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)$(Z','IPSUFFIX)'#010+
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# ZipTarget'#010+
|
||||
'ifndef ZIPTARGET'#010+
|
||||
'ifdef DIST_ZIPTARGET'#010+
|
||||
'ZIPTARGET=DIST_ZIP','TARGET'#010+
|
||||
'ZIPTARGET=DIST_ZIPTARGET'#010+
|
||||
'else'#010+
|
||||
'ZIPTARGET=install'#010+
|
||||
'endif'#010+
|
||||
@ -1131,98 +1137,99 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
'endif'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Use a wrapper script by default for Os/2'#010+
|
||||
'# Use a wrapper script b','y default for Os/2'#010+
|
||||
'ifndef inUnix'#010+
|
||||
'USEZIPWRAPPER=1'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# We need to be able to run in the ','current OS so fix'#010+
|
||||
'# We need to be able to run in the current OS so fix'#010+
|
||||
'# the path separator'#010+
|
||||
'ifdef USEZIPWRAPPER'#010+
|
||||
'ZIPPATHSEP=$(PATHSEP)'#010+
|
||||
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(BATCHEXT))'#010+
|
||||
'else'#010+
|
||||
'e','lse'#010+
|
||||
'ZIPPATHSEP=/'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'# Create commands to create the zip/tar file'#010+
|
||||
'ZIPCMD_CDPACK:=cd $(su','bst /,$(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+
|
||||
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
||||
'Z','IPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
|
||||
'else'#010+
|
||||
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPN','AME)$(ZIPEXT)'#010+
|
||||
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
|
||||
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
|
||||
'TFILE) *'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_zipinstall:'#010+
|
||||
' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
||||
' $(MAKE) $(ZIPTARGET) INST','ALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
|
||||
' $(MKDIR) $(DIST_DESTDIR)'#010+
|
||||
' $(DEL) $(ZIPDES','TFILE)'#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))" > $(ZIPWRAPPE'+
|
||||
'R)'#010+
|
||||
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(','ZIPWRAPPE'+
|
||||
'R)'#010+
|
||||
' $(ECHOREDIR) -e "$(subst \,\\,$(Z','IPCMD_CDPACK))" > $(ZIPWRAP'+
|
||||
'PER)'#010+
|
||||
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
|
||||
#010+
|
||||
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
|
||||
'ER)'#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+
|
||||
'ifdef inUnix'#010+
|
||||
' /bin/sh $(ZIPWRAPPER)'#010+
|
||||
'else'#010+
|
||||
' $(ZIPWRAPPER)'#010+
|
||||
'endif'#010+
|
||||
' $(DEL) $(ZIPWRAPPER)'#010+
|
||||
'else'#010+
|
||||
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
|
||||
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(','ZIPCMD_CDBASE)'#010+
|
||||
'endif'#010+
|
||||
' $(DELTREE) $(PACKDIR)'#010+
|
||||
#010+
|
||||
'fpc_zipsourceinstall:'#010+
|
||||
' $(MAKE) f','pc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'+
|
||||
#010+
|
||||
' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+
|
||||
#010+
|
||||
'fpc_zipexampleinstall:'#010+
|
||||
'ifdef HASEXAMPLES'#010+
|
||||
' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+
|
||||
' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall',' ZIPSUFFIX=ex'+
|
||||
'm'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_zipdistinstall:'#010+
|
||||
' $(MAKE) fpc_zipinstall ZIPTARGET=distinst','all'#010+
|
||||
' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[cleanrules]'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Clean rules'#010+
|
||||
'#####################################################################'#010+
|
||||
'##############################################','######################'+
|
||||
'#'#010+
|
||||
#010+
|
||||
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
|
||||
#010+
|
||||
'ifdef EXEFILES'#010+
|
||||
'overr','ide CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
|
||||
'ES))'#010+
|
||||
'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_UN','ITS))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'ifdef CLEANPPUFILES'#010+
|
||||
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CL','EANPPUFILE'+
|
||||
'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
|
||||
'(CLEANPPUFILES)))'#010+
|
||||
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
|
||||
'ILES))'#010+
|
||||
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDI','RPR'+
|
||||
'EFIX),$(CLEANPPULINKFILES)))'#010+
|
||||
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
|
||||
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
|
||||
'LEANPPUFILES)))'#010+
|
||||
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIR','PREFIX),$(CLEANPP'+
|
||||
'UFILES))'#010+
|
||||
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
|
||||
'IX),$(CLEANPPULINKFILES)))'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_clean: $(CLEANTARGET)'#010+
|
||||
@ -1230,48 +1237,47 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
' -$(DEL) $(CLEANEXEFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifdef CLEANPPUFILES'#010+
|
||||
' -$(DEL) $(CLEANPPUFILES)'#010+
|
||||
' ',' -$(DEL) $(CLEANPPUFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifneq ($(CLEANPPULINKFILES),)'#010+
|
||||
' -$(DEL) $(CLEANPPUL','INKFILES)'#010+
|
||||
' -$(DEL) $(CLEANPPULINKFILES)'#010+
|
||||
'endif'#010+
|
||||
'ifdef CLEANRSTFILES'#010+
|
||||
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
|
||||
'endif'#010+
|
||||
'ifdef CLEAN_FILES'#010+
|
||||
' -$(DEL) $(CLEAN_FILES)'#010+
|
||||
' -$(DEL) $(CL','EAN_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) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
|
||||
'PCEXTFILE) $(REDIRFILE)'#010+
|
||||
#010+
|
||||
'fpc_distclean: clean'#010+
|
||||
#010+
|
||||
'# Also run clean first if targetdir is set. Unittargetdir is always'#010+
|
||||
'# Also run clean first if targetdir is se','t. Unittargetdir is always'#010+
|
||||
'# set if targetdir or unittargetdir is specified'#010+
|
||||
'ifdef COMPILER_','UNITTARGETDIR'#010+
|
||||
'ifdef COMPILER_UNITTARGETDIR'#010+
|
||||
'TARGETDIRCLEAN=fpc_clean'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+
|
||||
'ifdef CLEANEXEFILES'#010+
|
||||
' -$(DEL) $(CLEANEXEFILES)'#010+
|
||||
'endif'#010+
|
||||
'end','if'#010+
|
||||
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
|
||||
'EXT) *$(SHAREDLIBE','XT) *$(PPLEXT)'#010+
|
||||
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
|
||||
' -$(DELTREE) *$(SMARTEXT)'#010+
|
||||
' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
|
||||
#010+
|
||||
'ifdef AOUTEXT'#010+
|
||||
' -$(DEL) *$(AOUTEXT)'#010+
|
||||
' -$(DEL) ','*$(AOUTEXT)'#010+
|
||||
'endif'#010+
|
||||
#010+
|
||||
#010+
|
||||
'[inforules]'#010+
|
||||
'###########################################################','#########'+
|
||||
'#'#010+
|
||||
'#####################################################################'#010+
|
||||
'# Info rules'#010+
|
||||
'#####################################################################'#010+
|
||||
#010+
|
||||
@ -1279,91 +1285,90 @@ const fpcmakeini : array[0..127,1..240] of char=(
|
||||
#010+
|
||||
'fpc_info:'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Package info =='#010+
|
||||
' @','$(ECHO) == Package info =='#010+
|
||||
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
|
||||
' @$(','ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
||||
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Configuration info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) FPC.......... $(FPC)'#010+
|
||||
' @$(ECHO) FPC.......','... $(FPC)'#010+
|
||||
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
|
||||
' @$(ECHO) Source CPU... $','(CPU_SOURCE)'#010+
|
||||
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
|
||||
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
|
||||
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
|
||||
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
|
||||
' @$(ECHO) Target OS.... $(OS_TARGET)'#010,
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Directory info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) ','Basedir......... $(BASEDIR)'#010+
|
||||
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
|
||||
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
|
||||
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
|
||||
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
|
||||
' @$(ECHO) PackagesDir','..... $(PACKAGESDIR)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
|
||||
' ',' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
||||
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Tools info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Pwd....... $(PWD)'#010+
|
||||
' @$(ECHO) Pwd....... $(PWD)',#010+
|
||||
' @$(ECHO) Mv........ $(MVPROG)'#010+
|
||||
' @$(ECHO) Cp........ $(CPPROG)'#010+
|
||||
' @$(E','CHO) Rm........ $(RMPROG)'#010+
|
||||
' @$(ECHO) Rm........ $(RMPROG)'#010+
|
||||
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
|
||||
' @$(ECHO) Echo...... $(ECHO)'#010+
|
||||
' @$(ECHO) Date...... $(DATE)'#010+
|
||||
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
||||
' ',' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
|
||||
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
|
||||
' @$(ECHO) ','Upx....... $(UPXPROG)'#010+
|
||||
' @$(ECHO) Upx....... $(UPXPROG)'#010+
|
||||
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Object info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Target Loaders...... $(TARGET_LOADERS)'#010+
|
||||
' @$(ECHO) Target Units........ $(TARGET_UNI','TS)'#010+
|
||||
' @$(ECHO) ',' Target Loaders...... $(TARGET_LOADERS)'#010+
|
||||
' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+
|
||||
' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+
|
||||
' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+
|
||||
' @$(ECHO) Target Examples..... $(TARGET_EXAMPLES)'#010+
|
||||
' @$(ECHO) Target Examples','..... $(TARGET_EXAMPLES)'#010+
|
||||
' @$(ECHO) Target ExampleDirs.. $(TARGET_EXAMPLEDIRS)'#010+
|
||||
' ',' @$(ECHO)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
|
||||
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
|
||||
' @$(ECHO) Install Files....... $(INSTAL','L_FILES)'#010+
|
||||
' @$(E','CHO) Install Units....... $(INSTALL_UNITS)'#010+
|
||||
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) == Install info =='#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
|
||||
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
|
||||
' @$(ECHO) ','ZipPrefix............ $(ZIPPREFIX)'#010+
|
||||
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
|
||||
' ',' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
||||
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
|
||||
' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
|
||||
' @$(ECHO) Install library dir.. $(INSTA','LL_LIBDIR)'#010+
|
||||
' @$(ECH','O) 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 doc dir...... $(INSTALL_DOCDIR)'#010+
|
||||
' @$(ECHO) Install example dir.. $(INSTALL_E','XAMPLEDIR)'#010+
|
||||
' @$(ECHO) ','Install doc dir...... $(INSTALL_DOCDIR)'#010+
|
||||
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
|
||||
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
|
||||
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
|
||||
' ',' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
|
||||
' @$(ECHO)'#010+
|
||||
#010+
|
||||
'[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
|
||||
);
|
||||
|
||||
@ -611,9 +611,14 @@ ifdef inUnix
|
||||
ifndef GCCLIBDIR
|
||||
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
||||
endif
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
ifndef OTHERLIBDIR
|
||||
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_TARGET),netbsd)
|
||||
OTHERLIBDIR+=/usr/pkg/lib
|
||||
endif
|
||||
export GCCLIBDIR OTHERLIB
|
||||
endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user