fdo#70393: move jpeg to a subdir of external

Change-Id: I56be33efe0cc1deaf7a7e7ce6c6ea292dbe7786d
Reviewed-on: https://gerrit.libreoffice.org/6543
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

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

external/Module_external.mk

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

external/jpeg/Makefile

@@ -2,6 +2,6 @@
 
 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:

external/jpeg/UnpackedTarball_jpeg.mk

@@ -11,10 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,jpeg))
 
 $(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,\
-    jpeg/patches/jpeg-8c-jmorecfg.patch \
+    external/jpeg/patches/jpeg-8c-jmorecfg.patch \
 ))
 
 # vim: set noet sw=4 ts=4: