mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-12-16 05:10:34 +01:00
* merged fixes
This commit is contained in:
peter
parent
00f34abe87
commit
982c0eb4e8
@ -1,12 +1,12 @@
|
||||
#
|
||||
# Makefile generated by fpcmake v1.00 [2000/09/02]
|
||||
# Makefile generated by fpcmake v1.00 [2000/09/16]
|
||||
#
|
||||
|
||||
defaultrule: all
|
||||
|
||||
#####################################################################
|
||||
# Autodetect OS (Linux or Dos or Windows NT)
|
||||
# define inlinux when running under linux
|
||||
# define inUnix when running under Unix (Linux,FreeBSD)
|
||||
# define inWinNT when running under WinNT
|
||||
#####################################################################
|
||||
|
||||
@ -23,22 +23,18 @@ nopwd:
|
||||
@echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo32.zip
|
||||
@exit
|
||||
else
|
||||
inlinux=1
|
||||
inUnix=1
|
||||
endif
|
||||
else
|
||||
PWD:=$(firstword $(PWD))
|
||||
endif
|
||||
|
||||
# Detect NT - NT sets OS to Windows_NT
|
||||
ifndef inlinux
|
||||
# Detect OS/2 - OS/2 has OS2_SHELL defined
|
||||
ifndef inUnix
|
||||
ifeq ($(OS),Windows_NT)
|
||||
inWinNT=1
|
||||
endif
|
||||
endif
|
||||
|
||||
# Detect OS/2 - OS/2 has OS2_SHELL defined
|
||||
ifndef inlinux
|
||||
ifndef inWinNT
|
||||
else
|
||||
ifdef OS2_SHELL
|
||||
inOS2=1
|
||||
endif
|
||||
@ -46,14 +42,14 @@ endif
|
||||
endif
|
||||
|
||||
# The extension of executables
|
||||
ifdef inlinux
|
||||
EXEEXT=
|
||||
ifdef inUnix
|
||||
SRCEXEEXT=
|
||||
else
|
||||
EXEEXT=.exe
|
||||
SRCEXEEXT=.exe
|
||||
endif
|
||||
|
||||
# The path which is searched separated by spaces
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
SEARCHPATH=$(subst :, ,$(PATH))
|
||||
else
|
||||
SEARCHPATH=$(subst ;, ,$(PATH))
|
||||
@ -83,8 +79,8 @@ FPC=ppc386
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
override FPC:=$(subst $(EXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
|
||||
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
||||
|
||||
# Target OS
|
||||
ifndef OS_TARGET
|
||||
@ -190,7 +186,7 @@ endif
|
||||
|
||||
# Detect FPCDIR
|
||||
ifeq ($(FPCDIR),wrong)
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
|
||||
ifeq ($(wildcard $(FPCDIR)/units),)
|
||||
override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
|
||||
@ -277,10 +273,6 @@ override LOCALDEF+=-dGDB -dBROWSERLOG
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
# also insert MMX support
|
||||
override LOCALDEF+=-dSUPPORT_MMX
|
||||
# We don't need the intel writer on linux...
|
||||
ifdef inlinux
|
||||
override LOCALDEF+=-dNOAG386INT
|
||||
endif
|
||||
endif
|
||||
|
||||
override LOCALOPT+=$(LOCALDEF)
|
||||
@ -295,7 +287,7 @@ override FPCOPT+=$(LOCALOPT)
|
||||
ifndef ECHO
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ECHO),)
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ECHO),)
|
||||
ECHO:=echo
|
||||
ECHOE:=echo
|
||||
@ -336,7 +328,7 @@ endif
|
||||
|
||||
# To install files
|
||||
ifndef INSTALL
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
INSTALL:=install -m 644
|
||||
else
|
||||
INSTALL:=$(COPY)
|
||||
@ -345,7 +337,7 @@ endif
|
||||
|
||||
# To install programs
|
||||
ifndef INSTALLEXE
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
INSTALLEXE:=install -m 755
|
||||
else
|
||||
INSTALLEXE:=$(COPY)
|
||||
@ -354,7 +346,7 @@ endif
|
||||
|
||||
# To make a directory.
|
||||
ifndef MKDIR
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
MKDIR:=install -m 755 -d
|
||||
else
|
||||
MKDIR:=ginstall -m 755 -d
|
||||
@ -378,7 +370,7 @@ LD=ld
|
||||
endif
|
||||
|
||||
# ppas.bat / ppas.sh
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
PPAS=ppas.sh
|
||||
else
|
||||
ifdef inOS2
|
||||
@ -389,7 +381,7 @@ endif
|
||||
endif
|
||||
|
||||
# ldconfig to rebuild .so cache
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
LDCONFIG=ldconfig
|
||||
else
|
||||
LDCONFIG=
|
||||
@ -397,7 +389,7 @@ endif
|
||||
|
||||
# ppumove
|
||||
ifndef PPUMOVE
|
||||
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
|
||||
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(PPUMOVE),)
|
||||
PPUMOVE=
|
||||
else
|
||||
@ -408,7 +400,7 @@ export PPUMOVE
|
||||
|
||||
# ppufiles
|
||||
ifndef PPUFILES
|
||||
PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
|
||||
PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(PPUFILES),)
|
||||
PPUFILES=
|
||||
else
|
||||
@ -427,7 +419,7 @@ ifeq ($(OS_TARGET),win32)
|
||||
UPXPROG:=1
|
||||
endif
|
||||
ifdef UPXPROG
|
||||
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
|
||||
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(UPXPROG),)
|
||||
UPXPROG=
|
||||
else
|
||||
@ -441,7 +433,7 @@ export UPXPROG
|
||||
|
||||
# cmp
|
||||
ifndef CMP
|
||||
CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))
|
||||
CMP:=$(strip $(wildcard $(addsuffix /cmp$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(CMP),)
|
||||
CMP=
|
||||
else
|
||||
@ -452,7 +444,7 @@ export CMP
|
||||
|
||||
# diff
|
||||
ifndef DIFF
|
||||
DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))
|
||||
DIFF:=$(strip $(wildcard $(addsuffix /diff$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(DIFF),)
|
||||
DIFF=
|
||||
else
|
||||
@ -463,9 +455,9 @@ export DIFF
|
||||
|
||||
# gdate/date
|
||||
ifndef DATE
|
||||
DATE:=$(strip $(wildcard $(addsuffix /date$(EXEEXT),$(SEARCHPATH))))
|
||||
DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(DATE),)
|
||||
DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))
|
||||
DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH))))
|
||||
ifeq ($(DATE),)
|
||||
DATE=
|
||||
else
|
||||
@ -485,7 +477,7 @@ endif
|
||||
|
||||
# ZipProg, you can't use Zip as the var name (PFV)
|
||||
ifndef ZIPPROG
|
||||
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
|
||||
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ZIPPROG),)
|
||||
ZIPPROG=
|
||||
else
|
||||
@ -499,7 +491,7 @@ ZIPEXT=.zip
|
||||
|
||||
# Tar
|
||||
ifndef TARPROG
|
||||
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH))))
|
||||
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(TARPROG),)
|
||||
TARPROG=
|
||||
else
|
||||
@ -522,6 +514,7 @@ endif
|
||||
|
||||
# Default needed extensions (Go32v2,Linux)
|
||||
LOADEREXT=.as
|
||||
EXEEXT=.exe
|
||||
PPLEXT=.ppl
|
||||
PPUEXT=.ppu
|
||||
OEXT=.o
|
||||
@ -550,9 +543,18 @@ endif
|
||||
|
||||
# Linux
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.lnx
|
||||
endif
|
||||
|
||||
# Linux
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.freebsd
|
||||
endif
|
||||
|
||||
# Win32
|
||||
ifeq ($(OS_TARGET),win32)
|
||||
PPUEXT=.ppw
|
||||
@ -653,9 +655,17 @@ endif
|
||||
# Default Directories
|
||||
#####################################################################
|
||||
|
||||
# Linux and freebsd use unix dirs with /usr/bin, /usr/lib
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
UNIXINSTALLDIR=1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
UNIXINSTALLDIR=1
|
||||
endif
|
||||
|
||||
# set the prefix directory where to install everything
|
||||
ifndef PREFIXINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
PREFIXINSTALLDIR=/usr
|
||||
else
|
||||
PREFIXINSTALLDIR=/pp
|
||||
@ -675,7 +685,7 @@ export DESTZIPDIR
|
||||
|
||||
# set the base directory where to install everything
|
||||
ifndef BASEINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)
|
||||
else
|
||||
BASEINSTALLDIR=$(PREFIXINSTALLDIR)
|
||||
@ -684,7 +694,7 @@ endif
|
||||
|
||||
# set the directory where to install the binaries
|
||||
ifndef BININSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
BININSTALLDIR=$(PREFIXINSTALLDIR)/bin
|
||||
else
|
||||
BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)
|
||||
@ -701,7 +711,7 @@ endif
|
||||
|
||||
# Where to install shared libraries
|
||||
ifndef LIBINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib
|
||||
else
|
||||
LIBINSTALLDIR=$(UNITINSTALLDIR)
|
||||
@ -710,7 +720,7 @@ endif
|
||||
|
||||
# Where the source files will be stored
|
||||
ifndef SOURCEINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)
|
||||
else
|
||||
SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source
|
||||
@ -722,7 +732,7 @@ endif
|
||||
|
||||
# Where the doc files will be stored
|
||||
ifndef DOCINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)
|
||||
else
|
||||
DOCINSTALLDIR=$(BASEINSTALLDIR)/doc
|
||||
@ -732,7 +742,7 @@ endif
|
||||
# Where to install the examples, under linux we use the doc dir
|
||||
# because the copytree command will create a subdir itself
|
||||
ifndef EXAMPLEINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
EXAMPLEINSTALLDIR=$(DOCINSTALLDIR)/examples
|
||||
else
|
||||
EXAMPLEINSTALLDIR=$(BASEINSTALLDIR)/examples
|
||||
@ -756,7 +766,7 @@ REDIRFILE=log
|
||||
endif
|
||||
|
||||
ifdef REDIR
|
||||
ifndef inlinux
|
||||
ifndef inUnix
|
||||
override FPC=redir -eo $(FPC)
|
||||
endif
|
||||
# set the verbosity to max
|
||||
@ -996,7 +1006,7 @@ fpc_smart:
|
||||
$(MAKE) all LINKSMART=1 CREATESMART=1
|
||||
|
||||
fpc_shared: all
|
||||
ifdef inlinux
|
||||
ifdef HASSHAREDLIB
|
||||
ifndef LIBNAME
|
||||
@$(ECHO) "LIBNAME not set"
|
||||
else
|
||||
@ -1041,7 +1051,7 @@ ifneq ($(INSTALLPPULINKFILES),)
|
||||
endif
|
||||
ifneq ($(wildcard $(LIBFULLNAME)),)
|
||||
@$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
|
||||
ifdef inlinux
|
||||
ifdef HASSHAREDLIB
|
||||
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
|
||||
endif
|
||||
endif
|
||||
@ -1069,7 +1079,7 @@ endif
|
||||
ifneq ($(wildcard $(LIBFULLNAME)),)
|
||||
$(MKDIR) $(LIBINSTALLDIR)
|
||||
$(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
|
||||
endif
|
||||
endif
|
||||
@ -1130,7 +1140,7 @@ endif
|
||||
|
||||
# Temporary path to pack a file
|
||||
ifndef PACKDIR
|
||||
ifndef inlinux
|
||||
ifndef inUnix
|
||||
PACKDIR=$(BASEDIR)/pack_tmp
|
||||
else
|
||||
PACKDIR=/tmp/fpc-pack
|
||||
@ -1146,7 +1156,7 @@ endif
|
||||
|
||||
# Use tar by default under linux
|
||||
ifndef USEZIP
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
USETAR=1
|
||||
endif
|
||||
endif
|
||||
@ -1505,7 +1515,7 @@ MSGINSTALLDIR=$(BASEINSTALLDIR)/msg
|
||||
|
||||
# This will only install the ppc386.exe, not the message files etc.
|
||||
quickinstall:
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
$(MKDIR) $(BASEINSTALLDIR)
|
||||
$(INSTALLEXE) $(EXENAME) $(BASEINSTALLDIR)
|
||||
else
|
||||
@ -1517,7 +1527,7 @@ endif
|
||||
endif
|
||||
|
||||
install: quickinstall
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
$(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(BASEINSTALLDIR)/samplecfg
|
||||
endif
|
||||
$(MKDIR) $(MSGINSTALLDIR)
|
||||
@ -1525,7 +1535,7 @@ endif
|
||||
|
||||
# this also installs the link /usr/bin/ppc386. The .deb does that later
|
||||
installsymlink: install
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
$(MKDIR) $(BININSTALLDIR)
|
||||
ln -sf $(BASEINSTALLDIR)/ppc386 $(BININSTALLDIR)/ppc386
|
||||
endif
|
||||
|
||||
@ -80,10 +80,6 @@ override LOCALDEF+=-dGDB -dBROWSERLOG
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
# also insert MMX support
|
||||
override LOCALDEF+=-dSUPPORT_MMX
|
||||
# We don't need the intel writer on linux...
|
||||
ifdef inlinux
|
||||
override LOCALDEF+=-dNOAG386INT
|
||||
endif
|
||||
endif
|
||||
|
||||
override LOCALOPT+=$(LOCALDEF)
|
||||
@ -288,7 +284,7 @@ MSGINSTALLDIR=$(BASEINSTALLDIR)/msg
|
||||
|
||||
# This will only install the ppc386.exe, not the message files etc.
|
||||
quickinstall:
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
$(MKDIR) $(BASEINSTALLDIR)
|
||||
$(INSTALLEXE) $(EXENAME) $(BASEINSTALLDIR)
|
||||
else
|
||||
@ -300,7 +296,7 @@ endif
|
||||
endif
|
||||
|
||||
install: quickinstall
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
$(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(BASEINSTALLDIR)/samplecfg
|
||||
endif
|
||||
$(MKDIR) $(MSGINSTALLDIR)
|
||||
@ -308,7 +304,7 @@ endif
|
||||
|
||||
# this also installs the link /usr/bin/ppc386. The .deb does that later
|
||||
installsymlink: install
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
$(MKDIR) $(BININSTALLDIR)
|
||||
ln -sf $(BASEINSTALLDIR)/ppc386 $(BININSTALLDIR)/ppc386
|
||||
endif
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
#
|
||||
# Makefile generated by fpcmake v1.00 [2000/09/01]
|
||||
# Makefile generated by fpcmake v1.00 [2000/09/16]
|
||||
#
|
||||
|
||||
defaultrule: all
|
||||
|
||||
#####################################################################
|
||||
# Autodetect OS (Linux or Dos or Windows NT)
|
||||
# define inlinux when running under linux
|
||||
# define inUnix when running under Unix (Linux,FreeBSD)
|
||||
# define inWinNT when running under WinNT
|
||||
#####################################################################
|
||||
|
||||
@ -23,22 +23,18 @@ nopwd:
|
||||
@echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo32.zip
|
||||
@exit
|
||||
else
|
||||
inlinux=1
|
||||
inUnix=1
|
||||
endif
|
||||
else
|
||||
PWD:=$(firstword $(PWD))
|
||||
endif
|
||||
|
||||
# Detect NT - NT sets OS to Windows_NT
|
||||
ifndef inlinux
|
||||
# Detect OS/2 - OS/2 has OS2_SHELL defined
|
||||
ifndef inUnix
|
||||
ifeq ($(OS),Windows_NT)
|
||||
inWinNT=1
|
||||
endif
|
||||
endif
|
||||
|
||||
# Detect OS/2 - OS/2 has OS2_SHELL defined
|
||||
ifndef inlinux
|
||||
ifndef inWinNT
|
||||
else
|
||||
ifdef OS2_SHELL
|
||||
inOS2=1
|
||||
endif
|
||||
@ -46,14 +42,14 @@ endif
|
||||
endif
|
||||
|
||||
# The extension of executables
|
||||
ifdef inlinux
|
||||
EXEEXT=
|
||||
ifdef inUnix
|
||||
SRCEXEEXT=
|
||||
else
|
||||
EXEEXT=.exe
|
||||
SRCEXEEXT=.exe
|
||||
endif
|
||||
|
||||
# The path which is searched separated by spaces
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
SEARCHPATH=$(subst :, ,$(PATH))
|
||||
else
|
||||
SEARCHPATH=$(subst ;, ,$(PATH))
|
||||
@ -83,8 +79,8 @@ FPC=ppc386
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
override FPC:=$(subst $(EXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
|
||||
override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
|
||||
|
||||
# Target OS
|
||||
ifndef OS_TARGET
|
||||
@ -113,15 +109,6 @@ endif
|
||||
|
||||
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
|
||||
|
||||
#####################################################################
|
||||
# Pre Settings
|
||||
#####################################################################
|
||||
|
||||
ifdef inlinux
|
||||
CODPATH=$(PREFIXINSTALLDIR)/lib/fpc/lexyacc
|
||||
else
|
||||
CODPATH=$(BININSTALLDIR)
|
||||
endif
|
||||
#####################################################################
|
||||
# FPCDIR Setting
|
||||
#####################################################################
|
||||
@ -150,7 +137,7 @@ endif
|
||||
|
||||
# Detect FPCDIR
|
||||
ifeq ($(FPCDIR),wrong)
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)
|
||||
ifeq ($(wildcard $(FPCDIR)/units),)
|
||||
override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)
|
||||
@ -202,8 +189,6 @@ override EXTRACLEANUNITS+=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs
|
||||
|
||||
# Install
|
||||
|
||||
override EXTRAINSTALLFILES+=yylex.cod yyparse.cod
|
||||
DATAINSTALLDIR=$(CODPATH)
|
||||
ZIPTARGET=install
|
||||
|
||||
# Defaults
|
||||
@ -232,7 +217,7 @@ INFOTARGET=fpc_infocfg fpc_infoobjects fpc_infoinstall
|
||||
ifndef ECHO
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ECHO),)
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
|
||||
ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ECHO),)
|
||||
ECHO:=echo
|
||||
ECHOE:=echo
|
||||
@ -273,7 +258,7 @@ endif
|
||||
|
||||
# To install files
|
||||
ifndef INSTALL
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
INSTALL:=install -m 644
|
||||
else
|
||||
INSTALL:=$(COPY)
|
||||
@ -282,7 +267,7 @@ endif
|
||||
|
||||
# To install programs
|
||||
ifndef INSTALLEXE
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
INSTALLEXE:=install -m 755
|
||||
else
|
||||
INSTALLEXE:=$(COPY)
|
||||
@ -291,7 +276,7 @@ endif
|
||||
|
||||
# To make a directory.
|
||||
ifndef MKDIR
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
MKDIR:=install -m 755 -d
|
||||
else
|
||||
MKDIR:=ginstall -m 755 -d
|
||||
@ -315,7 +300,7 @@ LD=ld
|
||||
endif
|
||||
|
||||
# ppas.bat / ppas.sh
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
PPAS=ppas.sh
|
||||
else
|
||||
ifdef inOS2
|
||||
@ -326,7 +311,7 @@ endif
|
||||
endif
|
||||
|
||||
# ldconfig to rebuild .so cache
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
LDCONFIG=ldconfig
|
||||
else
|
||||
LDCONFIG=
|
||||
@ -334,7 +319,7 @@ endif
|
||||
|
||||
# ppumove
|
||||
ifndef PPUMOVE
|
||||
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH))))
|
||||
PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(PPUMOVE),)
|
||||
PPUMOVE=
|
||||
else
|
||||
@ -345,7 +330,7 @@ export PPUMOVE
|
||||
|
||||
# ppufiles
|
||||
ifndef PPUFILES
|
||||
PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPATH))))
|
||||
PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(PPUFILES),)
|
||||
PPUFILES=
|
||||
else
|
||||
@ -364,7 +349,7 @@ ifeq ($(OS_TARGET),win32)
|
||||
UPXPROG:=1
|
||||
endif
|
||||
ifdef UPXPROG
|
||||
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))
|
||||
UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(UPXPROG),)
|
||||
UPXPROG=
|
||||
else
|
||||
@ -378,7 +363,7 @@ export UPXPROG
|
||||
|
||||
# ZipProg, you can't use Zip as the var name (PFV)
|
||||
ifndef ZIPPROG
|
||||
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
|
||||
ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ZIPPROG),)
|
||||
ZIPPROG=
|
||||
else
|
||||
@ -392,7 +377,7 @@ ZIPEXT=.zip
|
||||
|
||||
# Tar
|
||||
ifndef TARPROG
|
||||
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH))))
|
||||
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(TARPROG),)
|
||||
TARPROG=
|
||||
else
|
||||
@ -415,6 +400,7 @@ endif
|
||||
|
||||
# Default needed extensions (Go32v2,Linux)
|
||||
LOADEREXT=.as
|
||||
EXEEXT=.exe
|
||||
PPLEXT=.ppl
|
||||
PPUEXT=.ppu
|
||||
OEXT=.o
|
||||
@ -443,9 +429,18 @@ endif
|
||||
|
||||
# Linux
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.lnx
|
||||
endif
|
||||
|
||||
# Linux
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
EXEEXT=
|
||||
HASSHAREDLIB=1
|
||||
FPCMADE=fpcmade.freebsd
|
||||
endif
|
||||
|
||||
# Win32
|
||||
ifeq ($(OS_TARGET),win32)
|
||||
PPUEXT=.ppw
|
||||
@ -546,9 +541,17 @@ endif
|
||||
# Default Directories
|
||||
#####################################################################
|
||||
|
||||
# Linux and freebsd use unix dirs with /usr/bin, /usr/lib
|
||||
ifeq ($(OS_TARGET),linux)
|
||||
UNIXINSTALLDIR=1
|
||||
endif
|
||||
ifeq ($(OS_TARGET),freebsd)
|
||||
UNIXINSTALLDIR=1
|
||||
endif
|
||||
|
||||
# set the prefix directory where to install everything
|
||||
ifndef PREFIXINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
PREFIXINSTALLDIR=/usr
|
||||
else
|
||||
PREFIXINSTALLDIR=/pp
|
||||
@ -568,7 +571,7 @@ export DESTZIPDIR
|
||||
|
||||
# set the base directory where to install everything
|
||||
ifndef BASEINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)
|
||||
else
|
||||
BASEINSTALLDIR=$(PREFIXINSTALLDIR)
|
||||
@ -577,7 +580,7 @@ endif
|
||||
|
||||
# set the directory where to install the binaries
|
||||
ifndef BININSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
BININSTALLDIR=$(PREFIXINSTALLDIR)/bin
|
||||
else
|
||||
BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)
|
||||
@ -594,7 +597,7 @@ endif
|
||||
|
||||
# Where to install shared libraries
|
||||
ifndef LIBINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib
|
||||
else
|
||||
LIBINSTALLDIR=$(UNITINSTALLDIR)
|
||||
@ -603,7 +606,7 @@ endif
|
||||
|
||||
# Where the source files will be stored
|
||||
ifndef SOURCEINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)
|
||||
else
|
||||
SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source
|
||||
@ -615,7 +618,7 @@ endif
|
||||
|
||||
# Where the doc files will be stored
|
||||
ifndef DOCINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)
|
||||
else
|
||||
DOCINSTALLDIR=$(BASEINSTALLDIR)/doc
|
||||
@ -625,7 +628,7 @@ endif
|
||||
# Where to install the examples, under linux we use the doc dir
|
||||
# because the copytree command will create a subdir itself
|
||||
ifndef EXAMPLEINSTALLDIR
|
||||
ifdef inlinux
|
||||
ifdef UNIXINSTALLDIR
|
||||
EXAMPLEINSTALLDIR=$(DOCINSTALLDIR)/examples
|
||||
else
|
||||
EXAMPLEINSTALLDIR=$(BASEINSTALLDIR)/examples
|
||||
@ -649,7 +652,7 @@ REDIRFILE=log
|
||||
endif
|
||||
|
||||
ifdef REDIR
|
||||
ifndef inlinux
|
||||
ifndef inUnix
|
||||
override FPC=redir -eo $(FPC)
|
||||
endif
|
||||
# set the verbosity to max
|
||||
@ -813,8 +816,6 @@ shared: fpc_shared
|
||||
|
||||
showinstall: fpc_showinstall
|
||||
|
||||
install: fpc_install
|
||||
|
||||
sourceinstall: fpc_sourceinstall
|
||||
|
||||
exampleinstall: fpc_exampleinstall
|
||||
@ -833,7 +834,7 @@ cleanall: fpc_cleanall
|
||||
|
||||
info: fpc_info
|
||||
|
||||
.PHONY: all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall clean distclean cleanall info
|
||||
.PHONY: all debug smart shared showinstall sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall clean distclean cleanall info
|
||||
|
||||
#####################################################################
|
||||
# Units
|
||||
@ -928,7 +929,7 @@ fpc_smart:
|
||||
$(MAKE) all LINKSMART=1 CREATESMART=1
|
||||
|
||||
fpc_shared: all
|
||||
ifdef inlinux
|
||||
ifdef HASSHAREDLIB
|
||||
ifndef LIBNAME
|
||||
@$(ECHO) "LIBNAME not set"
|
||||
else
|
||||
@ -973,7 +974,7 @@ ifneq ($(INSTALLPPULINKFILES),)
|
||||
endif
|
||||
ifneq ($(wildcard $(LIBFULLNAME)),)
|
||||
@$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
|
||||
ifdef inlinux
|
||||
ifdef HASSHAREDLIB
|
||||
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
|
||||
endif
|
||||
endif
|
||||
@ -1001,7 +1002,7 @@ endif
|
||||
ifneq ($(wildcard $(LIBFULLNAME)),)
|
||||
$(MKDIR) $(LIBINSTALLDIR)
|
||||
$(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
|
||||
endif
|
||||
endif
|
||||
@ -1062,7 +1063,7 @@ endif
|
||||
|
||||
# Temporary path to pack a file
|
||||
ifndef PACKDIR
|
||||
ifndef inlinux
|
||||
ifndef inUnix
|
||||
PACKDIR=$(BASEDIR)/pack_tmp
|
||||
else
|
||||
PACKDIR=/tmp/fpc-pack
|
||||
@ -1078,7 +1079,7 @@ endif
|
||||
|
||||
# Use tar by default under linux
|
||||
ifndef USEZIP
|
||||
ifdef inlinux
|
||||
ifdef inUnix
|
||||
USETAR=1
|
||||
endif
|
||||
endif
|
||||
@ -1156,7 +1157,7 @@ fpc_distclean: fpc_clean
|
||||
# Also run clean first if targetdir is set. Unittargetdir is always
|
||||
# set if targetdir or unittargetdir is specified
|
||||
ifdef UNITTARGETDIR
|
||||
TARGETDIRCLEAN=clean
|
||||
TARGETDIRCLEAN=fpc_clean
|
||||
endif
|
||||
|
||||
fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)
|
||||
@ -1250,3 +1251,13 @@ plex$(EXEEXT): plex$(PASEXT) $(wildcard lex*$(PASEXT))
|
||||
lexlib$(PPUEXT): lexlib$(PASEXT)
|
||||
|
||||
yacclib$(PPUEXT): yacclib$(PASEXT)
|
||||
|
||||
ifdef UNIXINSTALLDIR
|
||||
CODPATH=$(PREFIXINSTALLDIR)/lib/fpc/lexyacc
|
||||
else
|
||||
CODPATH=$(BININSTALLDIR)
|
||||
endif
|
||||
|
||||
install: fpc_install
|
||||
$(MKDIR) $(CODPATH)
|
||||
$(COPY) yylex.cod yyparse.cod $(CODPATH)
|
||||
|
||||
@ -10,10 +10,6 @@ units=lexlib yacclib
|
||||
units=lexbase lexopt lexdfa lexpos lexlist lexrules lexmsgs lextable \
|
||||
yaccbase yaccmsgs yaccclos yaccpars yacclook yaccsem yacclr0 yacctabl
|
||||
|
||||
[install]
|
||||
files=yylex.cod yyparse.cod
|
||||
datadir=$(CODPATH)
|
||||
|
||||
[dirs]
|
||||
fpcdir=../..
|
||||
|
||||
@ -21,14 +17,6 @@ fpcdir=../..
|
||||
options=-Sg
|
||||
|
||||
|
||||
[presettings]
|
||||
ifdef inlinux
|
||||
CODPATH=$(PREFIXINSTALLDIR)/lib/fpc/lexyacc
|
||||
else
|
||||
CODPATH=$(BININSTALLDIR)
|
||||
endif
|
||||
|
||||
|
||||
[rules]
|
||||
pyacc$(EXEEXT): pyacc$(PASEXT) $(wildcard yacc*$(PASEXT))
|
||||
$(COMPILER) pyacc$(PASEXT) $(REDIR)
|
||||
@ -39,3 +27,13 @@ plex$(EXEEXT): plex$(PASEXT) $(wildcard lex*$(PASEXT))
|
||||
lexlib$(PPUEXT): lexlib$(PASEXT)
|
||||
|
||||
yacclib$(PPUEXT): yacclib$(PASEXT)
|
||||
|
||||
ifdef UNIXINSTALLDIR
|
||||
CODPATH=$(PREFIXINSTALLDIR)/lib/fpc/lexyacc
|
||||
else
|
||||
CODPATH=$(BININSTALLDIR)
|
||||
endif
|
||||
|
||||
install: fpc_install
|
||||
$(MKDIR) $(CODPATH)
|
||||
$(COPY) yylex.cod yyparse.cod $(CODPATH)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user