diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-02-04 10:29:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-02-04 10:29:29 +0000 |
| commit | c9467de5b54e46aa0f6ef8dcaa83c914ec15f59c (patch) | |
| tree | e1161c6d83a926ca310a1b97756ba3d940b51bf0 /libxml2 | |
| parent | 067c383d84d78ef0122bedea3702fe656923330c (diff) | |
INTEGRATION: CWS cmcfixes1 (1.9.8); FILE MERGED
2005/02/02 12:50:39 hjs 1.9.8.4: #i41754# fix sax1 switch
2005/02/02 11:23:01 mt 1.9.8.3: #i41748# Fix for new libxml2
2005/01/31 11:45:23 hjs 1.9.8.2: #i41531# changed windows directory name
2005/01/28 08:32:11 cmc 1.9.8.1: #i41437# move to newer libxml2
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 754c7e092a89..1807d221c22f 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2005-01-28 16:07:43 $ +# last change: $Author: rt $ $Date: 2005-02-04 11:29:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -77,7 +77,7 @@ all: # --- Files -------------------------------------------------------- -LIBXML2VERSION=2.5.11 +LIBXML2VERSION=2.6.17 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) PATCH_FILE_NAME=$(TARFILE_NAME).patch @@ -87,13 +87,13 @@ PATCH_FILE_NAME=$(TARFILE_NAME).patch .IF "$(OS)"=="WNT" CONFIGURE_DIR=win32 CONFIGURE_ACTION=cscript configure.js -CONFIGURE_FLAGS=iconv=no +CONFIGURE_FLAGS=iconv=no sax1=yes BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) .ELSE CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -105,8 +105,8 @@ OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" OUT2LIB+=.libs$/libxml2.*.dylib .ELIF "$(OS)"=="WNT" -OUT2LIB+=win32$/binaries$/*.lib -OUT2BIN+=win32$/binaries$/*.dll +OUT2LIB+=win32$/bin.msvc$/*.lib +OUT2BIN+=win32$/bin.msvc$/*.dll .ELSE OUT2LIB+=.libs$/libxml2.so* .ENDIF |