* Applied patch to install fclel.res

git-svn-id: trunk@11110 -
This commit is contained in:
michael 2008-05-28 19:58:56 +00:00
parent 77581bedd1
commit aaf1606cea
2 changed files with 19 additions and 99 deletions

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/28]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/20]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
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-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom
@ -167,17 +167,6 @@ OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
endif
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
ifeq ($(CPU_TARGET),armeb)
ARCH=arm
override FPCOPT+=-Cb
else
ifeq ($(CPU_TARGET),armel)
ARCH=arm
override FPCOPT+=-CaEABI
else
ARCH=$(CPU_TARGET)
endif
endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
TARGETSUFFIX=$(OS_TARGET)
SOURCESUFFIX=$(OS_SOURCE)
@ -185,15 +174,9 @@ else
TARGETSUFFIX=$(FULL_TARGET)
SOURCESUFFIX=$(FULL_SOURCE)
endif
ifeq ($(OS_TARGET),darwin)
ifneq ($(OS_SOURCE),darwin)
CROSSCOMPILE=1
endif
else
ifneq ($(FULL_TARGET),$(FULL_SOURCE))
CROSSCOMPILE=1
endif
endif
ifeq ($(findstring makefile,$(MAKECMDGOALS)),)
ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)
$(error The Makefile doesn't support target $(FULL_TARGET), please run fpcmake first)
@ -205,7 +188,7 @@ endif
ifeq ($(OS_TARGET),linux)
linuxHier=1
endif
export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR))
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
@ -259,6 +242,12 @@ endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=fcl-base
override PACKAGE_VERSION=2.0.0
ifeq ($(OS_TARGET),win32)
INSTALL_DATADIR=${INSTALL_UNITDIR}
endif
ifeq ($(OS_TARGET),win64)
INSTALL_DATADIR=${INSTALL_UNITDIR}
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer
endif
@ -277,9 +266,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs
endif
ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils daemonapp fptimer
endif
@ -397,9 +383,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils
endif
ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils fileinfo syncobjs fptimer
endif
@ -427,12 +410,6 @@ endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils
endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils syncobjs daemonapp fptimer
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_UNITS+=contnrs inifiles rtfpars idea base64 gettext iostream cachecls avl_tree uriparser eventlog custapp wformat whtml wtex rttiutils bufstream streamex blowfish streamio inicol pooledmm libtar streamcoll maskutils
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
@ -451,9 +428,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
@ -571,9 +545,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
@ -601,12 +572,6 @@ endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_RSTS+=cachecls custapp cgiapp eventlog registry streamcoll inicol
endif
ifeq ($(FULL_TARGET),i386-win32)
override INSTALL_FILES+=src/win/fclel.res
endif
@ -632,9 +597,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_OPTIONS+=-S2h
endif
@ -752,9 +714,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_OPTIONS+=-S2h
endif
@ -782,12 +741,6 @@ endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
endif
@ -806,9 +759,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
endif
ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
endif
@ -926,9 +876,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/win
endif
@ -956,12 +903,6 @@ endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src src/unix
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
@ -980,9 +921,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-haiku)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
@ -1100,9 +1038,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-darwin)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
@ -1130,12 +1065,6 @@ endif
ifeq ($(FULL_TARGET),avr-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),armeb-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
endif
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif
@ -1425,11 +1354,6 @@ BATCHEXT=.sh
EXEEXT=
SHORTSUFFIX=be
endif
ifeq ($(OS_TARGET),haiku)
BATCHEXT=.sh
EXEEXT=
SHORTSUFFIX=hai
endif
ifeq ($(OS_TARGET),solaris)
BATCHEXT=.sh
EXEEXT=
@ -1909,9 +1833,6 @@ endif
ifeq ($(FULL_TARGET),i386-beos)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),i386-haiku)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),i386-netbsd)
REQUIRE_PACKAGES_RTL=1
endif
@ -2031,9 +1952,6 @@ endif
ifeq ($(FULL_TARGET),arm-palmos)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),arm-darwin)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),arm-wince)
REQUIRE_PACKAGES_RTL=1
endif
@ -2061,12 +1979,6 @@ endif
ifeq ($(FULL_TARGET),avr-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),armeb-linux)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),armeb-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),)
@ -2146,13 +2058,13 @@ override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-JEDI)
endif
endif
ifndef NOCPUDEF
override FPCOPTDEF=$(ARCH)
override FPCOPTDEF=$(CPU_TARGET)
endif
ifneq ($(OS_TARGET),$(OS_SOURCE))
override FPCOPT+=-T$(OS_TARGET)
endif
ifneq ($(CPU_TARGET),$(CPU_SOURCE))
override FPCOPT+=-P$(ARCH)
override FPCOPT+=-P$(CPU_TARGET)
endif
ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)

View File

@ -49,6 +49,14 @@ includedir_win64=src/win
includedir_wince=src/win
sourcedir=src/$(OS_TARGET) src
[prerules]
ifeq ($(OS_TARGET),win32)
INSTALL_DATADIR=${INSTALL_UNITDIR}
endif
ifeq ($(OS_TARGET),win64)
INSTALL_DATADIR=${INSTALL_UNITDIR}
endif
[install]
fpcpackage=y
files_win32=src/win/fclel.res