* some makefile fixes.

git-svn-id: trunk@9641 -
This commit is contained in:
marco 2008-01-05 19:46:23 +00:00
parent 149136ba9d
commit 5980c188d7
6 changed files with 369 additions and 21 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/14]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/05]
#
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-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
@ -1800,7 +1800,8 @@ REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),i386-win32)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_WINUNITS=1
REQUIRE_PACKAGES_WINUNITS-BASE=1
REQUIRE_PACKAGES_WINUNITS-JEDI=1
endif
ifeq ($(FULL_TARGET),i386-os2)
REQUIRE_PACKAGES_RTL=1
@ -1918,7 +1919,8 @@ REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_WINUNITS=1
REQUIRE_PACKAGES_WINUNITS-BASE=1
REQUIRE_PACKAGES_WINUNITS-JEDI=1
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
REQUIRE_PACKAGES_RTL=1
@ -1979,30 +1981,56 @@ ifdef UNITDIR_RTL
override COMPILER_UNITDIR+=$(UNITDIR_RTL)
endif
endif
ifdef REQUIRE_PACKAGES_WINUNITS
PACKAGEDIR_WINUNITS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_WINUNITS),)
ifneq ($(wildcard $(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)),)
UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)/units/$(TARGETSUFFIX)
ifdef REQUIRE_PACKAGES_WINUNITS-BASE
PACKAGEDIR_WINUNITS-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_WINUNITS-BASE),)
ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)),)
UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)/units/$(TARGETSUFFIX)
else
UNITDIR_WINUNITS=$(PACKAGEDIR_WINUNITS)
UNITDIR_WINUNITS-BASE=$(PACKAGEDIR_WINUNITS-BASE)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_WINUNITS)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_WINUNITS) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS)/$(FPCMADE)
$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_WINUNITS-BASE) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-BASE)/$(FPCMADE)
endif
else
PACKAGEDIR_WINUNITS=
UNITDIR_WINUNITS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_WINUNITS),)
UNITDIR_WINUNITS:=$(firstword $(UNITDIR_WINUNITS))
PACKAGEDIR_WINUNITS-BASE=
UNITDIR_WINUNITS-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-base/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_WINUNITS-BASE),)
UNITDIR_WINUNITS-BASE:=$(firstword $(UNITDIR_WINUNITS-BASE))
else
UNITDIR_WINUNITS=
UNITDIR_WINUNITS-BASE=
endif
endif
ifdef UNITDIR_WINUNITS
override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS)
ifdef UNITDIR_WINUNITS-BASE
override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-BASE)
endif
endif
ifdef REQUIRE_PACKAGES_WINUNITS-JEDI
PACKAGEDIR_WINUNITS-JEDI:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_WINUNITS-JEDI),)
ifneq ($(wildcard $(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX)),)
UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)/units/$(TARGETSUFFIX)
else
UNITDIR_WINUNITS-JEDI=$(PACKAGEDIR_WINUNITS-JEDI)
endif
ifdef CHECKDEPEND
$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE):
$(MAKE) -C $(PACKAGEDIR_WINUNITS-JEDI) $(FPCMADE)
override ALLDEPENDENCIES+=$(PACKAGEDIR_WINUNITS-JEDI)/$(FPCMADE)
endif
else
PACKAGEDIR_WINUNITS-JEDI=
UNITDIR_WINUNITS-JEDI:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /winunits-jedi/Package.fpc,$(UNITSDIR)))))
ifneq ($(UNITDIR_WINUNITS-JEDI),)
UNITDIR_WINUNITS-JEDI:=$(firstword $(UNITDIR_WINUNITS-JEDI))
else
UNITDIR_WINUNITS-JEDI=
endif
endif
ifdef UNITDIR_WINUNITS-JEDI
override COMPILER_UNITDIR+=$(UNITDIR_WINUNITS-JEDI)
endif
endif
ifndef NOCPUDEF

View File

@ -7,8 +7,8 @@ name=fcl-base
version=2.0.0
[require]
packages_win32=winunits
packages_win64=winunits
packages_win32=winunits-base winunits-jedi
packages_win64=winunits-base winunits-jedi
[target]
units=contnrs inifiles ezcgi rtfpars idea base64 gettext \

View File

@ -1040,6 +1040,165 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_OPTIONS+=-Ur
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src
endif
ifeq ($(FULL_TARGET),i386-go32v2)

View File

@ -25,6 +25,7 @@ fpcdir=../..
[compiler]
options=-Ur
sourcedir=src
unitdir=units
[rules]
.NOTPARALLEL:

View File

@ -1199,6 +1199,165 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_INCLUDEDIR+=src
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-nds)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),arm-symbian)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override COMPILER_UNITDIR+=units
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=src
endif
ifeq ($(FULL_TARGET),i386-go32v2)

View File

@ -67,6 +67,7 @@ fpcdir=../..
options=-Ur
sourcedir=src
includedir=src
unitdir=units
[rules]
.NOTPARALLEL: