diff options
38 files changed, 72 insertions, 80 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 652e948ad407..5d30da166ed4 100644 --- a/RepositoryExternal.mk +++ b/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) diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 4f08279c754b..9fd6d9ad713a 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/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 \ diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 1a89d5846d28..f71408e4b48c 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/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)) diff --git a/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk index e92d5ad8e1ca..9074a9e9aae3 100644 --- a/libcdr/Module_libcdr.mk +++ b/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 diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_libcdr.mk index a4a427d4ca21..e5cd13595292 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/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 \ )) 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/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk index b6781297223d..2bfd9c970886 100644 --- a/libmwaw/ExternalPackage_libmwaw.mk +++ b/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 \ diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index b3881a946080..52e23ceb5252 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/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)) diff --git a/libmwaw/Module_libmwaw.mk b/libmwaw/Module_libmwaw.mk index c1a878b3dcdc..5c6766d73989 100644 --- a/libmwaw/Module_libmwaw.mk +++ b/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 diff --git a/libmwaw/UnpackedTarball_mwaw.mk b/libmwaw/UnpackedTarball_libmwaw.mk index 87d778b996c3..08a1d614a210 100644 --- a/libmwaw/UnpackedTarball_mwaw.mk +++ b/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 \ )) diff --git a/libodfgen/ExternalPackage_libodfgen.mk b/libodfgen/ExternalPackage_libodfgen.mk index 45920fe716df..6bbe90f115c1 100644 --- a/libodfgen/ExternalPackage_libodfgen.mk +++ b/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 \ diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk index 2b417ffc5be7..9d34e06d40d9 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/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)) diff --git a/libodfgen/Module_libodfgen.mk b/libodfgen/Module_libodfgen.mk index c88c4bf7661d..d20392f30d10 100644 --- a/libodfgen/Module_libodfgen.mk +++ b/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 diff --git a/libodfgen/UnpackedTarball_odfgen.mk b/libodfgen/UnpackedTarball_libodfgen.mk index 8d595b917de0..3a191d283ac4 100644 --- a/libodfgen/UnpackedTarball_odfgen.mk +++ b/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 \ )) diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk index 8ed7a6773e3a..8381e76fcd9c 100644 --- a/liborcus/ExternalPackage_liborcus.mk +++ b/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)) diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 80eb92620dbf..df8b49447e9e 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/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)) diff --git a/liborcus/Module_liborcus.mk b/liborcus/Module_liborcus.mk index af18ad3b37c0..78e90d98ca07 100644 --- a/liborcus/Module_liborcus.mk +++ b/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 diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_liborcus.mk index 6370b2f8a4b1..e43144db031b 100644 --- a/liborcus/UnpackedTarball_orcus.mk +++ b/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: diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk index 5838a137554c..042f10b86bc5 100644 --- a/libvisio/ExternalPackage_libvisio.mk +++ b/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 \ diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 961db683a8e2..9ef2a84f3923 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/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)) diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk index 371426545758..56ef74cf139f 100644 --- a/libvisio/Module_libvisio.mk +++ b/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 diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_libvisio.mk index 59c29ac83a7d..f71161a07c0c 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/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: 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/libwps/UnpackedTarball_wps.mk b/libwpd/UnpackedTarball_libwpd.mk index c5698f7fc94a..d4b4c7a99e8d 100644 --- a/libwps/UnpackedTarball_wps.mk +++ b/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: diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk deleted file mode 100644 index 24e589c288c1..000000000000 --- a/libwpd/UnpackedTarball_wpd.mk +++ /dev/null @@ -1,22 +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,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: diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk index 916aae1e1316..927f2dae9b1f 100644 --- a/libwpg/ExternalPackage_libwpg.mk +++ b/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 \ diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index 3f6522c6cd1f..0a0b6bcb05de 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/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)) diff --git a/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk index d15e01d84242..17abb6853460 100644 --- a/libwpg/Module_libwpg.mk +++ b/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 diff --git a/libmspub/UnpackedTarball_mspub.mk b/libwpg/UnpackedTarball_libwpg.mk index 51931694422e..03be2064afba 100644 --- a/libmspub/UnpackedTarball_mspub.mk +++ b/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: diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk index 2390a8fae881..995ec7c8a856 100644 --- a/libwps/ExternalPackage_libwps.mk +++ b/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 \ diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index 322d50a7b71c..0cccf2cc536b 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/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)) diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index 36ab218835e7..c5fd1660bdac 100644 --- a/libwps/Module_libwps.mk +++ b/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 diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwps/UnpackedTarball_libwps.mk index 00c127c77449..1fd633acbe90 100644 --- a/libwpg/UnpackedTarball_wpg.mk +++ b/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: |