Merged revisions 11193 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r11193 | jonas | 2008-06-04 19:22:44 +0200 (Wed, 04 Jun 2008) | 2 lines

  * regenerated after r11180

........

git-svn-id: branches/fixes_2_2@11206 -

utils/fpcm/fpcmake.inc

@@ -1992,9 +1992,9 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        /bin/sh $(ZIPWRAPPER)'#010+
   'else'#010+
   'ifdef RUNBATCH'#010+
-  '        $(RUNBATCH) (ZIPWRAPPER)'#010+
+  '        $(RUNBATCH) $(ZIPWRAPPER)'#010+
   'else'#010+
-  '      ','  $(ZIPWRAPPER)'#010+
+  '     ','   $(ZIPWRAPPER)'#010+
   'endif'#010+
   'endif'#010+
   '        $(DEL) $(ZIPWRAPPER)'#010+
@@ -2004,7 +2004,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        $(DELTREE) $(PACKDIR)'#010+
   #010+
   'fpc_zipsourceinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPS','UFFIX=$(Z'+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIP','SUFFIX=$(Z'+
   'IPSOURCESUFFIX)'#010+
   #010+
   'fpc_zipexampleinstall:'#010+
@@ -2017,7 +2017,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
   #010+
   #010+
-  '[clea','nrules]'#010+
+  '[cle','anrules]'#010+
   '#####################################################################'#010+
   '# Clean rules'#010+
   '#####################################################################'#010+
@@ -2025,7 +2025,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
   #010+
   'ifdef EXEFILES'#010+
-  'override CLEANEX','EFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
+  'override CLEANE','XEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
   'ES))'#010+
   'endif'#010+
   #010+
@@ -2034,12 +2034,12 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
-  'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES',
+  'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE','S'+
   ')) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$('+
   'CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(ST'+
   'ATICLIBEXT),$(CLEANPPUFILES)))'#010+
   'ifdef DEBUGSYMEXT'#010+
-  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEB','UGSYMEXT),$(CLEAN'+
+  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DE','BUGSYMEXT),$(CLEAN'+
   'PPUFILES))'#010+
   'endif'#010+
   'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
@@ -2048,7 +2048,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'IX),$(CLEANPPULINKFILES)))'#010+
   'endif'#010+
   #010+
-  'fpc_clean: $(CLEANTARGET)',#010+
+  'fpc_clean: $(CLEANTARGET',')'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
@@ -2059,7 +2059,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix ','$(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
+  '        -$(DEL) $(addprefix',' $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
   #010+
   'endif'#010+
   'ifdef CLEAN_FILES'#010+
@@ -2069,7 +2069,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
   'endif'#010+
   '        -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
-  'PCE','XTFILE) $(REDIRFILE)'#010+
+  'PC','EXTFILE) $(REDIRFILE)'#010+
   '        -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
   #010+
   'fpc_cleanall: $(CLEANTARGET)'#010+
@@ -2079,7 +2079,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'ifdef COMPILER_UNITTARGETDIR'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
-  'end','if'#010+
+  'en','dif'#010+
   'ifneq ($(CLEANPPULINKFILES),)'#010+
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
@@ -2088,14 +2088,14 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'endif'#010+
   'endif'#010+
   '        -$(DELTREE) units'#010+
-  '        -$(DEL) *$(OEXT) *$(PPUEXT) *','$(RSTEXT) *$(ASMEXT) *$(STATICL'+
+  '        -$(DEL) *$(OEXT) *$(PPUEXT) ','*$(RSTEXT) *$(ASMEXT) *$(STATICL'+
   'IBEXT) *$(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 $(FP'+
-  'CEXTFILE) $(','REDIRFILE)'#010+
+  'CEXTFILE) $','(REDIRFILE)'#010+
   '        -$(DEL) *_ppas$(BATCHEXT)'#010+
   'ifdef AOUTEXT'#010+
   '        -$(DEL) *$(AOUTEXT)'#010+
@@ -2108,7 +2108,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   #010+
   #010+
   '[baseinforules]'#010+
-  '################################################','####################'+
+  '###############################################','#####################'+
   '#'#010+
   '# Base info rules'#010+
   '#####################################################################'#010+
@@ -2120,91 +2120,91 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'fpc_baseinfo:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Package info =='#010+
-  '     ','   @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#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 ','Version.. $(FPC_VERSION)'#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)  Full Source.. $','(FULL_SOURCE)'#010+
+  '        @$(ECHO)  Full Source.. ','$(FULL_SOURCE)'#010+
   '        @$(ECHO)  Full Target.. $(FULL_TARGET)'#010+
   '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#010+
   '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
-  '        @$','(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
+  '        @','$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
   '        @$(ECHO)  CrossBinDir..... $(CROSSBINDIR)'#010+
-  '        @$(ECHO)  UnitsDir........ $(','UNITSDIR)'#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+
-  '        @$(EC','HO)'#010+
+  '        @$(E','CHO)'#010+
   '        @$(ECHO)  As........ $(AS)'#010+
   '        @$(ECHO)  Ld........ $(LD)'#010+
   '        @$(ECHO)  Ar........ $(AR)'#010+
   '        @$(ECHO)  Rc........ $(RC)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Mv........ $(MVPROG)'#010+
-  '        @$(ECHO)  Cp........ $(CPPROG)'#010+
-  ' ','       @$(ECHO)  Rm........ $(RMPROG)'#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)  PPUMove... $(PPUMOVE)'#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+
   '        @$(ECHO)  Target Dirs........... $(TARGET_DIRS)'#010+
-  '  ','      @$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)'#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_F','ILES)'#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)  DateStr.........','..... $(DATESTR)'#010+
+  '        @$(ECHO)  DateStr........','...... $(DATESTR)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
   '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
   '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
-  '        ','@$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#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_BINDI','R)'#010+
+  '        @$(ECHO)  Install binary dir... $(INSTALL_BIND','IR)'#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 example dir.. $(INSTALL_EXAMPLEDIR)'#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 zip name........ $(DIST','_ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[inforules]'#010+
@@ -2216,12 +2216,12 @@ const fpcmakeini : array[0..215,1..240] of char=(
   #010+
   'fpc_info: $(INFORULES)'#010+
   #010+
-  '[make','filerules]'#010+
+  '[mak','efilerules]'#010+
   '#####################################################################'#010+
   '# Rebuild Makefile'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub',
+  '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_su','b'+
   '2 \'#010+
   '        fpc_makefile_dirs'#010+
   #010+
@@ -2233,7 +2233,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
   'T_DIRS))'#010+
   'endif'#010+
-  'ifdef TARGET_EXAMPLEDI','RS'#010+
+  'ifdef TARGET_EXAMPLED','IRS'#010+
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
   'T_EXAMPLEDIRS))'#010+
   'endif'#010+
@@ -2243,14 +2243,14 @@ const fpcmakeini : array[0..215,1..240] of char=(
   #010+
   'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
   #010+
-  'fpc','_makefiles: fpc_makefile fpc_makefile_dirs'#010+
+  'fp','c_makefiles: fpc_makefile fpc_makefile_dirs'#010+
   #010+
   '[localmakefile]'#010+
   '#####################################################################'#010+
   '# Local Makefile'#010+
   '#####################################################################'#010+
   #010+
-  'ifneq ($(wildcard fpcm','ake.loc),)'#010+
+  'ifneq ($(wildcard fpc','make.loc),)'#010+
   'include fpcmake.loc'#010+
   'endif'#010+
   #010+
@@ -2261,7 +2261,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '#####################################################################'#010+
   #010+
   '[lclrules]'#010+
-  '#######################','#############################################'+
+  '######################','##############################################'+
   '#'#010+
   '# LCL Rules'#010+
   '#####################################################################'#010+
@@ -2271,7 +2271,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+
   'LCL_PLATFORM=win32'#010+
   'else'#010+
-  'LCL','_PLATFORM=gtk'#010+
+  'LC','L_PLATFORM=gtk'#010+
   'endif'#010+
   'endif'#010+
   'export LCL_PLATFORM'#010+
@@ -2283,7 +2283,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'override LCLDIR=wrong'#010+
   'endif'#010+
   'else'#010+
-  'override LCL','DIR=wrong'#010+
+  'override LC','LDIR=wrong'#010+
   'endif'#010+
   #010+
   '# Check if the default LCLDIR is correct'#010+
@@ -2294,7 +2294,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Check for development ve','rsion'#010+
+  '# Check for development v','ersion'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
   'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
   ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
@@ -2303,7 +2303,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Check for release ve','rsion'#010+
+  '# Check for release v','ersion'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
   'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
   ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
@@ -2313,20 +2313,20 @@ const fpcmakeini : array[0..215,1..240] of char=(
   'endif'#010+
   #010+
   '# Generate dirs'#010+
-  'over','ride LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+
+  'ove','rride LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+
   'LDIR)/units)'#010+
   'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
   'nts $(LCLDIR)/components)'#010+
   'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
   #010+
-  '# Add LCL dirs to paths'#010+
-  'o','verride REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
+  '# Add LCL dirs to paths'#010,
+  'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
   'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
   #010+
   '[lclinforules]'#010+
   '#####################################################################'#010+
   '# LCL Info rules'#010+
-  '################################################','####################'+
+  '###############################################','#####################'+
   '#'#010+
   'override INFORULES+=lclinfo'#010+
   #010+
@@ -2337,7 +2337,7 @@ const fpcmakeini : array[0..215,1..240] of char=(
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Platform............. $(LCL_PLATFORM)'#010+
   '        @$(ECHO)  LCLDIR............... $(LCLDIR)'#010+
-  '       ',' @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#010+
+  '      ','  @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#010+
   '        @$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
   '        @$(ECHO)'#010
 );