[Libreoffice-commits] .: oox/Library_oox.mk

2012-03-07 Thread Tor Lillqvist
 oox/Library_oox.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3e8e896c03f88d9855fdcccab9ce6f3cae4ba603
Author: Tor Lillqvist 
Date:   Wed Mar 7 11:41:12 2012 +0200

Need the sfx library for sfx2::isValidNCName()

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 47fdf90..aaf7aa7 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,oox,\
 msfilter \
 sal \
 sax \
+sfx \
 svl \
 svt \
 svxcore \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/Library_oox.mk

2012-01-31 Thread René Engelhard
 oox/Library_oox.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8d2ec1da0449271888d8912306ad8e8a9220c5a2
Author: Rene Engelhard 
Date:   Tue Jan 31 23:57:37 2012 +0100

fix -Os comment in oox/Library_oox.mk

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 6e4b60e..0171b4e 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -41,9 +41,9 @@ $(eval $(call gb_Library_set_include,oox,\
 ))
 
 ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64)
-#Debian Linux ia64 fails at compile time on
-#oox/source/drawingml/customshapepresets*.cxx which are apparently too large
-#for the toolchain to handle with default optimization
+# at least Debian Linux ia64 fails at compile time on
+# link libooxlo.so which is apparently too large
+# for the toolchain to handle with default optimization
 $(eval $(call gb_Library_add_cxxflags,oox,\
 -Os \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/Library_oox.mk

2012-01-31 Thread René Engelhard
 oox/Library_oox.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 95c826237d264457b77f3c6f782bc5665897c411
Author: Rene Engelhard 
Date:   Tue Jan 31 21:26:50 2012 +0100

add missed ifeq to check for IA64...

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a8244ac..089605d 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,9 +40,11 @@ $(eval $(call gb_Library_set_include,oox,\
 -I$(realpath $(SRCDIR)/oox/inc) \
 ))
 
+ifeq ($(CPUNAME),IA64)
 $(eval $(call gb_Library_add_cxxflags,oox,\
 -Os \
 ))
+endif
 
 $(eval $(call gb_Library_add_defs,oox,\
 -DOOX_DLLIMPLEMENTATION \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/Library_oox.mk writerfilter/source

2012-01-23 Thread Miklos Vajna
 oox/Library_oox.mk   |2 +-
 writerfilter/source/Makefile |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f908fc4ca5bb7ae6d779df4239510fb0a0b84635
Author: Bapt 
Date:   Mon Jan 23 11:09:39 2012 +0100

use $(GPERF) instead of using gperf from path

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 098d747..f513f9b 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -372,7 +372,7 @@ $(eval $(call gb_Library_set_include,oox,\
 ))
 
 $(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
-   gperf --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep 
-v '^#line' > $@
+   $(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | 
grep -v '^#line' > $@
 
 oox_GenTarget_get_target = $(oox_MISC)/$(1)
 
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index 40f2e25..240893c 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -143,7 +143,7 @@ $(wf_GEN_ooxml_NamespaceIds_hxx) : 
$(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_oox
 $(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) 
$(wf_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,GPF,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) 
$(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)) \
-   | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
+   | tr -d '\r' | $(GPERF) -I -t -E -S1 -c -G -LC++ > $@
 
 $(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) 
$(wf_SRC_ooxml_Model)
$(call gb_Output_announce,$@,build,XSL,1)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/Library_oox.mk

2011-10-06 Thread Radek Doulík
 oox/Library_oox.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 39160c1044ef2189a76b9c17496f5024312e7458
Author: Radek Doulik 
Date:   Thu Oct 6 15:08:23 2011 +0200

added new source files to the .mk file

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 8de35c9..52d7dda 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -125,7 +125,12 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/drawingml/color \
 oox/source/drawingml/connectorshapecontext \
 oox/source/drawingml/customshapegeometry \
-oox/source/drawingml/customshapepresets \
+oox/source/drawingml/customshapepresets1 \
+oox/source/drawingml/customshapepresets2 \
+oox/source/drawingml/customshapepresets3 \
+oox/source/drawingml/customshapepresets4 \
+oox/source/drawingml/customshapepresets5 \
+oox/source/drawingml/customshapepresets6 \
 oox/source/drawingml/customshapeproperties \
 oox/source/drawingml/diagram/constraintlistcontext \
 oox/source/drawingml/diagram/datamodelcontext \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits