diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-07 13:35:07 +0000 |
| commit | ae0228cdb340de85f42c25024986ce0e557503a3 (patch) | |
| tree | 55439cdf267c7cd8eef9a0ce6fa0c1775b3a133f /solenv/inc/libs.mk | |
| parent | 9d7d35bce00ec0b2676d0428872300cc257e3288 (diff) | |
CWS-TOOLING: integrate CWS kick4nt
Diffstat (limited to 'solenv/inc/libs.mk')
| -rw-r--r-- | solenv/inc/libs.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1ae4eeb9d11d..e6164f401ea0 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -36,7 +36,7 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$" #externe libs in plattform.mk # .IF "$(GUI)$(COM)"=="WNTGCC" -AWTLIB*=$(JAVA_HOME)$/lib$/jawt.lib +AWTLIB*=$(JAVA_HOME)/lib/jawt.lib .ELSE # "$(GUI)$(COM)"=="WNTGCC" AWTLIB*=-ljawt .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -54,7 +54,7 @@ ICUUCLIB=-licuuc ICUDATALIB=-licudata .ENDIF # "$(GUI)$(COM)"=="WNTGCC" I18NUTILLIB=-li18nutil$(COMID) -.INCLUDE .IGNORE : i18npool$/version.mk +.INCLUDE .IGNORE : i18npool/version.mk I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) .IF "$(GUI)$(COM)"=="WNTGCC" @@ -63,7 +63,7 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) -.INCLUDE .IGNORE : comphelper$/version.mk +.INCLUDE .IGNORE : comphelper/version.mk COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID) CONNECTIVITYLIB=-lconnectivity LDAPBERLIB=-lldapber @@ -77,7 +77,7 @@ CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID) CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.INCLUDE .IGNORE : ucbhelper$/version.mk +.INCLUDE .IGNORE : ucbhelper/version.mk UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID) .IF "$(SYSTEM_OPENSSL)" == "YES" OPENSSLLIB=$(OPENSSL_LIBS) @@ -95,7 +95,7 @@ REGLIB=-lreg$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" REGLIB=-lreg .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.INCLUDE .IGNORE : vos$/version.mk +.INCLUDE .IGNORE : vos/version.mk VOSLIB=-lvos$(VOS_MAJOR)$(COMID) XMLOFFLIB=-lxo$(DLLPOSTFIX) XMLOFFLLIB=-lxol @@ -106,7 +106,7 @@ SALLIB=-lsal$(UDK_MAJOR) STORELIB=-lstore SALLIB=-luno_sal .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.INCLUDE .IGNORE : connectivity$/version.mk +.INCLUDE .IGNORE : connectivity/version.mk ODBCLIB=-lodbc$(DLLPOSTFIX) ODBCBASELIB=-lodbcbase$(DLLPOSTFIX) DBFILELIB=-lfile$(DLLPOSTFIX) @@ -224,7 +224,7 @@ JPEG3RDLIB=-ljpeglib .IF "$(SYSTEM_NEON)" == "YES" || "$(GUI)$(COM)"=="WNTGCC" NEON3RDLIB=-lneon .ELIF "$(OS)" == "MACOSX" -NEON3RDLIB=$(SOLARLIBDIR)$/libneon.a +NEON3RDLIB=$(SOLARLIBDIR)/libneon.a .ELSE NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC) .ENDIF |