consistent naming of externals: jpeg-turbo->libjpeg-turbo

Change-Id: I63fcebc36559c2698bbedd3501285a388ce8c257
Reviewed-on: https://gerrit.libreoffice.org/42291
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

13 files changed, 36 insertions, 36 deletions

diff --git a/external/Module_external.mk b/external/Module_external.mk
index f24a45442c22..02af9df08ae3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -51,7 +51,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_TURBO,jpeg-turbo) \
+	$(call gb_Helper_optional,LIBJPEG_TURBO,libjpeg-turbo) \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,LIBASSUAN,libassuan) \
diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
deleted file mode 100644
index f149e037ea69..000000000000
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,jpeg-turbo))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,jpeg-turbo,$(JPEG_TURBO_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,jpeg-turbo,0))
-
-$(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\
-	external/jpeg-turbo/jpeg-turbo.build.patch.1 \
-	$(if $(filter WNT,$(OS)),external/jpeg-turbo/jpeg-turbo.win_build.patch.1) \
-	external/jpeg-turbo/ubsan.patch \
-	external/jpeg-turbo/jpeg-turbo.iOS.patch.1 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index f902f25e6dee..3175c433b0bf 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -7,22 +7,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jpeg-turbo))
+$(eval $(call gb_ExternalProject_ExternalProject,libjpeg-turbo))
 
-$(eval $(call gb_ExternalProject_use_autoconf,jpeg-turbo,configure))
-$(eval $(call gb_ExternalProject_use_autoconf,jpeg-turbo,build))
+$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,configure))
+$(eval $(call gb_ExternalProject_use_autoconf,libjpeg-turbo,build))
 
-$(eval $(call gb_ExternalProject_register_targets,jpeg-turbo,\
+$(eval $(call gb_ExternalProject_register_targets,libjpeg-turbo,\
 	configure \
 	build \
 ))
 
-$(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure)
+$(call gb_ExternalProject_get_state_target,libjpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure)
 	+$(call gb_ExternalProject_run,build,\
 		$(MAKE) \
 	)
 
-$(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
+$(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
 	$(call gb_ExternalProject_run,configure,\
 		MAKE=$(MAKE) ./configure \
 			--build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
diff --git a/external/jpeg-turbo/Makefile b/external/libjpeg-turbo/Makefile
index e4968cf85fb6..e4968cf85fb6 100644
--- a/external/jpeg-turbo/Makefile
+++ b/external/libjpeg-turbo/Makefile
diff --git a/external/jpeg-turbo/Module_jpeg-turbo.mk b/external/libjpeg-turbo/Module_libjpeg-turbo.mk
index 20899f5e3bcf..137e7557bacf 100644
--- a/external/jpeg-turbo/Module_jpeg-turbo.mk
+++ b/external/libjpeg-turbo/Module_libjpeg-turbo.mk
@@ -7,11 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Module_Module,jpeg-turbo))
+$(eval $(call gb_Module_Module,libjpeg-turbo))
 
-$(eval $(call gb_Module_add_targets,jpeg-turbo,\
-	ExternalProject_jpeg-turbo \
-	UnpackedTarball_jpeg-turbo \
+$(eval $(call gb_Module_add_targets,libjpeg-turbo,\
+	ExternalProject_libjpeg-turbo \
+	UnpackedTarball_libjpeg-turbo \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/README b/external/libjpeg-turbo/README
index 46eff7cb7487..46eff7cb7487 100644
--- a/external/jpeg-turbo/README
+++ b/external/libjpeg-turbo/README
diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
new file mode 100644
index 000000000000..dd0f88becb2d
--- /dev/null
+++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libjpeg-turbo))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,libjpeg-turbo,$(LIBJPEG_TURBO_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libjpeg-turbo,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\
+	external/libjpeg-turbo/jpeg-turbo.build.patch.1 \
+	$(if $(filter WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \
+	external/libjpeg-turbo/ubsan.patch \
+	external/libjpeg-turbo/jpeg-turbo.iOS.patch.1 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg-turbo/jpeg-turbo.build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.build.patch.1
index 4d01ad4b9aed..4d01ad4b9aed 100644
--- a/external/jpeg-turbo/jpeg-turbo.build.patch.1
+++ b/external/libjpeg-turbo/jpeg-turbo.build.patch.1
diff --git a/external/jpeg-turbo/jpeg-turbo.iOS.patch.1 b/external/libjpeg-turbo/jpeg-turbo.iOS.patch.1
index d81ab59c19ad..d81ab59c19ad 100644
--- a/external/jpeg-turbo/jpeg-turbo.iOS.patch.1
+++ b/external/libjpeg-turbo/jpeg-turbo.iOS.patch.1
diff --git a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 b/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1
index 00b642703f3a..00b642703f3a 100644
--- a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
+++ b/external/libjpeg-turbo/jpeg-turbo.win_build.patch.1
diff --git a/external/jpeg-turbo/ubsan.patch b/external/libjpeg-turbo/ubsan.patch
index 81ff148c57d6..81ff148c57d6 100644
--- a/external/jpeg-turbo/ubsan.patch
+++ b/external/libjpeg-turbo/ubsan.patch
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk
index b1cae45342f5..13457c1a781e 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -531,7 +531,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
 ))
 
 $(eval $(call gb_Library_use_externals,pdfium,\
-    jpeg \
+    libjpeg \
     lcms2 \
     zlib \
 ))
diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk
index 9db697fd482c..61df84311fae 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,poppler))
 $(eval $(call gb_ExternalProject_use_autoconf,poppler,build))
 
 $(eval $(call gb_ExternalProject_use_externals,poppler,\
-	jpeg \
+	libjpeg \
 ))
 
 $(eval $(call gb_ExternalProject_register_targets,poppler,\