IDE: make bigide creates revision.inc too (bug #10116)

git-svn-id: trunk@12973 -
This commit is contained in:
vincents 2007-11-22 10:07:52 +00:00
parent d0cdd9d471
commit 253d08d288
2 changed files with 12 additions and 7 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/12] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/20]
# #
default: all 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 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
@ -3053,17 +3053,18 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
.PHONY: ide idepkg bigide starter lazbuilder all clean cleanide purge .PHONY: ide idepkg bigide starter lazbuilder all clean cleanide purge revisioninc
.SUFFIXES: .rc .res .SUFFIXES: .rc .res
%.res: %.rc %.res: %.rc
windres -i $< -o $@ --preprocessor $(RCPP) windres -i $< -o $@ --preprocessor $(RCPP)
ide: $(COMPILER_UNITTARGETDIR) revisioninc:
ifneq ($(USESVN2REVISIONINC),0) ifneq ($(USESVN2REVISIONINC),0)
ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),) ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),)
$(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) OPT='' $(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) OPT=''
endif endif
../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc ../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc
endif endif
ide: $(COMPILER_UNITTARGETDIR) revisioninc
ifeq ($(LAZARUS_OPT),) ifeq ($(LAZARUS_OPT),)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
else else
@ -3071,7 +3072,7 @@ else
endif endif
idepkg: $(COMPILER_UNITTARGETDIR) idepkg: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)' $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
bigide: $(COMPILER_UNITTARGETDIR) bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT) -$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)' $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
starter: $(COMPILER_UNITTARGETDIR) starter: $(COMPILER_UNITTARGETDIR)

View File

@ -123,20 +123,24 @@ endif
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
[rules] [rules]
.PHONY: ide idepkg bigide starter lazbuilder all clean cleanide purge .PHONY: ide idepkg bigide starter lazbuilder all clean cleanide purge revisioninc
.SUFFIXES: .rc .res .SUFFIXES: .rc .res
%.res: %.rc %.res: %.rc
windres -i $< -o $@ --preprocessor $(RCPP) windres -i $< -o $@ --preprocessor $(RCPP)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
ide: $(COMPILER_UNITTARGETDIR) revisioninc:
ifneq ($(USESVN2REVISIONINC),0) ifneq ($(USESVN2REVISIONINC),0)
ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),) ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),)
$(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) OPT='' $(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) OPT=''
endif endif
../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc ../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc
endif endif
#-----------------------------------------------------------------------------
ide: $(COMPILER_UNITTARGETDIR) revisioninc
ifeq ($(LAZARUS_OPT),) ifeq ($(LAZARUS_OPT),)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
else else
@ -148,7 +152,7 @@ idepkg: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)' $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
bigide: $(COMPILER_UNITTARGETDIR) bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT) -$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)' $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'