Index: dmake/Makefile.am =================================================================== RCS file: /cvs/tools/dmake/Makefile.am,v retrieving revision 1.11.12.1 diff -u -r1.11.12.1 Makefile.am --- dmake/Makefile.am 11 Nov 2007 23:05:48 -0000 1.11.12.1 +++ dmake/Makefile.am 28 Nov 2007 04:04:34 -0000 @@ -62,7 +62,7 @@ dmake_SOURCES += win95/dchdir.c win95/switchar.c \ msdos/dstrlwr.c msdos/arlib.c \ msdos/dirbrk.c unix/runargv.c \ - msdos/rmprq.c \ + unix/rmprq.c \ win95/microsft/ruletab.c INCLUDES += -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I$(top_srcdir)/@OS_TYPE@ endif Index: dmake/Makefile.in =================================================================== RCS file: /cvs/tools/dmake/Makefile.in,v retrieving revision 1.14.12.1 diff -u -r1.14.12.1 Makefile.in --- dmake/Makefile.in 11 Nov 2007 23:05:48 -0000 1.14.12.1 +++ dmake/Makefile.in 28 Nov 2007 04:04:34 -0000 @@ -18,9 +18,9 @@ # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: Makefile.in,v $ +# $RCSfile: Makefile.am,v $ # -# $Revision: 1.14.12.1 $ +# $Revision: 1.11.12.1 $ # # last change: $Author: vq $ $Date: 2007/11/11 23:05:48 $ # @@ -83,7 +83,7 @@ @OSTYPEWIN32_TRUE@am__append_4 = win95/dchdir.c win95/switchar.c \ @OSTYPEWIN32_TRUE@ msdos/dstrlwr.c msdos/arlib.c \ @OSTYPEWIN32_TRUE@ msdos/dirbrk.c unix/runargv.c \ -@OSTYPEWIN32_TRUE@ msdos/rmprq.c \ +@OSTYPEWIN32_TRUE@ unix/rmprq.c \ @OSTYPEWIN32_TRUE@ win95/microsft/ruletab.c @OSTYPEWIN32_TRUE@am__append_5 = -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I$(top_srcdir)/@OS_TYPE@ @@ -112,8 +112,7 @@ function.c dbug/dbug/dbug.c unix/arlib.c unix/dcache.c \ unix/dirbrk.c unix/rmprq.c unix/ruletab.c unix/runargv.c \ unix/tempnam.c win95/dchdir.c win95/switchar.c msdos/dstrlwr.c \ - msdos/arlib.c msdos/dirbrk.c msdos/rmprq.c \ - win95/microsft/ruletab.c + msdos/arlib.c msdos/dirbrk.c win95/microsft/ruletab.c am__dirstamp = $(am__leading_dot)dirstamp @DBUG_TRUE@am__objects_1 = dbug/dbug/dbug.$(OBJEXT) @OSTYPEUNIX_TRUE@am__objects_2 = unix/arlib.$(OBJEXT) \ @@ -124,7 +123,7 @@ @OSTYPEWIN32_TRUE@ win95/switchar.$(OBJEXT) \ @OSTYPEWIN32_TRUE@ msdos/dstrlwr.$(OBJEXT) \ @OSTYPEWIN32_TRUE@ msdos/arlib.$(OBJEXT) msdos/dirbrk.$(OBJEXT) \ -@OSTYPEWIN32_TRUE@ unix/runargv.$(OBJEXT) msdos/rmprq.$(OBJEXT) \ +@OSTYPEWIN32_TRUE@ unix/runargv.$(OBJEXT) unix/rmprq.$(OBJEXT) \ @OSTYPEWIN32_TRUE@ win95/microsft/ruletab.$(OBJEXT) am_dmake_OBJECTS = infer.$(OBJEXT) make.$(OBJEXT) stat.$(OBJEXT) \ expand.$(OBJEXT) dmstring.$(OBJEXT) hash.$(OBJEXT) \ @@ -403,8 +402,6 @@ msdos/$(DEPDIR)/$(am__dirstamp) msdos/dirbrk.$(OBJEXT): msdos/$(am__dirstamp) \ msdos/$(DEPDIR)/$(am__dirstamp) -msdos/rmprq.$(OBJEXT): msdos/$(am__dirstamp) \ - msdos/$(DEPDIR)/$(am__dirstamp) win95/microsft/$(am__dirstamp): @$(mkdir_p) win95/microsft @: > win95/microsft/$(am__dirstamp) @@ -423,7 +420,6 @@ -rm -f msdos/arlib.$(OBJEXT) -rm -f msdos/dirbrk.$(OBJEXT) -rm -f msdos/dstrlwr.$(OBJEXT) - -rm -f msdos/rmprq.$(OBJEXT) -rm -f unix/arlib.$(OBJEXT) -rm -f unix/dcache.$(OBJEXT) -rm -f unix/dirbrk.$(OBJEXT) @@ -462,7 +458,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/arlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/dirbrk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/dstrlwr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@msdos/$(DEPDIR)/rmprq.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/arlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/dcache.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@unix/$(DEPDIR)/dirbrk.Po@am__quote@ Index: dmake/msdos/rmprq.c =================================================================== RCS file: /cvs/tools/dmake/msdos/rmprq.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 rmprq.c --- dmake/msdos/rmprq.c 22 Sep 2000 15:33:27 -0000 1.1.1.1 +++ dmake/msdos/rmprq.c 28 Nov 2007 04:04:36 -0000 @@ -25,6 +25,12 @@ -- Use cvs log to obtain detailed change logs. */ +#if defined(USE_CREATEPROCESS) +/* MSVC6.0 and newer and MinGW use the parallel build enabled runargv(). */ +Force a compile-time blowup. +This file should not be used, use unix/rmprq.c instead. +#endif + #include "extern.h" PUBLIC void Index: dmake/win95/microsft/vpp40/mk.bat =================================================================== RCS file: /cvs/tools/dmake/win95/microsft/vpp40/mk.bat,v retrieving revision 1.4.32.1 diff -u -r1.4.32.1 mk.bat --- dmake/win95/microsft/vpp40/mk.bat 12 Nov 2007 00:12:03 -0000 1.4.32.1 +++ dmake/win95/microsft/vpp40/mk.bat 28 Nov 2007 04:04:36 -0000 @@ -32,7 +32,7 @@ rem cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\tempnam.obj tempnam.c cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\ruletab.obj win95\microsft\ruletab.c cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\runargv.obj unix\runargv.c -cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj msdos\rmprq.c +cl -c %c_flg% -I. -Iwin95 -Iwin95\microsft -Iwin95\microsft\vpp40 /nologo -Od -GF -Ge -Foobjects\rmprq.obj unix\rmprq.c :link rem link /nologo /out:dmake.exe @fix95nt\win95\microsft\vpp40\obj.rsp