diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 13:28:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 13:28:57 +0000 |
| commit | 2d5bbdec0f15e48f995739385bcd2425564d6a2c (patch) | |
| tree | bf6e920b8315769fe4b2b72cb8d2f2e28b00899c /libxml2 | |
| parent | 2a22d93e982c51e8ee79790ec2d423a8e876b832 (diff) | |
INTEGRATION: CWS ooo20040704 (1.2.6); FILE MERGED
2004/07/05 12:55:58 cmc 1.2.6.4: #i30801# I mean libxml2 of course, not freetype
2004/07/05 12:55:04 cmc 1.2.6.3: #i30801# make freetype an optional compile
2004/07/02 18:37:42 vq 1.2.6.2: #i27032# Please use always $/ and not \. (Except when you have a reason to do so.)
2004/07/02 15:10:27 haggai 1.2.6.1: #i27032# CROSS MERGE from fwklhf01 to fix P1 build breakage on Linux
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 6bf59fec0a01..9e74d2149083 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2004-07-26 14:01:35 $ +# last change: $Author: rt $ $Date: 2004-09-08 14:28:57 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,6 +69,12 @@ TARGET=so_libxml2 .INCLUDE : settings.mk +.IF "$(SYSTEM_LIBXML)" == "YES" +all: + @echo "An already available installation of libxml should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + # --- Files -------------------------------------------------------- LIBXML2VERSION=2.5.11 @@ -76,11 +82,6 @@ LIBXML2VERSION=2.5.11 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" |