mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-18 05:49:23 +02:00
Regenerated Makefile and new revision.inc
git-svn-id: trunk@23957 -
This commit is contained in:
parent
b9cb784bc6
commit
18812f84cf
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -14165,6 +14165,7 @@ utils/fpcm/get_revision.sh svneol=native#text/plain
|
|||||||
utils/fpcm/makefile.exm -text
|
utils/fpcm/makefile.exm -text
|
||||||
utils/fpcm/printmakefilefpcrequirements.sh svneol=native#text/plain
|
utils/fpcm/printmakefilefpcrequirements.sh svneol=native#text/plain
|
||||||
utils/fpcm/readme.txt svneol=native#text/plain
|
utils/fpcm/readme.txt svneol=native#text/plain
|
||||||
|
utils/fpcm/revision.inc svneol=native#text/plain
|
||||||
utils/fpcmkcfg/Makefile svneol=native#text/plain
|
utils/fpcmkcfg/Makefile svneol=native#text/plain
|
||||||
utils/fpcmkcfg/Makefile.fpc svneol=native#text/plain
|
utils/fpcmkcfg/Makefile.fpc svneol=native#text/plain
|
||||||
utils/fpcmkcfg/default.cft svneol=native#text/plain
|
utils/fpcmkcfg/default.cft svneol=native#text/plain
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/02/20]
|
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-22 rev 23956]
|
||||||
#
|
#
|
||||||
default: all
|
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
|
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
|
||||||
@ -316,6 +316,15 @@ FPCFPMAKE=$(FPC)
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX)
|
BS_UNITDIR=$(BASEDIR)/units/$(SOURCESUFFIX)
|
||||||
|
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
|
||||||
ifeq ($(FULL_TARGET),i386-linux)
|
ifeq ($(FULL_TARGET),i386-linux)
|
||||||
override TARGET_PROGRAMS+=fpcmake
|
override TARGET_PROGRAMS+=fpcmake
|
||||||
endif
|
endif
|
||||||
@ -3040,8 +3049,29 @@ ifneq ($(DATA2INC),)
|
|||||||
fpcmake.inc: fpcmake.ini
|
fpcmake.inc: fpcmake.ini
|
||||||
$(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini
|
$(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini
|
||||||
endif
|
endif
|
||||||
fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc
|
ifdef inUnix
|
||||||
|
EnableRevIncRule=1
|
||||||
|
endif
|
||||||
|
ifdef inCygWin
|
||||||
|
EnableRevIncRule=1
|
||||||
|
endif
|
||||||
|
ifdef EnableRevIncRule
|
||||||
|
revision.inc : $(REVINC_FILES)
|
||||||
|
$(MAKE) CALL_GET_REVISION=1
|
||||||
|
endif
|
||||||
|
.PHONY : revision
|
||||||
|
revision :
|
||||||
|
$(DEL) revision.inc
|
||||||
|
$(MAKE) revision.inc
|
||||||
|
fpcmake$(EXEEXT): $(wildcard fpcm*.pp) fpcmake.inc $(REVINC)
|
||||||
|
ifneq (,$(REVINC))
|
||||||
|
$(MAKE) fpcmmain$(PPUEXT)
|
||||||
|
$(COMPILER) fpcmake.pp
|
||||||
|
$(EXECPPAS)
|
||||||
|
endif
|
||||||
|
ifndef inCygWin
|
||||||
$(BS_UNITDIR):
|
$(BS_UNITDIR):
|
||||||
$(MKDIRTREE) $(BS_UNITDIR)
|
$(MKDIRTREE) $(BS_UNITDIR)
|
||||||
bootstrap: $(BS_UNITDIR) fpcmake.inc
|
bootstrap: $(BS_UNITDIR) fpcmake.inc
|
||||||
$(FPCFPMAKE) fpcmake.pp $(FPMAKE_SKIP_CONFIG) -Fu$(UNITDIR_FPMAKE_RTL) -FU$(BS_UNITDIR) $(OPT)
|
$(FPCFPMAKE) fpcmake.pp $(FPMAKE_SKIP_CONFIG) -Fu$(UNITDIR_FPMAKE_RTL) -FU$(BS_UNITDIR) $(OPT)
|
||||||
|
endif
|
||||||
|
1
utils/fpcm/revision.inc
Normal file
1
utils/fpcm/revision.inc
Normal file
@ -0,0 +1 @@
|
|||||||
|
'2013-03-22 rev 23956'
|
Loading…
Reference in New Issue
Block a user