summaryrefslogtreecommitdiff
path: root/libwpd
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-03-01 16:00:56 +0000
committerKurt Zenker <kz@openoffice.org>2005-03-01 16:00:56 +0000
commit2df69911cada15fbbcaa5612334764853b9d0c0b (patch)
treee2bd19381b98c8174c94c75165e817551a763ad3 /libwpd
parent8b68f33e37c675974cf452c4571e87a8a07611fc (diff)
INTEGRATION: CWS libwpdupgrade (1.4.2); FILE MERGED
2005/02/02 20:44:47 rene 1.4.2.1: upgrade writerperfect to new libwpd API and implement --with-system-libwpd. Remove old libwpd/ stuff, tarball will come when the actual release happened :-)
Diffstat (limited to 'libwpd')
-rw-r--r--libwpd/makefile.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 2f41550e2be3..9bcebda44edf 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: mmeeks $ $Date: 2004-10-07 14:49:05 $
+# last change: $Author: kz $ $Date: 2005-03-01 17:00:56 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -71,8 +71,13 @@ TARGET=wpd
# --- Files --------------------------------------------------------
-TARFILE_NAME=libwpd-snap-20040823
-PATCH_FILE_NAME=$(TARFILE_NAME).diff
+.IF "$(SYSTEM_LIBWPD)" == "YES"
+@all:
+ @echo "Using system libwpd..."
+.ENDIF
+
+TARFILE_NAME=libwpd-0.8.0
+#PATCH_FILE_NAME=$(TARFILE_NAME).diff
BUILD_ACTION=dmake
BUILD_DIR=src/lib