Author: arist
Date: Thu Nov 15 00:02:23 2012
New Revision: 1409582
URL: http://svn.apache.org/viewvc?rev=1409582&view=rev
Log:
gnumake4_131_d0e98479a69a.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1302888426 0
# Node ID d0e98479a69a509bdd5a3ec48dddff0700b123a2
# Parent 8f3bb53e08ce3f6db728abf38cb567d185693379
gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in gnumake4
Modified:
incubator/ooo/branches/gbuild/main/oox/Library_oox.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
incubator/ooo/branches/gbuild/main/writerfilter/JunitTest_writerfilter_complex.mk
incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter.mk
incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter_debug.mk
incubator/ooo/branches/gbuild/main/writerfilter/Module_writerfilter.mk
Modified: incubator/ooo/branches/gbuild/main/oox/Library_oox.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/oox/Library_oox.mk?rev=1409582&r1=1409581&r2=1409582&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/oox/Library_oox.mk (original)
+++ incubator/ooo/branches/gbuild/main/oox/Library_oox.mk Thu Nov 15 00:02:23
2012
@@ -45,8 +45,7 @@ $(eval $(call gb_Library_set_include,oox
$$(INCLUDE) \
))
-$(eval $(call gb_Library_set_defs,oox,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,oox,\
-DOOX_DLLIMPLEMENTATION \
))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk?rev=1409582&r1=1409581&r2=1409582&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CppunitTest.mk Thu Nov 15
00:02:23 2012
@@ -55,8 +55,7 @@ endef
define gb_CppunitTest__CppunitTest_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
-$(call gb_LinkTarget_set_defs,$(2),\
- $$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
$(gb_CppunitTest_DEFS) \
)
$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
Modified:
incubator/ooo/branches/gbuild/main/writerfilter/JunitTest_writerfilter_complex.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/JunitTest_writerfilter_complex.mk?rev=1409582&r1=1409581&r2=1409582&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/writerfilter/JunitTest_writerfilter_complex.mk
(original)
+++
incubator/ooo/branches/gbuild/main/writerfilter/JunitTest_writerfilter_complex.mk
Thu Nov 15 00:02:23 2012
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex))
+$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
$$(DEFS) \
Modified:
incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter.mk?rev=1409582&r1=1409581&r2=1409582&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter.mk
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter.mk Thu
Nov 15 00:02:23 2012
@@ -51,8 +51,7 @@ $(eval $(call gb_Library_set_include,wri
-I$(SRCDIR)/writerfilter/source/ooxml \
))
-$(eval $(call gb_Library_set_defs,writerfilter,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,writerfilter,\
-DWRITERFILTER_DLLIMPLEMENTATION \
))
Modified:
incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter_debug.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter_debug.mk?rev=1409582&r1=1409581&r2=1409582&view=diff
==============================================================================
---
incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter_debug.mk
(original)
+++
incubator/ooo/branches/gbuild/main/writerfilter/Library_writerfilter_debug.mk
Thu Nov 15 00:02:23 2012
@@ -37,10 +37,6 @@ $(eval $(call gb_Library_set_include,wri
-I$(SRCDIR)/writerfilter/inc \
))
-$(eval $(call gb_Library_set_defs,writerfilter_debug,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\
writerfilter \
comphelper \
Modified: incubator/ooo/branches/gbuild/main/writerfilter/Module_writerfilter.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/writerfilter/Module_writerfilter.mk?rev=1409582&r1=1409581&r2=1409582&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/writerfilter/Module_writerfilter.mk
(original)
+++ incubator/ooo/branches/gbuild/main/writerfilter/Module_writerfilter.mk Thu
Nov 15 00:02:23 2012
@@ -34,12 +34,12 @@ $(eval $(call gb_Module_add_targets,writ
Library_writerfilter_debug \
))
-# does not build
+ifeq ($(WITH_CPPUNIT),YES)
$(eval $(call gb_Module_add_check_targets,writerfilter,\
CppunitTest_writerfilter_doctok \
))
+endif
-# does not run
$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
JunitTest_writerfilter_complex \
))
