From dd9cab44a454bc167f87832da7a07a6d448c2cb8 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 24 Jan 2008 15:02:30 +0000
Subject: [PATCH] INTEGRATION: CWS xf02bigcleanup (1.9.4); FILE MERGED
 2008/01/23 10:37:02 hbrinkm 1.9.4.2: #i85380# do not use directories as
 prerequisites of rules 2008/01/22 21:19:46 fridrich_strba 1.9.4.1: trying to
 make writerfilter parallel-build safe

---
 writerfilter/source/ooxml/makefile.mk | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
index 2b21e6b89275..66ad4fa044ce 100644
--- a/writerfilter/source/ooxml/makefile.mk
+++ b/writerfilter/source/ooxml/makefile.mk
@@ -4,9 +4,9 @@
 #
 #  $RCSfile: makefile.mk,v $
 #
-#  $Revision: 1.9 $
+#  $Revision: 1.10 $
 #
-#  last change: $Author: obo $ $Date: 2008-01-10 12:12:24 $
+#  last change: $Author: vg $ $Date: 2008-01-24 16:02:30 $
 #
 #  The Contents of this file are made available subject to
 #  the terms of GNU Lesser General Public License Version 2.1.
@@ -124,6 +124,7 @@ test:
 
 OOXMLCXXOUTDIR=$(MISC)
 OOXMLHXXOUTDIR=$(INCCOM)/ooxml
+OOXMLHXXOUTDIRCREATED=$(OOXMLHXXOUTDIR)/created
 
 OOXMLFASTRESOURCECXXS=$(OOXMLCXXOUTDIR)$/OOXMLfastresources_{$(NAMESPACES)}.cxx
 OOXMLFASTRESOURCEHXXS=$(OOXMLHXXOUTDIR)$/OOXMLfastresources_{$(NAMESPACES)}.hxx
@@ -174,10 +175,11 @@ XSLTPROC=xsltproc
 $(MODELPROCESSED): $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) $(OOXMLRESOURCESTOOLSXSL)
     $(XSLTPROC) $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) > $@
 
-$(OOXMLHXXOUTDIR):
-    $(MKDIRHIER) $@
+$(OOXMLHXXOUTDIRCREATED):
+    $(MKDIRHIER) $(OOXMLHXXOUTDIR)
+    $(TOUCH) $@
 
-$(OOXMLGENHEADERS): $(OOXMLHXXOUTDIR)
+$(OOXMLGENHEADERS): $(OOXMLHXXOUTDIRCREATED)
 
 $(OOXMLFASTTOKENSHXX): $(OOXMLFASTTOKENSXSL) $(MODELPROCESSED)
     $(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(MODELPROCESSED) > $@
@@ -204,7 +206,7 @@ $(OOXMLVALUESHXX): $(OOXMLVALUESXSL) $(MODELPROCESSED)
 $(OOXMLVALUESCXX): $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) $(OOXMLFASTRESOURCESHXX)
     $(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@
 
-$(OOXMLRESOURCEIDSHXX):  $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
+$(OOXMLRESOURCEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
     $(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
 
 $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
@@ -214,17 +216,12 @@ $(SLOFASTNAMESPACES): $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
 
 $(GENERATEDFILES): $(OOXMLRESOURCESTOOLSXSL)
 
+$(SLOFILES): $(OOXMLGENHEADERS)
+
 $(SLO)/OOXMLfastresources.obj: $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
 
 $(SLO)/OOXMLvalues.obj: $(OOXMLVALUESCXX) $(OOXMLVALUESHXX)
 
-$(SLO)$/OOXMLDocumentImpl.obj: $(OOXMLGENHEADERS)
-$(SLO)$/OOXMLPropertySetImpl.obj: $(OOXMLGENHEADERS)
-$(SLO)$/OOXMLStreamImpl.obj: $(OOXMLGENHEADERS)
-$(SLO)$/OOXMLFastDocumentHandler.obj: $(OOXMLGENHEADERS)
-$(SLO)$/OOXMLFastTokenHandler.obj: $(OOXMLGENHEADERS)
-$(SLO)$/Handler.obj: $(OOXMLGENHEADERS)
-
 $(SLOFASTNAMESPACES): OOXMLFastHelper.hxx
 
 .PHONY: genclean genmake genheaders