diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-06 23:35:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-07 01:41:26 +0200 |
| commit | 10fc13c94890837ca6a8c1a47efe3b2dcba85471 (patch) | |
| tree | 2b597737c4647a21c0d0b59b0a125410034d5eb8 /libwpd | |
| parent | 276021c76102e685c7dbe3776d5f79f71a59ac82 (diff) | |
lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/ExternalPackage_libwpd.mk | 2 | ||||
| -rw-r--r-- | libwpd/ExternalProject_libwpd.mk | 2 | ||||
| -rw-r--r-- | libwpd/Module_libwpd.mk | 2 | ||||
| -rw-r--r-- | libwpd/UnpackedTarball_libwpd.mk (renamed from libwpd/UnpackedTarball_wpd.mk) | 12 |
4 files changed, 5 insertions, 13 deletions
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk index ae1b029c815b..0b45fb472cb4 100644 --- a/libwpd/ExternalPackage_libwpd.mk +++ b/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 \ diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index 0f46cfd3551f..9759fc4b1ed7 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/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)) diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk index 13ef595e47aa..401644a9d36f 100644 --- a/libwpd/Module_libwpd.mk +++ b/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 diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_libwpd.mk index 24e589c288c1..d4b4c7a99e8d 100644 --- a/libwpd/UnpackedTarball_wpd.mk +++ b/libwpd/UnpackedTarball_libwpd.mk @@ -7,16 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UnpackedTarball_UnpackedTarball,wpd)) +$(eval $(call gb_UnpackedTarball_UnpackedTarball,libwpd)) -$(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)) \ -# )) +$(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL))) # vim: set noet sw=4 ts=4: |