From 6f9d8211a13c51019835c62043193c0573e525b2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 24 May 2013 14:58:31 +0200
Subject: stop delivering libwps headers

Yes, I am impatient .-)

Change-Id: Ic3a51ffc0a151e8ae71f8d2ff067ea4c3ad1c6b2
---
 RepositoryExternal.mk            | 4 ++++
 configure.ac                     | 2 +-
 libwps/ExternalPackage_libwps.mk | 5 -----
 libwps/UnpackedTarball_libwps.mk | 7 +++++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1e45da6dbb55..95a50121585f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1632,6 +1632,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_wps
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,libwps)/inc \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_package,$(1),\
 	libwps \
 )
diff --git a/configure.ac b/configure.ac
index 9815977005cc..a7eaa935cc44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7277,7 +7277,7 @@ AC_SUBST([SYSTEM_FREETYPE])
 dnl ===================================================================
 dnl Check for system libwps
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpslib"])
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${WORKDIR}/UnpackedTarball/libwps/inc"],["-L${OUTDIR}/lib -lwpslib"])
 
 dnl ===================================================================
 dnl Check for system libwpg
diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk
index 995ec7c8a856..960ae1b45aa9 100644
--- a/libwps/ExternalPackage_libwps.mk
+++ b/libwps/ExternalPackage_libwps.mk
@@ -9,11 +9,6 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\
-	src/lib/libwps.h \
-	src/lib/WPSDocument.h \
-))
-
 $(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))
 
 ifeq ($(OS)$(COM),WNTMSC)
diff --git a/libwps/UnpackedTarball_libwps.mk b/libwps/UnpackedTarball_libwps.mk
index 1fd633acbe90..7c31bf87ef41 100644
--- a/libwps/UnpackedTarball_libwps.mk
+++ b/libwps/UnpackedTarball_libwps.mk
@@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 
+# HACK to avoid the need to deliver the headers to $(OUTDIR). This
+# should be removed when libwps is updated.
+$(eval $(call gb_UnpackedTarball_set_post_action,libwps,\
+	mkdir -p inc/libwps && \
+	cp -f src/lib/libwps.h src/lib/WPSDocument.h inc/libwps \
+))
+
 # vim: set noet sw=4 ts=4:
-- 
cgit