summaryrefslogtreecommitdiffstats
path: root/odk/settings/settings.mk
diff options
context:
space:
mode:
authorPascal Junck <pjunck@openoffice.org>2004-11-03 07:48:29 +0000
committerPascal Junck <pjunck@openoffice.org>2004-11-03 07:48:29 +0000
commit10cf3717f2a50b9884651b4e514b410873819ff0 (patch)
tree1551b60223ca1e30ae09f7023a6efc31b0433a60 /odk/settings/settings.mk
parentINTEGRATION: CWS jl12 (1.2.2); FILE MERGED (diff)
downloadcore-10cf3717f2a50b9884651b4e514b410873819ff0.tar.gz
core-10cf3717f2a50b9884651b4e514b410873819ff0.zip
INTEGRATION: CWS sb22 (1.9.36); FILE MERGED
2004/10/22 07:41:20 sb 1.9.36.1: #i20747# Drop minor.micro from names of Unix UNO dynamic libraries; add uno_ prefix to names of Unix core UNO dynamic libraries.
Diffstat (limited to 'odk/settings/settings.mk')
-rw-r--r--odk/settings/settings.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 7edcc9d6c1a8..3df45f130980 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -165,10 +165,10 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-lsal
-CPPULIB=-lcppu
-CPPUHELPERLIB=-lcppuhelperC52
-SALHELPERLIB=-lsalhelperC52
+SALLIB=-luno_sal
+CPPULIB=-luno_cppu
+CPPUHELPERLIB=-luno_cppuhelperC52
+SALHELPERLIB=-luno_salhelperC52
STLPORTLIB=-lstlport_sunpro
EMPTYSTRING=
@@ -254,10 +254,10 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-lsal
-CPPULIB=-lcppu
-CPPUHELPERLIB=-lcppuhelper$(COMID)
-SALHELPERLIB=-lsalhelper$(COMID)
+SALLIB=-luno_sal
+CPPULIB=-luno_cppu
+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+SALHELPERLIB=-luno_salhelper$(COMID)
STLPORTLIB=-lstlport_gcc
EMPTYSTRING=
@@ -342,10 +342,10 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-lsal
-CPPULIB=-lcppu
-CPPUHELPERLIB=-lcppuhelper$(COMID)
-SALHELPERLIB=-lsalhelper$(COMID)
+SALLIB=-luno_sal
+CPPULIB=-luno_cppu
+CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+SALHELPERLIB=-luno_salhelper$(COMID)
STLPORTLIB=-lstlport_gcc -lstdc++
EMPTYSTRING=