diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:24:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:24:57 +0000 |
| commit | 6ac655453e023f87f133dcbeba5220bcfcc1cb8d (patch) | |
| tree | 4cc3f2c08fc55f634cb3bdf08f58b155f2b277c5 /libxml2 | |
| parent | 128292aa1e61d6434568436cfb9099092c8c8787 (diff) | |
INTEGRATION: CWS os2port03 (1.17.22); FILE MERGED
2008/07/16 13:38:15 obr 1.17.22.5: RESYNC: (1.17.18.1-1.23); FILE MERGED
2008/04/15 04:13:13 obr 1.17.22.4: merged in fix from rev 1.19
2008/01/15 20:41:44 obr 1.17.22.3: build fix
2008/01/15 14:33:56 obr 1.17.22.2: RESYNC: (1.17-1.17.18.1); FILE MERGED
2008/01/14 16:32:22 ydario 1.17.22.1: build also on os2.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index d57629c7e633..a250bb10847b 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # # This file is part of OpenOffice.org. # @@ -88,8 +88,13 @@ xml2_LDFLAGS+=-Wl,-z,noexecstack .ENDIF CONFIGURE_DIR= +.IF "$(OS)"=="OS2" +CONFIGURE_ACTION=sh .$/configure +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +.ELSE CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |