lcl: compile packageintf before lcl

git-svn-id: trunk@29208 -
This commit is contained in:
mattias 2011-01-26 22:56:17 +00:00
parent 483f4ec94a
commit eae302f5da
2 changed files with 35 additions and 10 deletions

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/04/21]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/01/04]
#
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 i386-nativent 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-solaris 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 mipsel-linux
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 i386-nativent i386-iphonesim 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-solaris 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 mipsel-linux
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -244,7 +244,7 @@ endif
ifndef CROSSBINDIR
CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
endif
ifeq ($(OS_TARGET),darwin)
ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
ifeq ($(OS_SOURCE),darwin)
DARWIN2DARWIN=1
endif
@ -342,6 +342,9 @@ endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_DIRS+=lcl packager/registration ideintf packager components
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
override TARGET_DIRS+=lcl packager/registration ideintf packager components
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_DIRS+=lcl packager/registration ideintf packager components
endif
@ -525,6 +528,9 @@ endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_PROGRAMS+=lazarus startlazarus
endif
@ -708,6 +714,9 @@ endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
override TARGET_EXAMPLEDIRS+=examples
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_EXAMPLEDIRS+=examples
endif
@ -891,6 +900,9 @@ endif
ifeq ($(FULL_TARGET),i386-nativent)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
ifeq ($(FULL_TARGET),m68k-linux)
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
endif
@ -1341,7 +1353,7 @@ DEBUGSYMEXT=.xcoff
SHORTSUFFIX=mac
IMPORTLIBPREFIX=imp
endif
ifeq ($(OS_TARGET),darwin)
ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)
BATCHEXT=.sh
EXEEXT=
HASSHAREDLIB=1
@ -1869,6 +1881,10 @@ ifeq ($(FULL_TARGET),i386-nativent)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_REGEXPR=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_REGEXPR=1
@ -2462,7 +2478,7 @@ ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
ifdef USETAR
ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *
else
ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
@ -2829,6 +2845,13 @@ TARGET_DIRS_IDEINTF=1
TARGET_DIRS_PACKAGER=1
TARGET_DIRS_COMPONENTS=1
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
TARGET_DIRS_LCL=1
TARGET_DIRS_PACKAGER/REGISTRATION=1
TARGET_DIRS_IDEINTF=1
TARGET_DIRS_PACKAGER=1
TARGET_DIRS_COMPONENTS=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
TARGET_DIRS_LCL=1
TARGET_DIRS_PACKAGER/REGISTRATION=1
@ -3397,6 +3420,9 @@ endif
ifeq ($(FULL_TARGET),i386-nativent)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
TARGET_EXAMPLEDIRS_EXAMPLES=1
endif
@ -3586,7 +3612,7 @@ ide:
$(MAKE) -C ide ide
idepkg:
$(MAKE) -C ide idepkg
bigide: lcl packager/registration ideintf packager bigidecomponents idebig starter lazbuilder
bigide: packager/registration lcl ideintf packager bigidecomponents idebig starter lazbuilder
idebig:
$(MAKE) -C ide bigide
bigidecomponents:
@ -3602,7 +3628,7 @@ lazbuilder:
tools: lcl
$(MAKE) -C tools
examples: lcl components
all: lcl packager/registration ideintf packager components ide starter lazbuilder
all: packager/registration lcl ideintf packager components ide starter lazbuilder
cleanide:
$(MAKE) -C ide cleanide
cleanlaz: cleanide
@ -3715,7 +3741,6 @@ ifdef DEBUSESVN
packager \
test \
tools \
# add ide/revision.inc
echo "const RevisionStr = '${SVNVERSION}';" > $(DEBSRCDIR)/ide/revision.inc
else
tar -C ${BUILDDIR} -zxf ${DEBSRC_ORIG}.tar.gz ${DEBSRC}

View File

@ -56,7 +56,7 @@ idepkg:
$(MAKE) -C ide idepkg
#-----------------------------------------------------------------------------
bigide: lcl packager/registration ideintf packager bigidecomponents idebig starter lazbuilder
bigide: packager/registration lcl ideintf packager bigidecomponents idebig starter lazbuilder
#-----------------------------------------------------------------------------
idebig:
@ -88,7 +88,7 @@ tools: lcl
examples: lcl components
#-----------------------------------------------------------------------------
all: lcl packager/registration ideintf packager components ide starter lazbuilder
all: packager/registration lcl ideintf packager components ide starter lazbuilder
#-----------------------------------------------------------------------------
cleanide: