diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 09:24:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 09:24:47 +0000 |
| commit | a5702d2b89b765fe59b1ce68634c921772701ec0 (patch) | |
| tree | c573a219614fd8dab6d747d80d2760b81673c7e4 /libxslt | |
| parent | 9d5e120d8c23545ac8c90b92ee1e5b7a3dd03cae (diff) | |
INTEGRATION: CWS mst01 (1.15.4); FILE MERGED
2008/06/27 11:37:13 mst 1.15.4.1: upgrade libxslt to version 1.1.24
- libxslt/download/libxslt-1.1.16.tar.gz, libxslt/libxslt-1.1.16.patch:
+ removed
- libxslt/download/libxslt-1.1.24.tar.gz, libxslt/libxslt-1.1.24.patch:
+ added
- libxslt/libxsltversion.mk, libxslt/prj/d.lst:
+ add new include makefile for soname versioning
- libxslt/makefile.mk:
+ update, and refactor a bit
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/makefile.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 1210f23cb9ca..d73c0ffc04ec 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # # This file is part of OpenOffice.org. # @@ -46,7 +46,9 @@ all: # --- Files -------------------------------------------------------- -LIBXSLTVERSION=1.1.16 +.INCLUDE : libxsltversion.mk + +LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO) TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION) PATCH_FILE_NAME=$(TARFILE_NAME).patch @@ -84,20 +86,23 @@ LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" .IF "$(SYSBASE)"!="" -xslt_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS) +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS) .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" +.EXPORT: CPPFLAGS .EXPORT: LDFLAGS +.EXPORT: LIBXML2LIB +.EXPORT: ZLIB3RDLIB .IF "$(COMNAME)"=="sunpro5" -xslt_CFLAGS+=$(ARCH_FLAGS) -xc99=none +CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) +CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |