diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libwpd/ExternalPackage_libwpd.mk | 17 |
3 files changed, 5 insertions, 18 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9844a172197b..d80a22a29050 100644 --- a/RepositoryExternal.mk +++ b/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 \ ) diff --git a/configure.ac b/configure.ac index 565aef947f2a..cc42d699e92d 100644 --- a/configure.ac +++ b/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 diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk index dfab3da377fa..2e7cd0955a0a 100644 --- a/libwpd/ExternalPackage_libwpd.mk +++ b/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) |