mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-10-15 23:27:09 +02:00
* Move grab_vcsa to utils
git-svn-id: trunk@1946 -
This commit is contained in:
daniel
parent
abd29e02d9
commit
178b756607
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -3857,7 +3857,6 @@ rtl/linux/errno.inc svneol=native#text/plain
|
||||
rtl/linux/fpcylix.pp svneol=native#text/plain
|
||||
rtl/linux/fpmake.inc svneol=native#text/plain
|
||||
rtl/linux/gpm.pp svneol=native#text/plain
|
||||
rtl/linux/grab_vcsa.pp -text
|
||||
rtl/linux/i386/bsyscall.inc svneol=native#text/plain
|
||||
rtl/linux/i386/cprt0.as -text
|
||||
rtl/linux/i386/cprt21.as -text
|
||||
@ -6790,6 +6789,7 @@ utils/fprcp/expr.pp svneol=native#text/plain
|
||||
utils/fprcp/fprcp.pp svneol=native#text/plain
|
||||
utils/fprcp/pasprep.pp svneol=native#text/plain
|
||||
utils/fprcp/use_demo.bat -text
|
||||
utils/grab_vcsa.pp -text
|
||||
utils/h2pas/Makefile svneol=native#text/plain
|
||||
utils/h2pas/Makefile.fpc svneol=native#text/plain
|
||||
utils/h2pas/README -text
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/04]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/26]
|
||||
#
|
||||
default: all
|
||||
MAKEFILETARGETS=i386-linux m68k-linux powerpc-linux sparc-linux x86_64-linux arm-linux powerpc64-linux
|
||||
@ -238,7 +238,6 @@ INC=$(RTL)/inc
|
||||
COMMON=$(RTL)/common
|
||||
PROCINC=$(RTL)/$(CPU_TARGET)
|
||||
UNIXINC=$(RTL)/unix
|
||||
override FPCOPT+=-Fo$(COMPILER_UNITTARGETDIR)
|
||||
ifneq ($(CPU_TARGET),powerpc64)
|
||||
GGIGRAPH_UNIT=ggigraph
|
||||
else
|
||||
@ -273,27 +272,6 @@ ifndef USELIBGGI
|
||||
USELIBGGI=NO
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override TARGET_PROGRAMS+=grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes baseunix strings objpas macpas syscall unixutil heaptrc lineinfo $(LINUXUNIT1) termio unix $(LINUXUNIT2) initc cmem $(CPU_UNITS) crt printer $(GGIGRAPH_UNIT) sysutils typinfo math matrix varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst cthreads classes strutils rtlconsts dos objects cwstring fpcylix fpmkunit
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
@ -1334,23 +1312,6 @@ override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
|
||||
override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
|
||||
endif
|
||||
fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
|
||||
.PHONY: fpc_exes
|
||||
ifndef CROSSINSTALL
|
||||
ifneq ($(TARGET_PROGRAMS),)
|
||||
override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
|
||||
override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
|
||||
override ALLTARGET+=fpc_exes
|
||||
override INSTALLEXEFILES+=$(EXEFILES)
|
||||
override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
|
||||
ifeq ($(OS_TARGET),os2)
|
||||
override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
|
||||
endif
|
||||
ifeq ($(OS_TARGET),emx)
|
||||
override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)
|
||||
ifdef TARGET_RSTS
|
||||
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
|
||||
override CLEANRSTFILES+=$(RSTFILES)
|
||||
|
||||
@ -16,7 +16,6 @@ units=$(SYSTEMUNIT) unixtype ctypes baseunix strings objpas macpas syscall unixu
|
||||
errors sockets gpm ipc serial terminfo dl dynlibs \
|
||||
video mouse keyboard variants types dateutils sysconst \
|
||||
cthreads classes strutils rtlconsts dos objects cwstring fpcylix fpmkunit
|
||||
programs=grab_vcsa
|
||||
|
||||
rsts=math varutils typinfo variants sysconst rtlconsts fpmkunit
|
||||
|
||||
@ -55,9 +54,6 @@ COMMON=$(RTL)/common
|
||||
PROCINC=$(RTL)/$(CPU_TARGET)
|
||||
UNIXINC=$(RTL)/unix
|
||||
|
||||
# Hack to make grab_vcsa compile
|
||||
override FPCOPT+=-Fo$(COMPILER_UNITTARGETDIR)
|
||||
|
||||
ifneq ($(CPU_TARGET),powerpc64)
|
||||
GGIGRAPH_UNIT=ggigraph
|
||||
else
|
||||
|
||||
281
utils/Makefile
281
utils/Makefile
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/04]
|
||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/26]
|
||||
#
|
||||
default: all
|
||||
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
|
||||
@ -344,7 +344,7 @@ ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen fpdoc fpcres
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
@ -392,7 +392,7 @@ ifeq ($(FULL_TARGET),i386-wince)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
@ -413,7 +413,7 @@ ifeq ($(FULL_TARGET),m68k-palmos)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
@ -428,7 +428,7 @@ ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
@ -437,7 +437,7 @@ ifeq ($(FULL_TARGET),sparc-solaris)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
@ -446,13 +446,13 @@ ifeq ($(FULL_TARGET),x86_64-win64)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-wince)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc64-linux)
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32 grab_vcsa
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-linux)
|
||||
override TARGET_RSTS+=rstconv
|
||||
@ -870,37 +870,6 @@ endif
|
||||
else
|
||||
CROSSBINDIR=
|
||||
endif
|
||||
ifeq ($(OS_SOURCE),linux)
|
||||
ifndef GCCLIBDIR
|
||||
ifeq ($(CPU_TARGET),i386)
|
||||
ifneq ($(findstring x86_64,$(shell uname -a)),)
|
||||
ifeq ($(BINUTILSPREFIX),)
|
||||
GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(CPU_TARGET),powerpc64)
|
||||
ifeq ($(BINUTILSPREFIX),)
|
||||
GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifndef GCCLIBDIR
|
||||
CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
|
||||
ifneq ($(CROSSGCC),)
|
||||
GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
|
||||
endif
|
||||
endif
|
||||
ifndef OTHERLIBDIR
|
||||
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
||||
endif
|
||||
endif
|
||||
ifdef inUnix
|
||||
ifeq ($(OS_SOURCE),netbsd)
|
||||
OTHERLIBDIR+=/usr/pkg/lib
|
||||
endif
|
||||
export GCCLIBDIR OTHERLIB
|
||||
endif
|
||||
BATCHEXT=.bat
|
||||
LOADEREXT=.as
|
||||
EXEEXT=.exe
|
||||
@ -1446,11 +1415,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-go32v2)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1468,11 +1432,6 @@ REQUIRE_PACKAGES_PASZLIB=1
|
||||
REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-os2)
|
||||
@ -1493,11 +1452,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-beos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1516,11 +1470,6 @@ REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-solaris)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1557,11 +1506,6 @@ REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),i386-wdosx)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1617,11 +1561,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-freebsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1632,11 +1571,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-netbsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1646,11 +1580,6 @@ REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-amiga)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1678,11 +1607,6 @@ REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),m68k-palmos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1702,11 +1626,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-netbsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1716,11 +1635,6 @@ REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-macos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1740,11 +1654,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),powerpc-morphos)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1764,11 +1673,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-netbsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1778,11 +1682,6 @@ REQUIRE_PACKAGES_NETDB=1
|
||||
REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),sparc-solaris)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1802,11 +1701,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-freebsd)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1817,11 +1711,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),x86_64-win64)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1841,11 +1730,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifeq ($(FULL_TARGET),arm-wince)
|
||||
REQUIRE_PACKAGES_RTL=1
|
||||
@ -1865,11 +1749,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
|
||||
REQUIRE_PACKAGES_PTHREADS=1
|
||||
REQUIRE_PACKAGES_FCL=1
|
||||
REQUIRE_PACKAGES_PASJPEG=1
|
||||
REQUIRE_PACKAGES_IBASE=1
|
||||
REQUIRE_PACKAGES_POSTGRES=1
|
||||
REQUIRE_PACKAGES_MYSQL=1
|
||||
REQUIRE_PACKAGES_ODBC=1
|
||||
REQUIRE_PACKAGES_SQLITE=1
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_RTL
|
||||
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
@ -2079,136 +1958,6 @@ ifdef UNITDIR_PASJPEG
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_PASJPEG)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_IBASE
|
||||
PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_IBASE),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX)),)
|
||||
UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX)
|
||||
else
|
||||
UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_IBASE)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_IBASE=
|
||||
UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_IBASE),)
|
||||
UNITDIR_IBASE:=$(firstword $(UNITDIR_IBASE))
|
||||
else
|
||||
UNITDIR_IBASE=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_IBASE
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_POSTGRES
|
||||
PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_POSTGRES),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX)),)
|
||||
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX)
|
||||
else
|
||||
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_POSTGRES)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_POSTGRES)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_POSTGRES=
|
||||
UNITDIR_POSTGRES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /postgres/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_POSTGRES),)
|
||||
UNITDIR_POSTGRES:=$(firstword $(UNITDIR_POSTGRES))
|
||||
else
|
||||
UNITDIR_POSTGRES=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_POSTGRES
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_MYSQL
|
||||
PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_MYSQL),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX)),)
|
||||
UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX)
|
||||
else
|
||||
UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_MYSQL)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_MYSQL=
|
||||
UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_MYSQL),)
|
||||
UNITDIR_MYSQL:=$(firstword $(UNITDIR_MYSQL))
|
||||
else
|
||||
UNITDIR_MYSQL=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_MYSQL
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_MYSQL)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_ODBC
|
||||
PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_ODBC),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)),)
|
||||
UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)
|
||||
else
|
||||
UNITDIR_ODBC=$(PACKAGEDIR_ODBC)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_ODBC)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_ODBC)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_ODBC=
|
||||
UNITDIR_ODBC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /odbc/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_ODBC),)
|
||||
UNITDIR_ODBC:=$(firstword $(UNITDIR_ODBC))
|
||||
else
|
||||
UNITDIR_ODBC=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_ODBC
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_ODBC)
|
||||
endif
|
||||
endif
|
||||
ifdef REQUIRE_PACKAGES_SQLITE
|
||||
PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
|
||||
ifneq ($(PACKAGEDIR_SQLITE),)
|
||||
ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX)),)
|
||||
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX)
|
||||
else
|
||||
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)
|
||||
endif
|
||||
ifdef CHECKDEPEND
|
||||
$(PACKAGEDIR_SQLITE)/$(FPCMADE):
|
||||
$(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE)
|
||||
override ALLDEPENDENCIES+=$(PACKAGEDIR_SQLITE)/$(FPCMADE)
|
||||
endif
|
||||
else
|
||||
PACKAGEDIR_SQLITE=
|
||||
UNITDIR_SQLITE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Package.fpc,$(UNITSDIR)))))
|
||||
ifneq ($(UNITDIR_SQLITE),)
|
||||
UNITDIR_SQLITE:=$(firstword $(UNITDIR_SQLITE))
|
||||
else
|
||||
UNITDIR_SQLITE=
|
||||
endif
|
||||
endif
|
||||
ifdef UNITDIR_SQLITE
|
||||
override COMPILER_UNITDIR+=$(UNITDIR_SQLITE)
|
||||
endif
|
||||
endif
|
||||
ifndef NOCPUDEF
|
||||
override FPCOPTDEF=$(CPU_TARGET)
|
||||
endif
|
||||
@ -2316,12 +2065,6 @@ ifeq ($(FPC_VERSION),1.0.6)
|
||||
override FPCOPTDEF+=HASUNIX
|
||||
endif
|
||||
endif
|
||||
ifdef GCCLIBDIR
|
||||
override FPCOPT+=-Fl$(GCCLIBDIR)
|
||||
endif
|
||||
ifdef OTHERLIBDIR
|
||||
override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
|
||||
endif
|
||||
ifdef OPT
|
||||
override FPCOPT+=$(OPT)
|
||||
endif
|
||||
@ -2336,14 +2079,6 @@ override FPCEXTCMD:=$(FPCOPT)
|
||||
override FPCOPT:=!FPCEXTCMD
|
||||
export FPCEXTCMD
|
||||
endif
|
||||
override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
|
||||
override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
||||
ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
|
||||
override ACROSSCOMPILE=1
|
||||
endif
|
||||
ifdef ACROSSCOMPILE
|
||||
override FPCOPT+=$(CROSSOPT)
|
||||
endif
|
||||
override COMPILER:=$(FPC) $(FPCOPT)
|
||||
ifeq (,$(findstring -s ,$(COMPILER)))
|
||||
EXECPPAS=
|
||||
|
||||
@ -9,6 +9,7 @@ version=2.0.0
|
||||
[target]
|
||||
dirs=fpcm tply h2pas fprcp dxegen fpdoc
|
||||
programs=ppdep ptop rstconv data2inc delp bin2obj postw32
|
||||
programs_linux=grab_vcsa
|
||||
dirs_win32=fpmc fpcres
|
||||
dirs_linux=fpcres
|
||||
dirs_freebsd=fpcres
|
||||
|
||||
Loading…
Reference in New Issue
Block a user