[Libreoffice-commits] .: sal/prj sal/textenc sal/util

[Caolán McNamara]

 sal/prj/d.lst           |    8 ++++----
 sal/textenc/makefile.mk |    2 +-
 sal/util/makefile.mk    |    4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 8a7a705cab73a8eba1605911a629728911895c3f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 31 14:27:03 2011 +0100

    sync names with scp2, and fix macosx copy/link

diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 12ac20f..2083d86 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -21,10 +21,10 @@ mkdir: %_DEST%\inc%_EXT%\systools\win32
 symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so
 ..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3
 symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
-..\%__SRC%\lib\libuno_sal_textenc.so.3 %_DEST%\lib%_EXT%\libuno_sal_textenc.so.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal_textenc.so.3 %_DEST%\lib%_EXT%\libuno_sal_textenc.so
-..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal_textenc.dylib.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal_textenc.dylib
+..\%__SRC%\lib\libsal_textenc.so.3 %_DEST%\lib%_EXT%\libsal_textenc.so.3
+symlink: %_DEST%\lib%_EXT%\libsal_textenc.so.3 %_DEST%\lib%_EXT%\libsal_textenc.so
+..\%__SRC%\lib\libsal_textenc.dylib.3 %_DEST%\lib%_EXT%\libsal_textenc.dylib.3
+symlink: %_DEST%\lib%_EXT%\libsal_textenc.dylib.3 %_DEST%\lib%_EXT%\libsal_textenc.dylib
 ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 
diff --git a/sal/textenc/makefile.mk b/sal/textenc/makefile.mk
index f029a85..7970ae0 100644
--- a/sal/textenc/makefile.mk
+++ b/sal/textenc/makefile.mk
@@ -109,7 +109,7 @@ OBJTARGET=$(LB)$/$(TARGET).lib
 .IF "$(GUI)" == "WNT"
 CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(UDK_MAJOR)$(DLLPOST)
 .ELSE
-CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(DLLPOST).$(UDK_MAJOR)
+CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(DLLPOST).$(UDK_MAJOR)
 .ENDIF
 LIB2TARGET= $(SLB)$/textenc_tables.lib
 LIB2OBJFILES= $(SAL_TABLES_OBJECTS) $(SAL_COMMON_OBJECTS)
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 85307d2..10414c8 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -166,11 +166,7 @@ SHL1STDLIBS+=-lgcc
 
 SHL4DEPN+=$(SHL1TARGETN)
 SHL4LIBS=$(SLB)$/textenc_tables.lib
-.IF "$(GUI)" == "WNT"
 SHL4TARGET=sal_textenc
-.ELSE
-SHL4TARGET=uno_sal_textenc
-.ENDIF
 SHL4STDLIBS=$(SALLIB)
 SHL4VERSIONMAP=saltextenc.map