diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:29:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:29:01 +0000 |
| commit | af8d0f0d861a60604b340b81e3c359359942a26b (patch) | |
| tree | a5ed3fd8caf67e4ee06df6a6c3f39121d54ec13a /libxml2 | |
| parent | 3d20fa3272083198dac29c689f66a75602c1a2b2 (diff) | |
INTEGRATION: CWS mingwport03 (1.14.14); FILE MERGED
2006/10/24 13:15:07 vg 1.14.14.2: #i53572# MinGW port
2006/09/06 15:41:21 vg 1.14.14.1: #i53572# MinGW port
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index af2b632647b4..1cda19ffec1b 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: ihi $ $Date: 2007-03-26 12:25:32 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:29:01 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -53,11 +53,22 @@ all: LIBXML2VERSION=2.6.17 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) +.IF "$(OS)$(COM)"=="WNTGCC" +PATCH_FILE_NAME=$(TARFILE_NAME)-mingw.patch +.ELSE PATCH_FILE_NAME=$(TARFILE_NAME).patch +.ENDIF # This is only for UNX environment now .IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="-lws2_32 -lmingwthrd" OBJDUMP="$(WRAPCMD) objdump" +BUILD_ACTION=$(GNUMAKE) +BUILD_DIR=$(CONFIGURE_DIR) +.ELSE CONFIGURE_DIR=win32 CONFIGURE_ACTION=cscript configure.js CONFIGURE_FLAGS=iconv=no sax1=yes @@ -66,6 +77,7 @@ CONFIGURE_FLAGS+=debug=yes .ENDIF BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) +.ENDIF .ELSE .IF "$(SYSBASE)"!="" xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include @@ -93,8 +105,13 @@ OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" OUT2LIB+=.libs$/libxml2.*.dylib .ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=.libs$/libxml2*.a +OUT2BIN+=.libs$/libxml2*.dll +.ELSE OUT2LIB+=win32$/bin.msvc$/*.lib OUT2BIN+=win32$/bin.msvc$/*.dll +.ENDIF .ELSE OUT2LIB+=.libs$/libxml2.so* .ENDIF |