diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 10:48:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 10:48:59 +0000 |
| commit | f097904c8a0da39084a287e6d01b9e02f9da044c (patch) | |
| tree | 29623171fe1411ea172bbe89e00906c6a6630431 /libxml2 | |
| parent | 5e4855346a9a749094c27c7ed3eafa6f84844f6f (diff) | |
INTEGRATION: CWS xmlfix2 (1.20.2); FILE MERGED
2008/05/15 17:14:59 mst 1.20.2.3: RESYNC: (1.20-1.21); FILE MERGED
2008/04/02 11:45:21 mst 1.20.2.2: - libxml2/libxml2-2.6.31.patch, libxml2/makefile.mk, libxml2/prj/d.lst:
+ patch and install xml2-config
2008/03/31 14:55:53 mst 1.20.2.1: upgrade libxml2 to version 2.6.31
- libxml2/download/libxml2-2.6.17.tar.gz, libxml2/libxml2-2.6.17{-mingw}.patch:
+ removed
- libxml2/download/libxml2-2.6.31.tar.gz, libxml2/libxml2-2.6.31.patch:
+ added
- libxml2/makefile.mk:
+ updated
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 35622f1d0527..2bf2500507f1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # # This file is part of OpenOffice.org. # @@ -46,14 +46,14 @@ all: # --- Files -------------------------------------------------------- -LIBXML2VERSION=2.6.17 +LIBXML2VERSION=2.6.31 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) -.IF "$(OS)$(COM)"=="WNTGCC" -PATCH_FILE_NAME=$(TARFILE_NAME)-mingw.patch -.ELSE +#.IF "$(OS)$(COM)"=="WNTGCC" +#PATCH_FILE_NAME=$(TARFILE_NAME)-mingw.patch +#.ELSE PATCH_FILE_NAME=$(TARFILE_NAME).patch -.ENDIF +#.ENDIF # This is only for UNX environment now @@ -102,11 +102,13 @@ OUTDIR2INC=include$/libxml EXTRPATH=URELIB OUT2LIB+=.libs$/libxml2.*.dylib OUT2BIN+=.libs$/xmllint +OUT2BIN+=xml2-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=.libs$/libxml2*.a OUT2BIN+=.libs$/libxml2*.dll OUT2BIN+=.libs$/xmllint.exe +OUT2BIN+=xml2-config .ELSE OUT2LIB+=win32$/bin.msvc$/*.lib OUT2BIN+=win32$/bin.msvc$/*.dll @@ -115,6 +117,7 @@ OUT2BIN+=win32$/bin.msvc$/xmllint.exe .ELSE OUT2LIB+=.libs$/libxml2.so* OUT2BIN+=.libs$/xmllint +OUT2BIN+=xml2-config .ENDIF # --- Targets ------------------------------------------------------ |