Author: damjan
Date: Mon Mar 14 17:33:57 2016
New Revision: 1734974
URL: http://svn.apache.org/viewvc?rev=1734974&view=rev
Log:
Merge from branches/gbuild:
* r1409586: gnumake4: vbahelper: link svxcore
* r1409584: gnumake4: svx: fix dependency
* r1409582: gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in
gnumake4
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 17:33:57 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409579,1409592,1409598-1409600,1409602,1409604-1409605
+/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586,1409592,1409598-1409600,1409602,1409604-1409605
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk?rev=1734974&r1=1734973&r2=1734974&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/GoogleTest.mk
Mon Mar 14 17:33:57 2016
@@ -55,6 +55,9 @@ endef
define gb_GoogleTest__GoogleTest_impl
$(call gb_LinkTarget_LinkTarget,$(2))
$(call gb_LinkTarget_set_targettype,$(2),GoogleTest)
+$(call gb_LinkTarget_add_defs,$(2),\
+ $(gb_GoogleTest_DEFS) \
+)
$(call gb_LinkTarget_add_linked_libs,$(2),gtest)
$(call gb_GoogleTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_GoogleTest_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_target,$(2))
Modified: openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk?rev=1734974&r1=1734973&r2=1734974&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/svx/Library_svxcore.mk Mon
Mar 14 17:33:57 2016
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_Library,svxcore
$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
-$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
$(eval $(call gb_Library_add_package_headers,svxcore,\
svx_inc \
Modified:
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk?rev=1734974&r1=1734973&r2=1734974&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/vbahelper/Library_vbahelper.mk
Mon Mar 14 17:33:57 2016
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_add_linked_libs
stl \
svl \
svt \
+ svxcore \
ootk \
tl \
utl \
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk?rev=1734974&r1=1734973&r2=1734974&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
Mon Mar 14 17:33:57 2016
@@ -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,\
# GoogleTest_writerfilter_doctok \
#))
+endif
-# does not run
$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
JunitTest_writerfilter_complex \
))
