diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 14:58:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 14:58:58 +0000 |
| commit | a189e99094d8a0abe58f169dfae4bbf1de469243 (patch) | |
| tree | df721d9f47c54a579c3e0fd4fd7fbb0552fff646 /solenv/inc/libs.mk | |
| parent | d17427a523bc70f9f7cb733f92109915902ca7d1 (diff) | |
INTEGRATION: CWS odfmetadata (1.133.38); FILE MERGED
2008/06/25 09:59:15 mst 1.133.38.2: RESYNC: (1.133-1.134); FILE MERGED
2008/06/17 16:04:44 mst 1.133.38.1: - solenv/inc/libs.mk:
+ fix XSLTLIB: use ZLIB3RDLIB
+ add REDLANDLIB
Diffstat (limited to 'solenv/inc/libs.mk')
| -rw-r--r-- | solenv/inc/libs.mk | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 99d9c7afcdfa..215bc665f84c 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -8,7 +8,7 @@ # # $RCSfile: libs.mk,v $ # -# $Revision: 1.135 $ +# $Revision: 1.136 $ # # This file is part of OpenOffice.org. # @@ -28,7 +28,7 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -LIBSMKREV!:="$$Revision: 1.135 $$" +LIBSMKREV!:="$$Revision: 1.136 $$" .IF "$(GUI)"=="UNX" || "$(COM)"=="GCC" @@ -278,16 +278,22 @@ JVMACCESSLIB = -ljvmaccess$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" CPPUNITLIB = -lcppunit$(DLLPOSTFIX) .IF "$(GUI)$(COM)"=="WNTGCC" -XSLTLIB=-lxslt-1 $(ZLIB3RD) $(LIBXML2LIB) +XSLTLIB=-lxslt-1 $(ZLIB3RDLIB) $(LIBXML2LIB) JVMFWKLIB = -ljvmfwk$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" .IF "$(SYSTEM_LIBXSLT)"=="YES" XSLTLIB=$(LIBXSLT_LIBS) .ELSE -XSLTLIB=-lxslt $(ZLIB3RD) $(LIBXML2LIB) +XSLTLIB=-lxslt $(ZLIB3RDLIB) $(LIBXML2LIB) .ENDIF JVMFWKLIB = -ljvmfwk .ENDIF # "$(GUI)$(COM)"=="WNTGCC" +.IF "$(SYSTEM_REDLAND)"=="YES" +REDLANDLIB=$(REDLAND_LIBS) +.ELSE +REDLANDLIB=-lrdf +.ENDIF + # #110743# # For BinFilters, some libs were added. @@ -468,7 +474,8 @@ HELPLINKERLIB=ihelplinker.lib SYSSHELLLIB=sysshell.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = cppunit.lib -XSLTLIB = libxslt.lib $(ZLIB3RD) $(LIBXML2LIB) +XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB) +REDLANDLIB = librdf.lib JVMFWKLIB = ijvmfwk.lib |