[Libreoffice-commits] .: 3 commits - sal/util store/prj store/util

[Tor Lillqvist]

 sal/util/makefile.mk   |    2 +-
 store/prj/d.lst        |    1 -
 store/util/makefile.mk |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7bb4ee73a64c82312a93723f70404a0da075932d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 16:58:04 2011 +0300

    Drop duplicate

diff --git a/store/prj/d.lst b/store/prj/d.lst
index 871fcf8..b7809a7 100644
--- a/store/prj/d.lst
+++ b/store/prj/d.lst
@@ -5,7 +5,6 @@ mkdir: %_DEST%\inc\store
 ..\util\store.xml %_DEST%\xml\store.xml
 
 ..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib
-..\%__SRC%\lib\libstore*.dll.a %_DEST%\lib\libstore*.dll.a
 ..\%__SRC%\lib\libstore.*.* %_DEST%\lib\*
 ..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll
 
commit 6ba5312fe7e6650a5f009d1e549c1c771c03c117
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 12:57:20 2011 +0300

    Just make -lstore work for MinGW as it does for other Unix-style compilers
    
    I don't really see the point in having the UDK_MAJOR in the import
    library name. We don't do that for any Unix either, just -lstore is
    used. It isn't as if it would make any sense in keeping a mix of
    (import) libraries for incompatible versions/builds of the LO (SDK) in
    the same location anyway. The simpler, the better.

diff --git a/store/util/makefile.mk b/store/util/makefile.mk
index 5129273..801197c 100644
--- a/store/util/makefile.mk
+++ b/store/util/makefile.mk
@@ -59,7 +59,7 @@ SHL1TARGET= 	$(TARGET)
 .IF "$(COM)" == "MSC"
 SHL1IMPLIB= 	istore
 .ELSE
-SHL1IMPLIB= 	store$(UDK_MAJOR)
+SHL1IMPLIB= 	store
 .ENDIF
 
 SHL1VERSIONMAP=	$(TARGET).map
commit 151a27b44b978a524eee729beed3ea6ae0a50c1e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 12:55:45 2011 +0300

    Just call the import library -luno_sal for MinGW

diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 22f8594..3a3a164 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -71,7 +71,7 @@ SHL1TARGET= $(TARGET)
 SHL1IMPLIB= i$(TARGET)
 .ELSE
 SHL1TARGET= uno_$(TARGET)
-SHL1IMPLIB= $(SHL1TARGET)
+SHL1IMPLIB= uno_$(TARGET)
 .ENDIF
 SHL1VERSIONMAP=	$(TARGET).map
 SHL1RPATH=URELIB