oox/CustomTarget_generated.mk | 62 ++++++++++++++++++++
oox/Library_oox.mk | 56 +-----------------
oox/Module_oox.mk | 1
oox/Package_generated.mk | 3 -
oox/source/token/Makefile | 126 ------------------------------------------
sc/Library_scfilt.mk | 1
6 files changed, 69 insertions(+), 180 deletions(-)
New commits:
commit d1384b4253325764ea2cf30b7afa86ce27ef418f
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 16:58:46 2012 +0200
sc: fix bogus -I$(WORKDIR)/other_module
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index 25152d2..2af5832 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_Package,oox_generated,$(call
gb_CustomTarget_get_workdi
$(eval $(call
gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
$(eval $(call
gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,inc/oox/token/namespaces.hxx))
+$(eval $(call
gb_Package_add_file,oox_generated,inc/oox/token/properties.hxx,inc/oox/token/properties.hxx))
$(eval $(call
gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt))
# vim: set noet sw=4 ts=4:
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 3d81d71..d582e22 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(SRCDIR)/sc/source/filter/inc \
-I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
- -I$(WORKDIR)/oox/inc \
$$(INCLUDE) \
))
commit d89fe2764c198df405420447952aac81282e151e
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 15:18:14 2012 +0200
oox: remove duplicate custom makefile from writerfilter10
diff --git a/oox/source/token/Makefile b/oox/source/token/Makefile
deleted file mode 100644
index cdd94e7..0000000
--- a/oox/source/token/Makefile
+++ /dev/null
@@ -1,126 +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.
-#
-#*************************************************************************
-
-# generate source and header files from text files ----------------------------
-
-SRCDIR_TOKEN := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-WORKDIR_TOKEN := .
-
-include $(GBUILDDIR)/Output.mk
-include $(GBUILDDIR)/BuildDirs.mk
-include $(GBUILDDIR)/Helper.mk
-
-# XML namespace identifiers and names
-
-$(WORKDIR_TOKEN)/namespaces.hxx : $(SRCDIR_TOKEN)/namespaces.hxx.head
$(WORKDIR_TOKEN)/namespaceids.inc $(SRCDIR_TOKEN)/namespaces.hxx.tail
- $(call gb_Output_announce,$@,build,CAT,1)
- $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
-
-$(WORKDIR_TOKEN)/namespaceids.inc : $(SRCDIR_TOKEN)/namespaces.txt
$(SRCDIR_TOKEN)/namespaces.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 1 <
$< > $@ \
- )
-
-$(WORKDIR_TOKEN)/namespacenames.inc : $(SRCDIR_TOKEN)/namespaces.txt
$(SRCDIR_TOKEN)/namespaces.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 2 <
$< > $@ \
- )
-
-$(WORKDIR_TOKEN)/namespaces.txt : $(SRCDIR_TOKEN)/namespaces.txt
$(SRCDIR_TOKEN)/namespaces.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 3 <
$< > $@ \
- )
-
-# XML token identifiers and names
-
-$(WORKDIR_TOKEN)/tokens.hxx : $(SRCDIR_TOKEN)/tokens.hxx.head
$(WORKDIR_TOKEN)/tokenids.inc $(SRCDIR_TOKEN)/tokens.hxx.tail
- $(call gb_Output_announce,$@,build,CAT,1)
- $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
-
-$(WORKDIR_TOKEN)/tokenids.inc : $(SRCDIR_TOKEN)/tokens.txt
$(SRCDIR_TOKEN)/tokens.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 1 < $<
> $@ \
- )
-
-$(WORKDIR_TOKEN)/tokennames.inc : $(SRCDIR_TOKEN)/tokens.txt
$(SRCDIR_TOKEN)/tokens.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 2 < $<
> $@ \
- )
-
-$(WORKDIR_TOKEN)/tokenhash.inc : $(WORKDIR_TOKEN)/tokenhash.gperf
- $(call gb_Output_announce,$@,build,GPF,3)
- $(call gb_Helper_abbreviate_dirs, \
- gperf $< | $(gb_AWK) -- '{ if ($$0 !~ /^#line/){
gsub("\\(char\\*\\)0", "0", $$0); print; } }' > $@ \
- )
-
-$(WORKDIR_TOKEN)/tokenhash.gperf : $(SRCDIR_TOKEN)/tokens.txt
$(SRCDIR_TOKEN)/tokens.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 3 < $<
> $@ \
- )
-
-# UNO property identifiers and names
-
-$(WORKDIR_TOKEN)/properties.hxx : $(SRCDIR_TOKEN)/properties.hxx.head
$(WORKDIR_TOKEN)/propertyids.inc $(SRCDIR_TOKEN)/properties.hxx.tail
- $(call gb_Output_announce,$@,build,CAT,1)
- $(call gb_Helper_abbreviate_dirs,cat $^ > $@)
-
-$(WORKDIR_TOKEN)/propertyids.inc : $(SRCDIR_TOKEN)/properties.txt
$(SRCDIR_TOKEN)/properties.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 1 <
$< > $@ \
- )
-
-$(WORKDIR_TOKEN)/propertynames.inc : $(SRCDIR_TOKEN)/properties.txt
$(SRCDIR_TOKEN)/properties.pl
- $(call gb_Output_announce,$@,build,PRL,1)
- $(call gb_Helper_abbreviate_dirs, \
- mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 2 <
$< > $@ \
- )
-
-.DEFAULT_GOAL:=all
-.PHONY: all
-all : \
- namespaces.hxx \
- namespaceids.inc \
- namespacenames.inc \
- namespaces.txt \
- tokens.hxx \
- tokenids.inc \
- tokennames.inc \
- tokenhash.inc \
- tokenhash.gperf \
- properties.hxx \
- propertyids.inc \
- propertynames.inc \
-
-
-# vim: set noet sw=4 ts=4:
commit 14a57d9c8b6296997907513877c72cde60ee724d
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 14:56:47 2012 +0200
oox: generate vmlexport-shape-types into CustomTarget dir
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index c2ad511..bcdd5ef 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -9,7 +9,12 @@
$(eval $(call gb_CustomTarget_CustomTarget,oox/generated))
-$(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : \
+oox_SRC := $(SRCDIR)/oox/source/token
+oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc
+oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc
+oox_GENHEADERPATH := $(oox_INC)/oox/token
+
+$(oox_MISC)/vmlexport-shape-types.cxx : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
@@ -17,11 +22,6 @@ $(call
gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : \
mkdir -p $(dir $@)
perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
-oox_SRC := $(SRCDIR)/oox/source/token
-oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc
-oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc
-oox_GENHEADERPATH := $(oox_INC)/oox/token
-
$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
$(call gb_Output_announce,$@,build,GPF,1)
$(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' |
grep -v '^#line' > $@
@@ -49,7 +49,7 @@ $(eval $(call oox_GenTarget,properties,property,))
$(eval $(call oox_GenTarget,tokens,token,tokenhash.gperf))
$(call gb_CustomTarget_get_target,oox/generated) : \
- $(call
gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) \
+ $(oox_MISC)/vmlexport-shape-types.cxx \
$(oox_INC)/tokenhash.inc \
$(oox_INC)/tokennames.inc \
$(oox_INC)/namespacenames.inc \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 8f25d9f..2301fd7 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -291,7 +291,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
))
$(eval $(call gb_Library_add_generated_exception_objects,oox,\
- oox/source/export/vmlexport-shape-types \
+ CustomTarget/oox/generated/misc/vmlexport-shape-types \
))
# vim: set noet sw=4 ts=4:
commit 549f0f50b03883bb56a5c20dca2decd57083eafa
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 14:45:45 2012 +0200
oox: add some bling so we can see what takes so long
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 55d4ca1..c2ad511 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -13,6 +13,7 @@ $(call
gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
+ $(call gb_Output_announce,$@,build,PRL,1)
mkdir -p $(dir $@)
perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
@@ -22,6 +23,7 @@ oox_INC := $(call
gb_CustomTarget_get_workdir,oox/generated)/inc
oox_GENHEADERPATH := $(oox_INC)/oox/token
$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
+ $(call gb_Output_announce,$@,build,GPF,1)
$(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' |
grep -v '^#line' > $@
oox_GenTarget_get_target = $(oox_MISC)/$(1)
@@ -33,6 +35,7 @@ $(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc
$(oox_INC)/$(2)names.inc \
$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt
\
$(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
+ $$(call gb_Output_announce,$$@,build,PRL,1)
mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc \
$(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \
commit e1759e1ce14058a2c132a3ed574882917d550a6d
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 14:25:05 2012 +0200
oox: move generated stuff to custom target
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
new file mode 100644
index 0000000..55d4ca1
--- /dev/null
+++ b/oox/CustomTarget_generated.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Copyright 2012 LibreOffice contributors.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,oox/generated))
+
+$(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) : \
+
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
+ $(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \
+ $(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
+ mkdir -p $(dir $@)
+ perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
+
+oox_SRC := $(SRCDIR)/oox/source/token
+oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc
+oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc
+oox_GENHEADERPATH := $(oox_INC)/oox/token
+
+$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
+ $(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' |
grep -v '^#line' > $@
+
+oox_GenTarget_get_target = $(oox_MISC)/$(1)
+
+define oox_GenTarget
+$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc
\
+ $(if $(3),$(oox_MISC)/$(3)) : $(call
oox_GenTarget_get_target,$(1))
+ @touch $$@
+
+$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt
\
+ $(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
+ mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
+ perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc \
+ $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \
+ && cat $(oox_SRC)/$(1).hxx.head $(oox_MISC)/$(2)ids.inc \
+ $(oox_SRC)/$(1).hxx.tail >
$(oox_GENHEADERPATH)/$(1).hxx \
+ && touch $$@
+endef
+
+$(eval $(call oox_GenTarget,namespaces,namespace,namespaces.txt))
+$(eval $(call oox_GenTarget,properties,property,))
+$(eval $(call oox_GenTarget,tokens,token,tokenhash.gperf))
+
+$(call gb_CustomTarget_get_target,oox/generated) : \
+ $(call
gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) \
+ $(oox_INC)/tokenhash.inc \
+ $(oox_INC)/tokennames.inc \
+ $(oox_INC)/namespacenames.inc \
+ $(oox_INC)/propertynames.inc \
+ $(oox_GENHEADERPATH)/tokens.hxx \
+ $(oox_GENHEADERPATH)/namespaces.hxx \
+ $(oox_GENHEADERPATH)/properties.hxx \
+ $(oox_MISC)/namespaces.txt \
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 778a56e..8f25d9f 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -33,9 +33,12 @@ $(eval $(call gb_Library_use_packages,oox,\
oox_tokens \
))
+$(eval $(call gb_Library_use_custom_headers,oox,oox/generated))
+
$(eval $(call gb_Library_set_include,oox,\
$$(INCLUDE) \
-I$(SRCDIR)/oox/inc \
+ -I$(call gb_CustomTarget_get_workdir,oox/generated)/inc \
))
ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64)
@@ -291,45 +294,4 @@ $(eval $(call
gb_Library_add_generated_exception_objects,oox,\
oox/source/export/vmlexport-shape-types \
))
-$(call gb_GenCxxObject_get_source,oox/source/export/vmlexport-shape-types) :
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl
$(SRCDIR)/oox/source/export/presetShapeDefinitions.xml
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
- mkdir -p $(dir $@)
- perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
-
-oox_SRC := $(SRCDIR)/oox/source/token
-oox_MISC := $(WORKDIR)/oox/misc
-oox_INC := $(WORKDIR)/oox/inc
-oox_GENHEADERPATH := $(oox_INC)/oox/token
-
-$(call gb_CxxObject_get_target,oox/source/token/tokenmap) :
$(oox_INC)/tokenhash.inc
-
-$(eval $(call gb_Library_set_include,oox,\
- $$(INCLUDE) \
- -I$(oox_INC) \
-))
-
-$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
- $(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' |
grep -v '^#line' > $@
-
-oox_GenTarget_get_target = $(oox_MISC)/$(1)
-
-define oox_GenTarget_GenTarget
-$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc
$(if $(3),$(oox_MISC)/$(3)) : $(call oox_GenTarget_get_target,$(1))
- @touch $$@
-$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt
$(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
- mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
- perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc
$(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \
- && cat $(oox_SRC)/$(1).hxx.head $(oox_MISC)/$(2)ids.inc
$(oox_SRC)/$(1).hxx.tail > $(oox_GENHEADERPATH)/$(1).hxx \
- && touch $$@
-endef
-
-$(eval $(call oox_GenTarget_GenTarget,namespaces,namespace,namespaces.txt))
-$(eval $(call oox_GenTarget_GenTarget,properties,property,))
-$(eval $(call oox_GenTarget_GenTarget,tokens,token,tokenhash.gperf))
-
-$(call gb_Library_get_clean_target,oox) : oox_clean
-
-oox_clean :
- rm -rf $(WORKDIR)/oox
-.PHONY: oox_clean
-
# vim: set noet sw=4 ts=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 538b36a..13da5fd 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -28,6 +28,7 @@
$(eval $(call gb_Module_Module,oox))
$(eval $(call gb_Module_add_targets,oox,\
+ CustomTarget_generated \
Library_oox \
Package_inc \
Package_generated \
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index 75138ea..25152d2 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Package_Package,oox_generated,$(WORKDIR)/oox))
+$(eval $(call gb_Package_Package,oox_generated,$(call
gb_CustomTarget_get_workdir,oox/generated)))
$(eval $(call
gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx))
$(eval $(call
gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,inc/oox/token/namespaces.hxx))
commit 70616e479a044dd47114506cdcbb14e435440d7a
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 13:24:56 2012 +0200
oox: this rule needs a command
Make doesn't consider targets that depend on this outdated when there is
no command to update it.
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 5574534..778a56e 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -314,6 +314,7 @@ oox_GenTarget_get_target = $(oox_MISC)/$(1)
define oox_GenTarget_GenTarget
$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc
$(if $(3),$(oox_MISC)/$(3)) : $(call oox_GenTarget_get_target,$(1))
+ @touch $$@
$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt
$(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc
$(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \
commit 1751a8ea5e623f54325f4ff29cf5e166f81e40fc
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 13:20:32 2012 +0200
oox: can't see why we need these deps
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index e063290..5574534 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -300,16 +300,6 @@ oox_MISC := $(WORKDIR)/oox/misc
oox_INC := $(WORKDIR)/oox/inc
oox_GENHEADERPATH := $(oox_INC)/oox/token
-# these three generated headers are included from just about everywhere--might
-# just as well make them before everything else...
-$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/namespaces.hxx
-$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/properties.hxx
-$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/tokens.hxx
-$(call gb_Package_get_target,oox_inc) : $(call
gb_Package_get_target,oox_tokens)
-$(call gb_Package_get_target,oox_inc) : $(call
gb_Package_get_target,oox_generated)
-
-
-
$(call gb_CxxObject_get_target,oox/source/token/tokenmap) :
$(oox_INC)/tokenhash.inc
$(eval $(call gb_Library_set_include,oox,\
commit 64bf82e3ba48984d56159219027ebd6f10716741
Author: Michael Stahl <mst...@redhat.com>
Date: Thu May 24 13:16:10 2012 +0200
oox; there is no oox_source package
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index ce93130..e063290 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,oox))
$(eval $(call gb_Library_use_packages,oox,\
oox_inc \
oox_generated \
- oox_source \
oox_tokens \
))
@@ -306,7 +305,7 @@ oox_GENHEADERPATH := $(oox_INC)/oox/token
$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/namespaces.hxx
$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/properties.hxx
$(call gb_Package_get_target,oox_inc) : $(oox_GENHEADERPATH)/tokens.hxx
-$(call gb_Package_get_target,oox_inc) : $(call
gb_Package_get_target,oox_source)
+$(call gb_Package_get_target,oox_inc) : $(call
gb_Package_get_target,oox_tokens)
$(call gb_Package_get_target,oox_inc) : $(call
gb_Package_get_target,oox_generated)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
