diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 13:58:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 13:58:40 +0000 |
| commit | db50004b429a8557b452ed68a979bb2596826ea9 (patch) | |
| tree | 02fc0b65782a2ecd86f7a55a792d33c9debd0c6b /libxml2 | |
| parent | f839b904084e38258e584551af8d631f25e60b77 (diff) | |
INTEGRATION: CWS obo19 (1.17.14); FILE MERGED
2007/11/26 15:27:01 obo 1.17.14.1: #i83979# MacOSX: Build environment adjustments for Leopard/Tiger
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index e6f8b4996746..e011b375c367 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: vg $ $Date: 2007-05-25 15:02:19 $ +# last change: $Author: obo $ $Date: 2008-01-04 14:58:40 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -80,7 +80,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ENDIF .ELSE .IF "$(SYSBASE)"!="" -xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include +xml2_CFLAGS+=-I$(SYSBASE)$/usr$/include .IF "$(COMNAME)"=="sunpro5" xml2_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" @@ -93,7 +93,7 @@ xml2_LDFLAGS+=-Wl,-z,noexecstack CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |