From 5d007214f5906136c4a7d5fe18f5b96eb23aed54 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 17 Jul 2007 06:24:49 +0000
Subject: INTEGRATION: CWS mingwport05 (1.4.10); FILE MERGED 2007/06/19
 14:42:56 vg 1.4.10.1: #i78265# MinGW port efforts

---
 libxslt/makefile.mk | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'libxslt/makefile.mk')

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index fe26339671c8..b6ab891b5a37 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: hr $ $Date: 2007-06-26 12:36:59 $
+#   last change: $Author: obo $ $Date: 2007-07-17 07:24:49 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -60,6 +60,14 @@ ADDITIONAL_FILES=libxml2-config
 # This is only for UNX environment now
 
 .IF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+CONFIGURE_DIR=
+CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
+CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(xslt_CFLAGS) -D_MT" LDFLAGS="$(xslt_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd"  LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+.ELSE
 CONFIGURE_DIR=win32
 CONFIGURE_ACTION=cscript configure.js
 #CONFIGURE_FLAGS=iconv=no sax1=yes
@@ -68,6 +76,7 @@ CONFIGURE_FLAGS+=debug=yes
 .ENDIF
 BUILD_ACTION=nmake
 BUILD_DIR=$(CONFIGURE_DIR)
+.ENDIF
 .ELSE
 .IF "$(SYSBASE)"!=""
 xslt_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external
@@ -80,7 +89,7 @@ xslt_CFLAGS+=-xc99=none
 .ENDIF                  # "$(COMNAME)"=="sunpro5"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LDFLAGS="$(xslt_LDFLAGS)"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LDFLAGS="$(xslt_LDFLAGS)"  LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -93,9 +102,15 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
 OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
 OUT2BIN+=xsltproc$/.libs$/xsltproc
 .ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2BIN+=libxslt$/.libs$/*.dll
+OUT2BIN+=libexslt$/.libs$/*.dll
+OUT2BIN+=xsltproc$/.libs$/*.exe*
+.ELSE
 OUT2LIB+=win32$/bin.msvc$/*.lib
 OUT2BIN+=win32$/bin.msvc$/*.dll
 OUT2BIN+=win32$/bin.msvc$/*.exe*
+.ENDIF
 .ELSE
 OUT2LIB+=libxslt$/.libs$/libxslt.so*
 OUT2LIB+=libexslt$/.libs$/libexslt.so*
-- 
cgit v1.2.3