summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-02-08 01:35:32 +0100
committerJan Holesovsky <kendy@suse.cz>2011-02-08 01:35:32 +0100
commit783fb6dbf5d3cb4ba39830b555acc7f79e45dd8b (patch)
tree7c594fbed543e4d8b70f0a2918a35cea63b53c05 /comphelper
parent9943d9dfaccc5df4a3b1b1b81cc4bc30ba92cf7e (diff)
Fix comphelper parallel build, so that the tests may run.
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/prj/build.lst2
-rw-r--r--comphelper/qa/makefile.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index d5eced023c68..25aa17fed564 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -11,4 +11,4 @@ ph comphelper\source\compare nmake - all ph_compare ph_inc NULL
ph comphelper\source\officeinstdir nmake - all ph_officeinstdir ph_inc NULL
ph comphelper\source\xml nmake - all ph_xml NULL
ph comphelper\util nmake - all ph_util ph_container ph_evtatmgr ph_misc ph_procfact ph_property ph_streaming ph_compare ph_officeinstdir ph_xml NULL
-ph comphelper\qa nmake - all ph_complex NULL \ No newline at end of file
+ph comphelper\qa nmake - all ph_complex ph_util NULL
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index 9c86c24a20bf..8d06d9b4a669 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -32,6 +32,7 @@ TARGET := qa
ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
+.INCLUDE : $(PRJ)$/version.mk
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"