consistent naming of externals: langtag -> liblangtag

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

RepositoryExternal.mk

@@ -977,7 +977,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
-$(call gb_LinkTarget_use_external_project,$(1),langtag)
+$(call gb_LinkTarget_use_external_project,$(1),liblangtag)
 
 endef
 
@@ -1000,7 +1000,7 @@ endef
 endif # MSC
 
 define gb_ExternalProject__use_liblangtag
-$(call gb_ExternalProject_use_external_project,$(1),langtag)
+$(call gb_ExternalProject_use_external_project,$(1),liblangtag)
 
 endef
 

bin/lo-all-static-libs

@@ -68,7 +68,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
      $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
      $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
      $WORKDIR/UnpackedTarball/libjpeg-turbo/.libs/*.a \
-     $WORKDIR/UnpackedTarball/langtag/liblangtag/.libs/*.a \
+     $WORKDIR/UnpackedTarball/liblangtag/liblangtag/.libs/*.a \
      $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
      $WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
      $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \

configure.ac

@@ -11251,11 +11251,11 @@ else
     SYSTEM_LIBLANGTAG=
     AC_MSG_RESULT([no])
     BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
-    LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/langtag"
+    LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/liblangtag"
     if test "$COM" = "MSC"; then
-        LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
+        LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/liblangtag/liblangtag/.libs/liblangtag.lib"
     else
-        LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs -llangtag"
+        LIBLANGTAG_LIBS="-L${WORKDIR}/UnpackedTarball/liblangtag/liblangtag/.libs -llangtag"
     fi
 fi
 AC_SUBST(SYSTEM_LIBLANGTAG)

external/liblangtag/ExternalPackage_liblangtag.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag,langtag))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag,liblangtag))
 
-$(eval $(call gb_ExternalPackage_use_external_project,liblangtag,langtag))
+$(eval $(call gb_ExternalPackage_use_external_project,liblangtag,liblangtag))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib))

external/liblangtag/ExternalPackage_liblangtag_data.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,liblangtag))
 
-$(eval $(call gb_ExternalPackage_use_external_project,liblangtag_data,langtag))
+$(eval $(call gb_ExternalPackage_use_external_project,liblangtag_data,liblangtag))
 
 $(eval $(call gb_ExternalPackage_add_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
 	data/language-subtag-registry.xml \

external/liblangtag/ExternalProject_langtag.mk → external/liblangtag/ExternalProject_liblangtag.mk

@@ -7,20 +7,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,langtag))
+$(eval $(call gb_ExternalProject_ExternalProject,liblangtag))
 
-$(eval $(call gb_ExternalProject_use_external,langtag,libxml2))
+$(eval $(call gb_ExternalProject_use_external,liblangtag,libxml2))
 
-$(eval $(call gb_ExternalProject_use_autoconf,langtag,build))
+$(eval $(call gb_ExternalProject_use_autoconf,liblangtag,build))
 
-$(eval $(call gb_ExternalProject_register_targets,langtag,\
+$(eval $(call gb_ExternalProject_register_targets,liblangtag,\
 	build \
 ))
 
 # disable ccache on windows, as it doesn't cope with the quoted defines
 # liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar).
 # Results in "cl : Command line error D8003 : missing source filename"
-$(call gb_ExternalProject_get_state_target,langtag,build):
+$(call gb_ExternalProject_get_state_target,liblangtag,build):
 	$(call gb_ExternalProject_run,build,\
 		MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --with-pic \
 		$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 			REAL_CC_FLAGS="$(filter -%,$(CC))") \
 		   $(if $(verbose),V=1) \
 		   $(MAKE) \
-                LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,langtag)/liblangtag/.libs))' \
+                LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs))' \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl URELIB \
 				$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \

external/liblangtag/Module_liblangtag.mk

@@ -10,9 +10,9 @@
 $(eval $(call gb_Module_Module,liblangtag))
 
 $(eval $(call gb_Module_add_targets,liblangtag,\
-	UnpackedTarball_langtag \
+	UnpackedTarball_liblangtag \
 	ExternalPackage_liblangtag_data \
-	ExternalProject_langtag \
+	ExternalProject_liblangtag \
 ))
 
 

external/liblangtag/UnpackedTarball_langtag.mk → external/liblangtag/UnpackedTarball_liblangtag.mk

@@ -7,23 +7,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,liblangtag))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag))
+$(eval $(call gb_UnpackedTarball_set_tarball,liblangtag,$(LIBLANGTAG_TARBALL),,liblangtag))
 
-$(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
+$(eval $(call gb_UnpackedTarball_set_pre_action,liblangtag,\
 	$(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
 ))
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+$(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
 	external/liblangtag/liblangtag-bundled-soname.patch.0 \
 ))
 endif
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,langtag, \
+$(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \
 	$(if $(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
     external/liblangtag/clang-cl.patch.0 \
     external/liblangtag/langtag-valencia.patch.0 \