[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cppu/prj slideshow/prj slideshow/test

[Damjan Jovanovic]

 cppu/prj/build.lst         |    2 +-
 slideshow/prj/build.lst    |    2 +-
 slideshow/test/makefile.mk |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit d21473e4a17b02d438b816bce689e327c27594fe
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Aug 31 17:35:25 2015 +0000

    Fix main/cppu/prj/build.lst dependencies for tests.

diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst
index 2a290d8..675451b 100644
--- a/cppu/prj/build.lst
+++ b/cppu/prj/build.lst
@@ -10,4 +10,4 @@ cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
 cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
 cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
 cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
-cu	cppu\qa				nmake	-	all	cu_qa cu_inc cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
+cu	cppu\qa							nmake	-	all	cu_qa cu_util cu_inc NULL
commit 4c4aa185f344bc3037edc42a80ab795fbdbd3dbc
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Aug 31 17:03:04 2015 +0000

    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().

diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index 1de7506..d3db04a 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -9,4 +9,4 @@ pe	slideshow\source\engine\transitions		nmake	-	all	pe_transitions pe_inc NULL
 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
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
index c9b6622..32b2a50 100644
--- a/slideshow/test/makefile.mk
+++ b/slideshow/test/makefile.mk
@@ -76,8 +76,7 @@ APP1TEST = enabled
 
 # BEGIN target2 --------------------------------------------------------
 APP2OBJS=  \
-    $(SLO)$/demoshow.obj \
-    $(SLO)$/main.obj
+    $(SLO)$/demoshow.obj
 
 APP2TARGET= demoshow
 APP2STDLIBS=$(TOOLSLIB) 		\