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

fdo#70393: move vigra to a subdir of external

Browse Source 
Change-Id: I98e2ae25865c4ec38da19a24ba4347540d170e4f
Reviewed-on: https://gerrit.libreoffice.org/6554
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Khaled Hosny
2013-11-03 20:43:21 +02:00
committed by David Tardon
parent a06d8eb9a9
commit 112c60b484
9 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RepositoryModule_build.mk
View File

@@ -78,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
ucb \ ucb \
unoxml \ unoxml \
vcl \ vcl \
$(call gb_Helper_optional,VIGRA,vigra) \
xmloff \ xmloff \
xmlscript \ xmlscript \
) \ ) \

1
RepositoryModule_host.mk
View File

@@ -144,7 +144,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
uui \ uui \
vbahelper \ vbahelper \
vcl \ vcl \
$(call gb_Helper_optional,VIGRA,vigra) \
wizards \ wizards \
writerfilter \ writerfilter \
writerperfect \ writerperfect \

2
external/Module_external.mk vendored
View File

@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,REDLAND,redland) \ $(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,RHINO,rhino) \ $(call gb_Helper_optional,RHINO,rhino) \
$(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,VIGRA,vigra) \
$(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \ $(call gb_Helper_optional,WPG,libwpg) \
@@ -83,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,NSS,nss) \ $(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,VIGRA,vigra) \
) \ ) \
) \ ) \
)) ))

2
vigra/Makefile → external/vigra/Makefile vendored
View File

@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

0
vigra/Module_vigra.mk → external/vigra/Module_vigra.mk vendored
View File

0
vigra/README → external/vigra/README vendored
View File

4
vigra/UnpackedTarball_vigra.mk → external/vigra/UnpackedTarball_vigra.mk vendored
View File

@@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,vigra))
$(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,vigra,\ $(eval $(call gb_UnpackedTarball_add_patches,vigra,\
vigra/vigra1.6.0.patch \ external/vigra/vigra1.6.0.patch \
$(if $(filter GCC,$(COM)), \ $(if $(filter GCC,$(COM)), \
vigra/vigra1.6.0-unused-parameters.patch) \ external/vigra/vigra1.6.0-unused-parameters.patch) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

0
vigra/vigra1.6.0-unused-parameters.patch → external/vigra/vigra1.6.0-unused-parameters.patch vendored
View File

0
vigra/vigra1.6.0.patch → external/vigra/vigra1.6.0.patch vendored
View File