[Libreoffice-commits] .: 2 commits - writerfilter/CustomTarget_source.mk writerfilter/debug_setup.mk writerfilter/Library_writerfilter.mk writerfilter/source

[Matus Kukan]

 writerfilter/CustomTarget_source.mk  |    4 +-
 writerfilter/Library_writerfilter.mk |   18 +++++++++--
 writerfilter/debug_setup.mk          |   17 ----------
 writerfilter/source/generated.mk     |   55 -----------------------------------
 4 files changed, 17 insertions(+), 77 deletions(-)

New commits:
commit 951ed65898208a7597c813141ed160716708d348
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jun 14 10:12:00 2012 +0200

    writerfilter: two more dependencies
    
    Change-Id: I97491c61ef83f947e1923785300490f3b7920203

diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index b039bcd..fc29784 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -149,7 +149,7 @@ $(writerfilter_GEN_ooxml_FactoryValues_hxx) : $(writerfilter_SRC_ooxml_FactoryVa
 	$(call gb_Output_announce,$@,build,XSL,1)
 	$(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
 
-$(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml)
+$(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml) | $(writerfilter_WORK)/ooxml/.dir
 	$(call gb_Output_announce,$@,build,XSL,1)
 	$(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml)) > $@
 
@@ -166,7 +166,7 @@ $(writerfilter_GEN_ooxml_Model_processed) : $(writerfilter_GEN_ooxml_Namespacesm
 	$(call gb_Output_announce,$@,build,XSL,1)
 	$(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_SRC_ooxml_Model)) > $@
 
-$(writerfilter_GEN_ooxml_NamespaceIds_hxx) : $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)
+$(writerfilter_GEN_ooxml_NamespaceIds_hxx) : $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed) | $(writerfilter_WORK)/ooxml/.dir
 	$(call gb_Output_announce,$@,build,XSL,1)
 	$(call gb_Helper_abbreviate_dirs, $(gb_XSLTPROC) $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
 
commit c65225a71bacc45d0cb54cac1edb9b22588d7468
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Jun 14 09:49:36 2012 +0200

    writerfilter: remove unused / unneeded .mk files
    
    Change-Id: Ic64e3e527ced7fcf81f90075bae7d8a646789d4e

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 09d8587..2efffc3 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -25,8 +25,6 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(SRCDIR)/writerfilter/debug_setup.mk
-
 $(eval $(call gb_Library_Library,writerfilter))
 
 $(eval $(call gb_Library_use_custom_headers,writerfilter,\
@@ -52,7 +50,21 @@ $(eval $(call gb_Library_add_defs,writerfilter,\
 	-DWRITERFILTER_RESOURCEMODEL_DLLIMPLEMENTATION \
 	-DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \
 	-DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
-	$(writerfilter_debug_flags) \
+	$(if $(filter-out 0 1,$(gb_DEBUGLEVEL)), \
+		-DDEBUG_DOMAINMAPPER \
+		-DDEBUG_ELEMENT \
+		-DDEBUG_RESOLVE \
+		-DDEBUG_CONTEXT_STACK \
+		-DDEBUG_ATTRIBUTES \
+		-DDEBUG_PROPERTIES \
+		-DDEBUG_CONTEXT_HANDLER \
+		-DDEBUG_IMPORT \
+		-DDEBUG_LOGGING \
+		-DDEBUG_DMAPPER_PROPERTY_MAP \
+		-DDEBUG_DMAPPER_TABLE_HANDLER \
+		-DDEBUG_TABLE \
+		-DDEBUG_DMAPPER_SETTINGS_TABLE \
+	) \
 ))
 
 $(eval $(call gb_Library_use_libraries,writerfilter,\
diff --git a/writerfilter/debug_setup.mk b/writerfilter/debug_setup.mk
deleted file mode 100644
index 95681da..0000000
--- a/writerfilter/debug_setup.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-define writerfilter_debug_flags
-$(if $(filter-out 0 1,$(strip $(gb_DEBUGLEVEL))),\
-    -DDEBUG_DOMAINMAPPER \
-    -DDEBUG_ELEMENT \
-    -DDEBUG_RESOLVE \
-    -DDEBUG_CONTEXT_STACK \
-    -DDEBUG_ATTRIBUTES \
-    -DDEBUG_PROPERTIES \
-    -DDEBUG_CONTEXT_HANDLER \
-    -DDEBUG_IMPORT \
-    -DDEBUG_LOGGING \
-    -DDEBUG_DMAPPER_PROPERTY_MAP \
-    -DDEBUG_DMAPPER_TABLE_HANDLER \
-    -DDEBUG_TABLE \
-    -DDEBUG_DMAPPER_SETTINGS_TABLE \
-)
-endef
diff --git a/writerfilter/source/generated.mk b/writerfilter/source/generated.mk
deleted file mode 100644
index 39895d5..0000000
--- a/writerfilter/source/generated.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2009 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# this namespace list is needed both in the library and the custom makefile
-WRITERFILTER_OOXMLNAMESPACES= \
-	wml \
-	dml-stylesheet \
-	dml-styleDefaults \
-	dml-shape3DLighting \
-	dml-shape3DScene \
-	dml-shape3DStyles \
-	dml-shape3DCamera \
-	dml-baseStylesheet \
-	dml-textCharacter \
-	dml-shapeEffects \
-	dml-shapeLineProperties \
-	dml-shapeProperties \
-	dml-baseTypes \
-	dml-documentProperties \
-	dml-graphicalObject \
-	dml-shapeGeometry \
-	dml-wordprocessingDrawing \
-	sml-customXmlMappings \
-	shared-math \
-	shared-relationshipReference \
-	dml-chartDrawing \
-	vml-main \
-	vml-officeDrawing \
-	vml-wordprocessingDrawing \
-
-