From aa061bbe5ad3fe76142ed80a1a10c734c1c2f80e Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 22 Mar 2013 22:31:09 +0000 Subject: [PATCH] Makefile and revision.inc regenerated after commit 23962 git-svn-id: trunk@23963 - --- utils/fpcm/Makefile | 15 +++++++-------- utils/fpcm/revision.inc | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile index 9075a475df..3477cb27a0 100644 --- a/utils/fpcm/Makefile +++ b/utils/fpcm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-22 rev 23956] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-22 rev 23957] # 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 i386-iphonesim i386-android 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd 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 arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android @@ -320,11 +320,8 @@ REVINC:=$(wildcard revision.inc) ifneq ($(REVINC),) override FPCOPT+=-dREVINC endif -REVINC_FILES=$(wilcard fpcm*.pp fpcmake.ini Makefile.fpc) -ifdef CALL_GET_REVISION -GET_REVISION_OUTPUT:=$(shell ./get_revision.sh $(REVINC_FILES)) -$(info get_revision script output is $(GET_REVISION_OUTPUT)) -endif +REVINC_FILES=$(wildcard fpcm*.pp fpcmake.ini Makefile.fpc) +SVN:=$(firstword $(wildcard $(addsuffix /svn$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=fpcmake endif @@ -3059,9 +3056,11 @@ endif ifdef inCygWin EnableRevIncRule=1 endif -ifdef EnableRevIncRule +ifneq (,$(SVN)) revision.inc : $(REVINC_FILES) - $(MAKE) CALL_GET_REVISION=1 + $(SVN) info $(REVINC_FILES) > svninfo.log + $(MAKE) getrev$(EXEEXT) + ./getrev$(EXEEXT) svninfo.log endif .PHONY : revision revision : diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc index dc9f7847c9..79e56a1466 100644 --- a/utils/fpcm/revision.inc +++ b/utils/fpcm/revision.inc @@ -1 +1 @@ -'2013-03-22 rev 23956' +'2013-03-22 rev 23962'