diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 07:48:29 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 07:48:29 +0000 |
| commit | 10cf3717f2a50b9884651b4e514b410873819ff0 (patch) | |
| tree | 1551b60223ca1e30ae09f7023a6efc31b0433a60 /odk/settings | |
| parent | deb7a810b45cd7c5a0926f99d5d993d5664ad293 (diff) | |
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')
| -rw-r--r-- | odk/settings/settings.mk | 24 |
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= |