[Libreoffice-commits] .: solenv/inc

Tor Lillqvist tml at kemper.freedesktop.org
Fri Jun 17 04:13:47 PDT 2011


 solenv/inc/libs.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 9dacc3f767f3fbd2df0b55deb8681c9abf596d49
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 14:13:20 2011 +0300

    Don't look for the cppunit library under a Cygwin DLL name

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 97d6419..f9f9b2a 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -252,15 +252,11 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(OS)" == "WNT"
-CPPUNITLIB = -lcygcppunit-1-12-1
-.ELSE
 .IF "$(SYSTEM_CPPUNIT)"=="YES"
 CPPUNITLIB = $(CPPUNIT_LIBS)
 .ELSE
 CPPUNITLIB = -lcppunit
 .ENDIF
-.ENDIF
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE


More information about the Libreoffice-commits mailing list