lib*: consistently name all UnpackedTarball and ExternalProject

Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae

RepositoryExternal.mk

@@ -2427,9 +2427,9 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
 ))
 
 define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_unpacked,$(1),orcus)
+$(call gb_LinkTarget_use_unpacked,$(1),liborcus)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,orcus/include) \
+	-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_use_static_libraries,$(1),orcus)

libcdr/ExternalPackage_libcdr.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\
 	src/lib/libcdr.h \

libcdr/ExternalProject_libcdr.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libcdr,cdr))
+$(eval $(call gb_ExternalProject_ExternalProject,libcdr,libcdr))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
 

libcdr/Module_libcdr.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_CDR),NO)
 $(eval $(call gb_Module_add_targets,libcdr,\
 	ExternalPackage_libcdr \
 	ExternalProject_libcdr \
-	UnpackedTarball_cdr \
+	UnpackedTarball_libcdr \
 ))
 
 endif

libcdr/UnpackedTarball_cdr.mk → libcdr/UnpackedTarball_libcdr.mk

@@ -7,13 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
        libcdr/libcdr-0.0.13.patch \
 ))
 

libmspub/ExternalPackage_libmspub.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,mspub))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,libmspub))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmspub,\
 	src/lib/libmspub.h \

libmspub/ExternalProject_libmspub.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libmspub,mspub))
+$(eval $(call gb_ExternalProject_ExternalProject,libmspub,libmspub))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
 

libmspub/Module_libmspub.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_MSPUB),NO)
 $(eval $(call gb_Module_add_targets,libmspub,\
 	ExternalPackage_libmspub \
 	ExternalProject_libmspub \
-	UnpackedTarball_mspub \
+	UnpackedTarball_libmspub \
 ))
 
 endif

libmspub/UnpackedTarball_libmspub.mk

+# -*- 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,libmspub))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL)))
+
+# vim: set noet sw=4 ts=4:

libmwaw/ExternalPackage_libmwaw.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,mwaw))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,libmwaw))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw,\
 	src/lib/libmwaw.hxx \

libmwaw/ExternalProject_libmwaw.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,mwaw))
+$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,libmwaw))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
 

libmwaw/Module_libmwaw.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_MWAW),NO)
 $(eval $(call gb_Module_add_targets,libmwaw,\
 	ExternalPackage_libmwaw \
 	ExternalProject_libmwaw \
-	UnpackedTarball_mwaw \
+	UnpackedTarball_libmwaw \
 ))
 
 endif

libmwaw/UnpackedTarball_mwaw.mk → libmwaw/UnpackedTarball_libmwaw.mk

@@ -7,13 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,mwaw))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,mwaw,$(MWAW_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mwaw,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,mwaw,\
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
        libmwaw/libmwaw-0.1.7-autotools.patch \
        libmwaw/libmwaw-0.1.7-misc.patch \
 ))

libodfgen/ExternalPackage_libodfgen.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,odfgen))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libodfgen,inc/external/libodfgen,\
 	src/libodfgen.hxx \

libodfgen/ExternalProject_libodfgen.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,odfgen))
+$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,libodfgen))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build))
 

libodfgen/Module_libodfgen.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_ODFGEN),NO)
 $(eval $(call gb_Module_add_targets,libodfgen,\
 	ExternalPackage_libodfgen \
 	ExternalProject_libodfgen \
-	UnpackedTarball_odfgen \
+	UnpackedTarball_libodfgen \
 ))
 
 endif

libodfgen/UnpackedTarball_odfgen.mk → libodfgen/UnpackedTarball_libodfgen.mk

@@ -7,13 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,odfgen))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libodfgen))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,odfgen,$(ODFGEN_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,odfgen,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,odfgen,\
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen,\
        libodfgen/libodfgen-0.0.0-android.patch \
 ))
 

liborcus/ExternalPackage_liborcus.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
 
 $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
 

liborcus/ExternalProject_liborcus.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus,orcus))
+$(eval $(call gb_ExternalProject_ExternalProject,liborcus,liborcus))
 
 $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
 

liborcus/Module_liborcus.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_LIBORCUS),NO)
 $(eval $(call gb_Module_add_targets,liborcus,\
 	ExternalProject_liborcus \
 	ExternalPackage_liborcus \
-	UnpackedTarball_orcus \
+	UnpackedTarball_liborcus \
 ))
 
 endif

liborcus/UnpackedTarball_orcus.mk → liborcus/UnpackedTarball_liborcus.mk

@@ -7,31 +7,31 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,orcus))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,liborcus))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,liborcus,$(ORCUS_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0))
 
-orcus_patches :=
+liborcus_patches :=
 
 # make config.sub recognize arm-linux-androideabi
-orcus_patches += liborcus_0.1.0-configure.patch
+liborcus_patches += liborcus_0.1.0-configure.patch
 
 # don't use dllimport
-orcus_patches += liborcus_0.1.0-dllimport.patch
+liborcus_patches += liborcus_0.1.0-dllimport.patch
 
 ifeq ($(OS),MACOSX)
 # no "tac" command on OS X, but "tail -r"
-orcus_patches += liborcus_0.1.0-tac.patch
+liborcus_patches += liborcus_0.1.0-tac.patch
 endif
 
 # <https://gitorious.org/orcus/orcus/merge_requests/2#
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8-
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
 
-$(eval $(call gb_UnpackedTarball_add_patches,orcus,\
-	$(foreach patch,$(orcus_patches),liborcus/$(patch)) \
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+	$(foreach patch,$(liborcus_patches),liborcus/$(patch)) \
 ))
 
 # vim: set noet sw=4 ts=4:

libvisio/ExternalPackage_libvisio.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,visio))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libvisio,libvisio))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvisio,\
 	src/lib/libvisio.h \

libvisio/ExternalProject_libvisio.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libvisio,visio))
+$(eval $(call gb_ExternalProject_ExternalProject,libvisio,libvisio))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
 

libvisio/Module_libvisio.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_VISIO),NO)
 $(eval $(call gb_Module_add_targets,libvisio,\
 	ExternalPackage_libvisio \
 	ExternalProject_libvisio \
-	UnpackedTarball_visio \
+	UnpackedTarball_libvisio \
 ))
 
 endif

libvisio/UnpackedTarball_visio.mk → libvisio/UnpackedTarball_libvisio.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
 
 # vim: set noet sw=4 ts=4:

libwpd/ExternalPackage_libwpd.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,libwpd))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
 	src/lib/libwpd.h \

libwpd/ExternalProject_libwpd.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd,wpd))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd,libwpd))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
 

libwpd/Module_libwpd.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPD),NO)
 $(eval $(call gb_Module_add_targets,libwpd,\
 	ExternalProject_libwpd \
 	ExternalPackage_libwpd \
-	UnpackedTarball_wpd \
+	UnpackedTarball_libwpd \
 ))
 
 endif

libwps/UnpackedTarball_wps.mk → libwpd/UnpackedTarball_libwpd.mk

@@ -7,8 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,wps))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpd))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL)))
 
 # vim: set noet sw=4 ts=4:

libwpd/UnpackedTarball_wpd.mk

-# -*- 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,wpd))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
-
-# $(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0))
-
-# wpd_patches :=
-
-# $(eval $(call gb_UnpackedTarball_add_patches,wpd,\
-# 	$(foreach patch,$(wpd_patches),libwpd/$(patch)) \
-# ))
-
-# vim: set noet sw=4 ts=4:

libwpg/ExternalPackage_libwpg.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,wpg))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwpg,inc/external/libwpg,\
 	src/lib/libwpg.h \

libwpg/ExternalProject_libwpg.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwpg,wpg))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpg,libwpg))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwpg,build))
 

libwpg/Module_libwpg.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPG),NO)
 $(eval $(call gb_Module_add_targets,libwpg,\
 	ExternalProject_libwpg \
 	ExternalPackage_libwpg \
-	UnpackedTarball_wpg \
+	UnpackedTarball_libwpg \
 ))
 
 endif

libmspub/UnpackedTarball_mspub.mk → libwpg/UnpackedTarball_libwpg.mk

@@ -7,8 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,mspub))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpg))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libwpg,$(WPG_TARBALL)))
 
 # vim: set noet sw=4 ts=4:

libwps/ExternalPackage_libwps.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,wps))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libwps,inc/external/libwps,\
 	src/lib/libwps.h \

libwps/ExternalProject_libwps.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwps,wps))
+$(eval $(call gb_ExternalProject_ExternalProject,libwps,libwps))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwps,build))
 

libwps/Module_libwps.mk

@@ -14,7 +14,7 @@ ifeq ($(SYSTEM_WPS),NO)
 $(eval $(call gb_Module_add_targets,libwps,\
 	ExternalProject_libwps \
 	ExternalPackage_libwps \
-	UnpackedTarball_wps \
+	UnpackedTarball_libwps \
 ))
 
 endif

libwpg/UnpackedTarball_wpg.mk → libwps/UnpackedTarball_libwps.mk

@@ -7,8 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,wpg))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 
 # vim: set noet sw=4 ts=4: