* Added missing endif in previous commit

git-svn-id: trunk@8564 -
This commit is contained in:
pierre 2007-09-19 15:48:38 +00:00
parent 582fa79494
commit cbae87c505
2 changed files with 54 additions and 53 deletions

View File

@ -1983,6 +1983,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'else'#010+
' $(ZIPWRAPPER)'#010+
'endif'#010+
'endif'#010+
' $(DEL) $(ZIPWRAPPER)'#010+
'else'#010+
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
@ -1990,7 +1991,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
' $(DELTREE) $(PACKDIR)'#010+
#010+
'fpc_zipsourceinstall:'#010+
' $(MAKE)',' fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(Z'+
' $','(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(Z'+
'IPSOURCESUFFIX)'#010+
#010+
'fpc_zipexampleinstall:'#010+
@ -2000,7 +2001,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'endif'#010+
#010+
'fpc_zipdistinstall:'#010+
' $(MAKE) ','fpc_zipinstall ZIPTARGET=distinstall'#010+
' $(','MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
#010+
#010+
'[cleanrules]'#010+
@ -2008,7 +2009,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'# Clean rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_clean fpc_cleanall fp','c_distclean'#010+
'.PHONY: fpc_clean fpc_clean','all fpc_distclean'#010+
#010+
'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
@ -2020,18 +2021,18 @@ const fpcmakeini : array[0..214,1..240] of char=(
'endif'#010+
#010+
'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILE','S:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
'override CLEANPPULI','NKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
'(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
'TATICLIBEXT),$(CLEANPPUFILES)))'#010+
'ifdef DEBUGSYMEXT'#010+
'overrid','e CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+
'o','verride CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+
'PPUFILES))'#010+
'endif'#010+
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
'ILES))'#010+
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
'IX),$(CLEANPPUL','INKFILES)))'#010+
'IX),$(CLE','ANPPULINKFILES)))'#010+
'endif'#010+
#010+
'fpc_clean: $(CLEANTARGET)'#010+
@ -2043,8 +2044,8 @@ const fpcmakeini : array[0..214,1..240] of char=(
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKFILES)'#010+
'endif'#010+
'ifde','f CLEANRSTFILES'#010+
'endi','f'#010+
'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
@ -2053,7 +2054,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
'endif'#010+
' -$(DEL) $(FPCMADE) Pa','ckage.fpc $(PPAS) script.res link.res $'+
' -$(DEL) $(FPCMA','DE) Package.fpc $(PPAS) script.res link.res $'+
'(FPCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
#010+
@ -2062,7 +2063,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
'ifdef CLEANP','PUFILES'#010+
'ifdef ','CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
@ -2072,14 +2073,14 @@ const fpcmakeini : array[0..214,1..240] of char=(
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+
'endif'#010+
' -$(DELTREE)',' units'#010+
' -$(DE','LTREE) units'#010+
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+
' -$(DEL) fpcmade.* Package.fpc ','$(PPAS) script.res link.res $('+
' -$(DEL) fpcmade.* Packag','e.fpc $(PPAS) script.res link.res $('+
'FPCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *_ppas$(BATCHEXT)'#010+
'ifdef AOUTEXT'#010+
@ -2092,9 +2093,8 @@ const fpcmakeini : array[0..214,1..240] of char=(
'fpc_distclean: cleanall'#010+
#010+
#010+
'[baseinforules]'#010+
'####','################################################################'+
'#'#010+
'[baseinforules',']'#010+
'#####################################################################'#010+
'# Base info rules'#010+
'#####################################################################'#010+
#010+
@ -2103,101 +2103,102 @@ const fpcmakeini : array[0..214,1..240] of char=(
'override INFORULES+=fpc_baseinfo'#010+
#010+
'fpc_baseinfo:'#010+
' @$(ECHO',')'#010+
' @','$(ECHO)'#010+
' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) ',' FPC.......... $(FPC)'#010+
' @$(','ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
' @$(ECHO) Target OS.... $(','OS_TARGET)'#010+
' @$(ECHO) Target OS.','... $(OS_TARGET)'#010+
' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == D','irectory info =='#010+
' @$(ECHO)',' == Directory info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(ECHO) CrossBinDir..... $(CROSSB','INDIR)'#010+
' @$(ECHO) CrossBinDir..... $(','CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
' ',' @$(ECHO) == Tools info =='#010+
' @$(ECHO',')'#010+
' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) As........ $(AS)'#010+
' @$(ECHO) Ld........ $(LD)'#010+
' @$(ECHO) Ar........ $(AR)'#010+
' @$(ECHO) Rc........ $(RC)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Mv........ $(MVPR','OG)'#010+
' @$(ECHO) Mv........ ','$(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+
' @$(ECHO) Rm........ $(RMPROG)'#010+
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+
' @$(ECHO) Shell..... $(SHELL)'#010+
' @$(ECHO) Date...... $(DATE)'#010+
' ',' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) Date...... $(DATE)',#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
' @$(ECHO) Upx....... $(UPXPROG)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+
' @$(ECHO',') Target Loaders........ $(TARGET_LOADERS)'#010+
' @','$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+
' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
' @$(ECH','O) Target Dirs........... $(TARGET_DIRS)'#010+
' ','@$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
' ',' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO) Clean Units......... $(CLEAN_UNITS',')'#010+
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+
' ',' @$(ECHO)'#010+
' ',' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
' @$(ECHO) ',' ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(','ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
' @$(','ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
' ',' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
' @$(ECHO',') Install doc dir...... $(INSTALL_DOCDIR)'#010+
' @','$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
' ',' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDI','R)'#010+
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+
#010+
'[inforules]'#010+
'#####################################################################'#010+
'# Info rules'#010+
'#####################################################################'#010+
'####################################################################','#'+
#010+
'.PH','ONY: fpc_info'#010+
#010+
'.PHONY: fpc_info'#010+
#010+
'fpc_info: $(INFORULES)'#010+
#010+
@ -2206,7 +2207,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'# Rebuild Makefile'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_makefile fpc_','makefiles fpc_makefile_sub1 fpc_makefile_su'+
'.PHONY: fpc_makefil','e fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+
'b2 \'#010+
' fpc_makefile_dirs'#010+
#010+
@ -2215,7 +2216,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
#010+
'fpc_makefile_sub1:'#010+
'ifdef TARGET_DIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,','$(TAR'+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefil','e.fpc,$(TAR'+
'GET_DIRS))'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
@ -2226,14 +2227,14 @@ const fpcmakeini : array[0..214,1..240] of char=(
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
'EXAMPLEDIRS))'#010+
#010+
'fpc_makefile_di','rs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
'fpc_makef','ile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
#010+
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+
'[localmakefile]'#010+
'#####################################################################'#010+
'# Local Makefile'#010+
'#################################################','###################'+
'###########################################','#########################'+
'#'#010+
#010+
'ifneq ($(wildcard fpcmake.loc),)'#010+
@ -2244,7 +2245,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'[userrules]'#010+
'#####################################################################'#010+
'# Users rules'#010+
'#############################################################','#######'+
'#######################################################','#############'+
'#'#010+
#010+
'[lclrules]'#010+
@ -2254,7 +2255,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
#010+
'# LCL Platform'#010+
'ifndef LCL_PLATFORM'#010+
'ifneq ($(findstring $(OS_TARGET','),win32 win64),)'#010+
'ifneq ($(findstring $(OS_','TARGET),win32 win64),)'#010+
'LCL_PLATFORM=win32'#010+
'else'#010+
'LCL_PLATFORM=gtk'#010+
@ -2265,8 +2266,8 @@ const fpcmakeini : array[0..214,1..240] of char=(
'# Check if the specified LCLDIR is correct'#010+
'ifdef LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'o','verride LCLDIR=wrong'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM',')),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'else'#010+
'override LCLDIR=wrong'#010+
@ -2276,7 +2277,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'ifdef DEFAULT_LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=w','rong'#010+
'override LC','LDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
@ -2285,7 +2286,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'ifeq ($(LCLDIR),)'#010+
'override LCLD','IR=wrong'#010+
'overrid','e LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
@ -2294,7 +2295,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+
'override LC','LDIR=wrong'#010+
'overr','ide LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
@ -2303,7 +2304,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
'IR)/units)'#010+
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
'nts $(LCLDIR)/components)'#010+
'export LCLDIR LCLUNITDI','R LCLCOMPONENTDIR'#010+
'export LCLDIR LCL','UNITDIR LCLCOMPONENTDIR'#010+
#010+
'# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
@ -2311,9 +2312,8 @@ const fpcmakeini : array[0..214,1..240] of char=(
#010+
'[lclinforules]'#010+
'#####################################################################'#010+
'# LCL Info rules'#010+
'####','################################################################'+
'#'#010+
'# LCL Info rule','s'#010+
'#####################################################################'#010+
'override INFORULES+=lclinfo'#010+
#010+
'.PHONY: lclinfo'#010+
@ -2322,7 +2322,7 @@ const fpcmakeini : array[0..214,1..240] of char=(
' @$(ECHO) == LCL info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
' @$(EC','HO) LCLDIR............... $(LCLDIR)'#010+
' ',' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
' @$(ECHO)'#010

View File

@ -1901,6 +1901,7 @@ ifdef RUNBATCH
$(RUNBATCH) (ZIPWRAPPER)
else
$(ZIPWRAPPER)
endif
endif
$(DEL) $(ZIPWRAPPER)
else