summaryrefslogtreecommitdiff
path: root/libxml2
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-07-23 10:06:38 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-07-23 10:06:38 +0000
commita95975ce915e9c43bac4a3b9a3bfc7a00cf403d7 (patch)
treeeebcbdf53f57db9a8bf5b8e40602069da7bd2c6c /libxml2
parentfd4132b5ba8346938049c07211f4dbcb0a1d2e42 (diff)
INTEGRATION: CWS fwklhf01 (1.2.4); FILE MERGED
2004/07/05 08:07:33 lo 1.2.4.2: #i27032# -> \ -> $/ 2004/06/23 14:07:58 lo 1.2.4.1: #i27032# using configure for libxml2 build
Diffstat (limited to 'libxml2')
-rw-r--r--libxml2/makefile.mk35
1 files changed, 26 insertions, 9 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 430b00420df1..9c3969fca226 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: rt $ $Date: 2004-05-11 15:51:27 $
+# last change: $Author: hr $ $Date: 2004-07-23 11:06:38 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -73,20 +73,37 @@ TARGET=so_libxml2
LIBXML2VERSION=2.5.11
-NO_SHL1DESCRIPTION=TRUE
-
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
PATCH_FILE_NAME=$(TARFILE_NAME).patch
-ADDITIONAL_FILES= \
- makefile.mk \
- xml2.map \
- config.h
+# This is only for UNX environment now
+
+.IF "$(OS)"=="WNT"
+CONFIGURE_DIR=win32
+CONFIGURE_ACTION=cscript configure.js
+CONFIGURE_FLAGS=iconv=no
+BUILD_ACTION=nmake
+BUILD_DIR=$(CONFIGURE_DIR)
+.ELSE
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no
+BUILD_ACTION=$(GNUMAKE)
+BUILD_DIR=$(CONFIGURE_DIR)
+.ENDIF
-BUILD_ACTION=dmake subdmake=true $(MFLAGS) $(MAKEFILE) $(CALLMACROS) LIBXML2VERSION=$(LIBXML2VERSION)
OUTDIR2INC=include$/libxml
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=.libs$/libxml2.*.dylib
+.ELIF "$(OS)"=="WNT"
+OUT2LIB+=win32$/binaries$/*.lib
+OUT2BIN+=win32$/binaries$/*.dll
+.ELSE
+OUT2LIB+=.libs$/libxml2.so*
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk