[Libreoffice-commits] .: 3 commits - i18nutil/source sax/source sax/util

[Tor Lillqvist]

 i18nutil/source/utility/makefile.mk |    4 ++
 sax/source/expatwrap/makefile.mk    |    4 ++
 sax/source/fastparser/makefile.mk   |    4 ++
 sax/source/tools/makefile.mk        |    4 ++
 sax/util/makefile.mk                |   67 ------------------------------------
 5 files changed, 16 insertions(+), 67 deletions(-)

New commits:
commit d5a039559461f8c92ad847312beca9a8be679fd3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 22:49:40 2011 +0300

    Make the MinGW import library name match what libs.mk wants
    
    Use the i prefix only for import libraries built with MSC. Add COMID
    to the import library built with MinGW. This matches the shared
    library name on Unix, and MinGW is a Unix-style compiler.

diff --git a/i18nutil/source/utility/makefile.mk b/i18nutil/source/utility/makefile.mk
index adfddd9..cece284 100644
--- a/i18nutil/source/utility/makefile.mk
+++ b/i18nutil/source/utility/makefile.mk
@@ -47,7 +47,11 @@ SLOFILES= \
 
 # Unicode utilities 
 SHL1TARGET=		$(TARGET)$(COMID)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=		i$(TARGET)
+.ELSE
+SHL1IMPLIB=		$(TARGET)$(COMID)
+.ENDIF
 
 DEF1DEPN=		$(MISC)$/$(SHL1TARGET).flt
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
commit fba956620da2c40a9530182d167a5343b979bb55
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 22:45:09 2011 +0300

    Don't use the i prefix for import libraries with WNTGCC

diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk
index 6e1348c..a0f1771 100644
--- a/sax/source/expatwrap/makefile.mk
+++ b/sax/source/expatwrap/makefile.mk
@@ -54,7 +54,11 @@ SLOFILES =\
         $(SLO)$/saxwriter.obj
 
 SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
 
 SHL1STDLIBS= \
         $(SALLIB)  \
diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk
index d8f9378..9690ffa 100644
--- a/sax/source/fastparser/makefile.mk
+++ b/sax/source/fastparser/makefile.mk
@@ -51,7 +51,11 @@ SLOFILES =\
         $(SLO)$/xml2utf.obj
 
 SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
 
 SHL1STDLIBS= \
         $(SALLIB)  \
diff --git a/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk
index 5923fc5..abece06 100644
--- a/sax/source/tools/makefile.mk
+++ b/sax/source/tools/makefile.mk
@@ -45,7 +45,11 @@ SLOFILES =	\
         $(SLO)$/fshelper.obj
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)$(DLLPOSTFIX)
+.ENDIF
 
 SHL1STDLIBS= \
                 $(CPPULIB)		\
commit 3bc5b36f7fc6dfdac544ed99125dcec1e5711f99
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 22:40:52 2011 +0300

    This file is not used

diff --git a/sax/util/makefile.mk b/sax/util/makefile.mk
deleted file mode 100644
index 8875e38..0000000
--- a/sax/util/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=sax
-TARGET=sax
-
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=\
-            $(SLB)$/saxtools.lib
-
-# sax
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1LIBS=	$(LIB1TARGET)
-SHL1STDLIBS= \
-                $(CPPULIB)		\
-                $(CPPUHELPERLIB)\
-                $(COMPHELPERLIB)\
-                $(RTLLIB)		\
-                $(SALLIB)		\
-                $(ONELIB)		\
-                $(SALHELPERLIB)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk