diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 15:59:16 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 15:59:16 +0000 |
commit | d19ff35de77fa6667d2b16a2c989b03aff21cbcc (patch) | |
tree | ca55cb6409173fce002a71bd4f17f2872d114af3 /libxml2 | |
parent | b355efa5260150b7eb6a164425cd530890fa8b74 (diff) |
INTEGRATION: CWS sb37 (1.11.12); FILE MERGED
2005/09/12 18:12:23 hjs 1.11.12.2: RESYNC: (1.11-1.12); FILE MERGED
2005/09/12 12:54:32 hjs 1.11.12.1: #125477# add flags to prefer SYSBASE
Diffstat (limited to 'libxml2')
-rw-r--r-- | libxml2/makefile.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index dfbb3aae8535..8c29b9bbf438 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: rt $ $Date: 2005-10-18 08:48:21 $ +# last change: $Author: hr $ $Date: 2005-12-28 16:59:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,9 +67,16 @@ CONFIGURE_FLAGS+=debug=yes BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) .ELSE +.IF "$(SYSBASE)"!="" +xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include +.IF "$(COMNAME)"=="sunpro5" +xml2_CFLAGS+=$(C_RESTRICTIONFLAGS) +.ENDIF # "$(COMNAME)"=="sunpro5" +xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib +.ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xml2_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |