libwpd: stop delivering headers

Change-Id: Ic9209b5db0990bc9433d82ef95ca64179e888f51

RepositoryExternal.mk

@@ -1479,6 +1479,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 ))
 
 define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_set_include,$(1),\
+	$(WPD_CFLAGS) \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_package,$(1),\
 	libwpd \
 )

configure.ac

@@ -7232,7 +7232,7 @@ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1])
 dnl ===================================================================
 dnl Check for system libwpd
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpdlib"])
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${OUTDIR}/lib -lwpdlib"])
 
 dnl ===================================================================
 dnl Check for system lcms2

libwpd/ExternalPackage_libwpd.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,libwpd))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
-	inc/libwpd/libwpd.h \
-	inc/libwpd/WPDocument.h \
-	inc/libwpd/WPXBinaryData.h \
-	inc/libwpd/WPXDocumentInterface.h \
-	inc/libwpd/WPXProperty.h \
-	inc/libwpd/WPXPropertyList.h \
-	inc/libwpd/WPXString.h \
-	inc/libwpd/WPXPropertyListVector.h \
-))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\
-	inc/libwpd-stream/libwpd-stream.h \
-	inc/libwpd-stream/WPXStream.h \
-	inc/libwpd-stream/WPXStreamImplementation.h \
-))
-
 $(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)