You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2015/08/31 19:03:05 UTC
svn commit: r1700277 - in /openoffice/trunk/main/slideshow: prj/build.lst
test/makefile.mk
Author: damjan
Date: Mon Aug 31 17:03:04 2015
New Revision: 1700277
URL: http://svn.apache.org/r1700277
Log:
Correct the dependencies for main/slideshow tests which sometimes breaks the build,
as if util isn't built before test libslideshow.so is unavailable to link with.
Also don't include the gtest main() function for the demoshow "test"; it doesn't
link even with this patch but at least it doesn't complain about missing gtest
APIs but only about a missing main().
Modified:
openoffice/trunk/main/slideshow/prj/build.lst
openoffice/trunk/main/slideshow/test/makefile.mk
Modified: openoffice/trunk/main/slideshow/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/prj/build.lst?rev=1700277&r1=1700276&r2=1700277&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/prj/build.lst (original)
+++ openoffice/trunk/main/slideshow/prj/build.lst Mon Aug 31 17:03:04 2015
@@ -9,4 +9,4 @@ pe slideshow\source\engine\transitions
pe slideshow\source\engine\animationnodes nmake - all pe_animationnodes pe_inc NULL
pe slideshow\source\engine\activities nmake - all pe_activities pe_inc NULL
pe slideshow\util nmake - all pe_util pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_engine NULL
-pe slideshow\test nmake - all pe_test pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_engine pe_inc NULL
+pe slideshow\test nmake - all pe_test pe_util pe_inc NULL
Modified: openoffice/trunk/main/slideshow/test/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/makefile.mk?rev=1700277&r1=1700276&r2=1700277&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/makefile.mk (original)
+++ openoffice/trunk/main/slideshow/test/makefile.mk Mon Aug 31 17:03:04 2015
@@ -76,8 +76,7 @@ APP1TEST = enabled
# BEGIN target2 --------------------------------------------------------
APP2OBJS= \
- $(SLO)$/demoshow.obj \
- $(SLO)$/main.obj
+ $(SLO)$/demoshow.obj
APP2TARGET= demoshow
APP2STDLIBS=$(TOOLSLIB) \