[Libreoffice-commits] .: cppunit/makefile.mk

Tor Lillqvist tml at kemper.freedesktop.org
Sun May 15 06:26:19 PDT 2011


 cppunit/makefile.mk |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 441d520ae45ff98691c11a7fdbf2d44c529a9519
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 15 16:24:46 2011 +0300

    Fix build on Windows

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index b032c09..265bcdc 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -66,12 +66,6 @@ BUILD_ACTION = cd src/cppunit && dmake -f ooo-cppunit_dll.mk debug=$(debug) verb
 
 OUTDIR2INC = include/cppunit
 
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
-
 .ELSE
 .IF "$(COM)" == "GCC"
 EXTRA_CFLAGS += -mthreads
@@ -140,3 +134,7 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
 .INCLUDE: set_ext.mk
 .INCLUDE: target.mk
 .INCLUDE: tg_ext.mk
+
+.IF "$(COM)" == "MSC"
+$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
+.ENDIF


More information about the Libreoffice-commits mailing list