[Libreoffice-commits] .: 2 commits - cppu/util offapi/util

[Tor Lillqvist]

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

New commits:
commit bb98fbdde16b2a8b7909ef265bd854122e3498b9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 01:03:43 2011 +0300

    Use the i prefix for the import library only with MSC

diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index f8ae76e..0c09a1b 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -59,7 +59,11 @@ SHL1TARGET= uno_$(TARGET)
 SHL1STDLIBS = $(SALLIB)
 
 SHL1DEPN=
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=uno_$(TARGET)
+.ENDIF
 .IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 .ENDIF
commit c91c57e74220e9ac59b28a8f48040549e5c3f6eb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 00:51:04 2011 +0300

    Cross-compilation fix
    
    checknewapi.pl can run regview fine on Windows even if the name
    doesn't include the .exe suffix. So drop the use of EXECPOST and then
    this will work also in the case of cross-compilation to Windows, where
    EXECPOST is .exe for HOST, but we aren't running a HOST regview but a
    BUILD one.

diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index d377eca..4138067 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -151,7 +151,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag
 
 UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
 
-REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)
+REGVIEWTOOL=$(SOLARBINDIR)$/regview
 
 # --- Targets ------------------------------------------------------