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

fdo#70393: move jpeg to a subdir of external

Browse Source 
Change-Id: I56be33efe0cc1deaf7a7e7ce6c6ea292dbe7786d
Reviewed-on: https://gerrit.libreoffice.org/6543
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:02:13 +02:00 committed by David Tardon
parent 5285beeaa4
commit e485e0ffb5
9 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RepositoryModule_host.mk
View File

@ -65,7 +65,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
instsetoo_native \ instsetoo_native \
io \ io \
javaunohelper \ javaunohelper \
$(call gb_Helper_optional,JPEG,jpeg) \
jurt \ jurt \
jvmaccess \ jvmaccess \
jvmfwk \ jvmfwk \

1
external/Module_external.mk vendored
View File

@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HYPHEN,hyphen) \ $(call gb_Helper_optional,HYPHEN,hyphen) \
$(call gb_Helper_optional,ICU,icu) \ $(call gb_Helper_optional,ICU,icu) \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \
$(call gb_Helper_optional,JPEG,jpeg) \
$(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \

2
jpeg/Makefile → external/jpeg/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
jpeg/Module_jpeg.mk → external/jpeg/Module_jpeg.mk vendored
View File

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

0
jpeg/StaticLibrary_jpeg.mk → external/jpeg/StaticLibrary_jpeg.mk vendored
View File

4
jpeg/UnpackedTarball_jpeg.mk → external/jpeg/UnpackedTarball_jpeg.mk vendored
View File

@ -11,10 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,jpeg))
$(eval $(call gb_UnpackedTarball_set_tarball,jpeg,$(JPEG_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,jpeg,$(JPEG_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_file,jpeg,jconfig.h,jpeg/configs/jconfig.h)) $(eval $(call gb_UnpackedTarball_add_file,jpeg,jconfig.h,external/jpeg/configs/jconfig.h))
$(eval $(call gb_UnpackedTarball_add_patches,jpeg,\ $(eval $(call gb_UnpackedTarball_add_patches,jpeg,\
jpeg/patches/jpeg-8c-jmorecfg.patch \ external/jpeg/patches/jpeg-8c-jmorecfg.patch \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

0
jpeg/configs/jconfig.h → external/jpeg/configs/jconfig.h vendored
View File

0
jpeg/patches/jpeg-8c-jmorecfg.patch → external/jpeg/patches/jpeg-8c-jmorecfg.patch vendored
View File