From 10fc13c94890837ca6a8c1a47efe3b2dcba85471 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 6 May 2013 23:35:13 +0200 Subject: lib*: consistently name all UnpackedTarball and ExternalProject Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae --- libmspub/ExternalPackage_libmspub.mk | 2 +- libmspub/ExternalProject_libmspub.mk | 2 +- libmspub/Module_libmspub.mk | 2 +- libmspub/UnpackedTarball_libmspub.mk | 14 ++++++++++++++ libmspub/UnpackedTarball_mspub.mk | 14 -------------- 5 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 libmspub/UnpackedTarball_libmspub.mk delete mode 100644 libmspub/UnpackedTarball_mspub.mk (limited to 'libmspub') diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk index 3807c2b16064..b252a30c8f36 100644 --- a/libmspub/ExternalPackage_libmspub.mk +++ b/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 \ diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index a283a167013c..3e28ba27d1f7 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/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)) diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk index 844ac5451d1f..12cdfd316a4b 100644 --- a/libmspub/Module_libmspub.mk +++ b/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 diff --git a/libmspub/UnpackedTarball_libmspub.mk b/libmspub/UnpackedTarball_libmspub.mk new file mode 100644 index 000000000000..044ce9656c49 --- /dev/null +++ b/libmspub/UnpackedTarball_libmspub.mk @@ -0,0 +1,14 @@ +# -*- 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: diff --git a/libmspub/UnpackedTarball_mspub.mk b/libmspub/UnpackedTarball_mspub.mk deleted file mode 100644 index 51931694422e..000000000000 --- a/libmspub/UnpackedTarball_mspub.mk +++ /dev/null @@ -1,14 +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,mspub)) - -$(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL))) - -# vim: set noet sw=4 ts=4: -- cgit