mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not deliver libwpg headers

Browse Source 
Yes, I am impatient .-)

Change-Id: I3d9c292b0d86bc1dd40a574272a43d8178f3a3b3
This commit is contained in:
David Tardon 2013-05-24 14:53:37 +02:00
parent 87a22d6a23
commit c51a2542f5
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@ -1593,6 +1593,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_wpg
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_package,$(1),\
libwpg \
)

2
configure.ac
View File

@ -7282,7 +7282,7 @@ libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external"
dnl ===================================================================
dnl Check for system libwpg
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpglib"])
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${WORKDIR}/UnpackedTarball/libwpg/inc"],["-L${OUTDIR}/lib -lwpglib"])
# ===================================================================
# Check for system libxslt

6
libwpg/ExternalPackage_libwpg.mk
View File

@ -9,12 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg,inc/external/libwpg,\
src/lib/libwpg.h \
src/lib/WPGPaintInterface.h \
src/lib/WPGraphics.h \
))
$(eval $(call gb_ExternalPackage_use_external_project,libwpg,libwpg))
ifeq ($(OS)$(COM),WNTMSC)

7
libwpg/UnpackedTarball_libwpg.mk
View File

@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg))
$(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL)))
# HACK to avoid the need to deliver the headers to $(OUTDIR). This
# should be removed when libwpg is updated.
$(eval $(call gb_UnpackedTarball_set_post_action,libwpg,\
mkdir -p inc/libwpg && \
cp -f src/lib/libwpg.h src/lib/WPGPaintInterface.h src/lib/WPGraphics.h inc/libwpg \
))
# vim: set noet sw=4 ts=4: