2
0
Эх сурвалжийг харах

* forgot to commit

git-svn-id: trunk@6224 -
Jonas Maebe 18 жил өмнө
parent
commit
60d19ea1e6

+ 8 - 1
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -4028,3 +4028,10 @@ ptop$(EXEEXT): ptop.pp ptopu$(PPUEXT)
 ptopu$(PPUEXT): ptopu.pp
 ppdep$(EXEEXT): ppdep.pp
 unexport DATA2INC
+grab_vcsa$(EXEEXT): | ppdep$(EXEEXT)
+ppdep$(EXEEXT): | ptop$(EXEEXT)
+ptop$(EXEEXT): | postw32$(EXEEXT)
+postw32$(EXEEXT): | rstconv$(EXEEXT)
+rstconv$(EXEEXT): | data2inc$(EXEEXT)
+data2inc$(EXEEXT): | delp$(EXEEXT)
+delp$(EXEEXT): | bin2obj$(EXEEXT)

+ 16 - 0
utils/Makefile.fpc

@@ -48,3 +48,19 @@ ppdep$(EXEEXT): ppdep.pp
 #
 
 unexport DATA2INC
+
+# order dependencies to avoid link.res clashes
+
+grab_vcsa$(EXEEXT): | ppdep$(EXEEXT)
+
+ppdep$(EXEEXT): | ptop$(EXEEXT)
+
+ptop$(EXEEXT): | postw32$(EXEEXT)
+
+postw32$(EXEEXT): | rstconv$(EXEEXT)
+
+rstconv$(EXEEXT): | data2inc$(EXEEXT)
+
+data2inc$(EXEEXT): | delp$(EXEEXT)
+
+delp$(EXEEXT): | bin2obj$(EXEEXT)

+ 1 - 0
utils/debugsvr/Makefile.fpc

@@ -20,6 +20,7 @@ fpcdir=../..
 
 
 [rules]
+.NOTPARALLEL:
 debugserverintf$(PPUEXT): msgintf$(PPUEXT) debugserverintf.pp
         $(COMPILER) debugserverintf$(PASEXT)
 

+ 3 - 0
utils/debugsvr/console/Makefile.fpc

@@ -16,3 +16,6 @@ fpcpackage=y
 
 [default]
 fpcdir=../../..
+
+[rules]
+.NOTPARALLEL:

+ 1 - 0
utils/debugsvr/gtk/Makefile.fpc

@@ -19,5 +19,6 @@ fpcpackage=y
 fpcdir=../../..
 
 [rules]
+.NOTPARALLEL:
 debugserver$(EXEEXT): frmabout$(PPUEXT) frmmain$(PPUEXT) bitmapdata$(PPUEXT) debugserver.pp
 	$(COMPILER) debugserver.pp

+ 2 - 1
utils/dxegen/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -1824,5 +1824,6 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 dxegen$(EXEEXT): dxegen.pp coff$(PPUEXT)
 coff$(PPUEXT)  : coff.pp

+ 1 - 0
utils/dxegen/Makefile.fpc

@@ -15,6 +15,7 @@ fpcpackage=y
 fpcdir=../..
 
 [rules]
+.NOTPARALLEL:
 dxegen$(EXEEXT): dxegen.pp coff$(PPUEXT)
 
 coff$(PPUEXT)  : coff.pp

+ 2 - 1
utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -2920,6 +2920,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 ifneq ($(DATA2INC),)
 fpcmake.inc: fpcmake.ini
 	$(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini

+ 1 - 0
utils/fpcm/Makefile.fpc

@@ -20,6 +20,7 @@ fpcpackage=y
 fpcdir=../..
 
 [rules]
+.NOTPARALLEL:
 ifneq ($(DATA2INC),)
 fpcmake.inc: fpcmake.ini
         $(DATA2INC) -b -s fpcmake.ini fpcmake.inc fpcmakeini

+ 2 - 1
utils/fpcres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -2127,4 +2127,5 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpcmake$(EXEEXT): fpcresfix.pas elfbfd.pas elfres.pas fpcres.pas

+ 1 - 0
utils/fpcres/Makefile.fpc

@@ -19,4 +19,5 @@ fpcpackage=y
 fpcdir=../..
 
 [rules]
+.NOTPARALLEL:
 fpcmake$(EXEEXT): fpcresfix.pas elfbfd.pas elfres.pas fpcres.pas

+ 2 - 1
utils/fpdoc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -3148,6 +3148,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\
   dw_latex.pp dwlinear.pp dw_txt.pp
 makeskel$(EXEEXT): makeskel.pp dglobals.pp

+ 1 - 0
utils/fpdoc/Makefile.fpc

@@ -30,6 +30,7 @@ units=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf dw_txt dw_man
 files=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst
 
 [rules]
+.NOTPARALLEL:
 fpdoc$(EXEEXT): fpdoc.pp dglobals.pp dwriter.pp dw_xml.pp sh_pas.pp dw_html.pp\
   dw_latex.pp dwlinear.pp dw_txt.pp
 

+ 1 - 0
utils/fpdoc/fpde/Makefile.fpc

@@ -25,6 +25,7 @@ units=fpdeopts frmlink frmmakeskel frmoptions pgeditor fpdemsg frmabout \
 files=fpdemsg.rst  frmmakeskel.rst
 
 [rules]
+.NOTPARALLEL:
 fpde$(EXEEXT): fpde.pp fpdeopts.pp frmlink.pp frmmakeskel.pp frmoptions.pp\
                pgeditor.pp fpdemsg.pp frmabout.pp frmmain.pp frmnewnode.pp\
                frmtable.pp xpms.pp

+ 2 - 1
utils/fpmc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -3194,5 +3194,6 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpmc$(EXEEXT): msgcomp.pp fpmc.pp
 fpmcgtk$(EXEEXT): msgcomp.pp fpmcgtk.pp $(wildcard frm*.pp)

+ 1 - 0
utils/fpmc/Makefile.fpc

@@ -33,6 +33,7 @@ endif
 endif
 
 [rules]
+.NOTPARALLEL:
 fpmc$(EXEEXT): msgcomp.pp fpmc.pp
 
 fpmcgtk$(EXEEXT): msgcomp.pp fpmcgtk.pp $(wildcard frm*.pp)

+ 2 - 1
utils/fppkg/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -3558,5 +3558,6 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpmkunit$(PPUEXT) : fpmkunit.pp fpmkcnst.inc fpmktype$(PPUEXT)
 fpmktype$(PPUEXT) : fpmktype.pp fpmkcnst.inc

+ 1 - 0
utils/fppkg/Makefile.fpc

@@ -35,6 +35,7 @@ fpcdir=../..
 packages=fcl libcurl
 
 [rules]
+.NOTPARALLEL:
 fpmkunit$(PPUEXT) : fpmkunit.pp fpmkcnst.inc fpmktype$(PPUEXT)
 
 fpmktype$(PPUEXT) : fpmktype.pp fpmkcnst.inc

+ 2 - 1
utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -1974,4 +1974,5 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 fpcrp$(EXEEXT): fpcrp.pp comments.pp pexpr.pp pasprep.pp

+ 1 - 0
utils/fprcp/Makefile.fpc

@@ -16,4 +16,5 @@ fpcdir=../..
 
 
 [rules]
+.NOTPARALLEL:
 fpcrp$(EXEEXT): fpcrp.pp comments.pp pexpr.pp pasprep.pp

+ 2 - 1
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -2127,6 +2127,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 ifndef PYACC
 PYACC=$(strip $(wildcard $(addsuffix /pyacc$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(PYACC),)

+ 1 - 0
utils/h2pas/Makefile.fpc

@@ -18,6 +18,7 @@ fpcpackage=y
 fpcdir=../..
 
 [rules]
+.NOTPARALLEL:
 # do we have pyacc?
 ifndef PYACC
 PYACC=$(strip $(wildcard $(addsuffix /pyacc$(EXEEXT),$(SEARCHPATH))))

+ 3 - 0
utils/simulator/Makefile.fpc

@@ -13,3 +13,6 @@ fpcpackage=y
 
 [default]
 fpcdir=../..
+
+[rules]
+.NOTPARALLEL:

+ 2 - 1
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/25]
 #
 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -2374,6 +2374,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
+.NOTPARALLEL:
 pyacc$(EXEEXT): pyacc.pas $(wildcard yacc*.pas)
 	$(COMPILER) pyacc.pas
 plex$(EXEEXT): plex.pas $(wildcard lex*.pas)

+ 1 - 0
utils/tply/Makefile.fpc

@@ -27,6 +27,7 @@ fpcdir=../..
 build=n
 
 [rules]
+.NOTPARALLEL:
 pyacc$(EXEEXT): pyacc.pas $(wildcard yacc*.pas)
         $(COMPILER) pyacc.pas