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

[Fridrich Strba]

 sal/textenc/makefile.mk |    2 +-
 sal/util/makefile.mk    |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ed6c287b9ea86a620349686dcb77178a40c55596
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 25 15:09:17 2011 +0100

    Don't use "uno_" prefix for libraries on Windows

diff --git a/sal/textenc/makefile.mk b/sal/textenc/makefile.mk
index e6834b0..f029a85 100644
--- a/sal/textenc/makefile.mk
+++ b/sal/textenc/makefile.mk
@@ -107,7 +107,7 @@ OBJTARGET=$(LB)$/$(TARGET).lib
 
 # be nicer to avoid DLLPRE
 .IF "$(GUI)" == "WNT"
-CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(UDK_MAJOR)$(DLLPOST)
+CDEFS+=-DPLUGIN_NAME=$(DLLPRE)sal_textenc$(UDK_MAJOR)$(DLLPOST)
 .ELSE
 CDEFS+=-DPLUGIN_NAME=$(DLLPRE)uno_sal_textenc$(DLLPOST).$(UDK_MAJOR)
 .ENDIF
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index f0076ea..85307d2 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -166,7 +166,11 @@ 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