[Libreoffice-commits] .: solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 10 06:06:24 PST 2012
solenv/gbuild/AllLangResTarget.mk | 1 +
solenv/gbuild/AllLangZip.mk | 1 +
solenv/gbuild/CliLibrary.mk | 1 +
solenv/gbuild/CliNativeLibrary.mk | 1 +
solenv/gbuild/CliUnoApi.mk | 1 +
solenv/gbuild/Configuration.mk | 2 ++
solenv/gbuild/CppunitTest.mk | 1 +
solenv/gbuild/CustomTarget.mk | 1 +
solenv/gbuild/Dictionary.mk | 1 +
solenv/gbuild/Executable.mk | 1 +
solenv/gbuild/Extension.mk | 1 +
solenv/gbuild/ExternalPackage.mk | 1 +
solenv/gbuild/ExternalProject.mk | 1 +
solenv/gbuild/Helper.mk | 7 +++++++
solenv/gbuild/InstallModule.mk | 1 +
solenv/gbuild/InstallScript.mk | 1 +
solenv/gbuild/InternalUnoApi.mk | 1 +
solenv/gbuild/Jar.mk | 1 +
solenv/gbuild/JunitTest.mk | 4 ++++
solenv/gbuild/Library.mk | 1 +
solenv/gbuild/Package.mk | 1 +
solenv/gbuild/Pagein.mk | 1 +
solenv/gbuild/Pyuno.mk | 1 +
solenv/gbuild/Rdb.mk | 1 +
solenv/gbuild/StaticLibrary.mk | 1 +
solenv/gbuild/UI.mk | 2 ++
solenv/gbuild/UnoApi.mk | 1 +
solenv/gbuild/UnoApiMerge.mk | 1 +
solenv/gbuild/UnpackedTarball.mk | 1 +
solenv/gbuild/WinResTarget.mk | 1 +
solenv/gbuild/Zip.mk | 1 +
31 files changed, 42 insertions(+)
New commits:
commit 28ae80a89dd44f32044a155a41c1106692feae61
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Thu Dec 6 16:58:58 2012 +0100
userfriendly make targets for build and clean
So that now it's possible to do just
'make CppunitTest_sw_macros_test'
instead of
'make /home/llunak/build/src/l2/workdir/unxlngx6/CppunitTest/sw_macros_test.test'
Change-Id: Ibd1e9ef4fc825043a71bd669b2f5c37ffec68e33
Reviewed-on: https://gerrit.libreoffice.org/1253
Reviewed-by: Peter Foley <jpfoley2 at gmail.com>
Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
Tested-by: Luboš Luňák <l.lunak at suse.cz>
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index f56bbf9..0dd69e5 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -453,6 +453,7 @@ define gb_AllLangResTarget_AllLangResTarget
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget)
endef
diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index fa3b9de..c02ddf1 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -40,6 +40,7 @@ $(foreach lang,$(gb_AllLangZip_LANGS),$(call gb_Zip_Zip_internal,$(1)_$(lang),$(
$(call gb_AllLangZip_get_target,$(1)) :| $(dir $(call gb_AllLangZip_get_target,$(1))).dir
$$(eval $$(call gb_Module_register_target,$(call gb_AllLangZip_get_target,$(1)),$(call gb_AllLangZip_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),AllLangZip)
endef
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 6b3a4ef..6302cf4 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -141,6 +141,7 @@ $(call gb_CliLibrary_get_clean_target,$(1)) : $(call gb_CliAssembly_get_clean_ta
$(call gb_Deliver_add_deliverable,$(call gb_CliLibrary_get_target,$(1)),$(call gb_CliLibraryTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_CliLibrary_get_target,$(1)),$(call gb_CliLibrary_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),CliLibrary)
endef
diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk
index f5c1249..ecf8fea 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -100,6 +100,7 @@ $(call gb_CliNativeLibrary_get_clean_target,$(1)) : $(call gb_CliAssembly_get_cl
$(call gb_Deliver_add_deliverable,$(call gb_CliNativeLibrary_get_target,$(1)),$(call gb_CliNativeLibraryTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_CliNativeLibrary_get_target,$(1)),$(call gb_CliNativeLibrary_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),CliNativeLibrary)
endef
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f0a2735..f72a4e0 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -124,6 +124,7 @@ $(call gb_CliUnoApi_get_clean_target,$(1)) : $(call gb_CliAssembly_get_clean_tar
$(call gb_Deliver_add_deliverable,$(call gb_CliUnoApi_get_target,$(1)),$(call gb_CliUnoApiTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_CliUnoApiTarget_get_target,$(1)),$(call gb_CliUnoApiTarget_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),CliUnoApiTarget)
endef
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 05a096f..47645a6 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -354,6 +354,7 @@ $(call gb_Configuration_get_preparation_target,%) :
# TODO: ?
define gb_Configuration_Configuration_nozip
$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
endef
# $(call gb_Configuration_Configuration,zipfile,repo,nodeliver)
@@ -371,6 +372,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \
$(call gb_Zip_get_clean_target,$(1)_$(lang))))
$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
endef
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 74a5876..6ea7f27 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -128,6 +128,7 @@ $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
$(call gb_CppunitTest_get_target,$(1)) : DBGSV_ERROR_OUT := shell
$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT :=
$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest)
endef
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index f56e262..563a730 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -43,6 +43,7 @@ $(call gb_CustomTarget_get_clean_target,%) :
define gb_CustomTarget_CustomTarget
$(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),CustomTarget)
$(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_target,$(1))).dir
endef
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index c40e376..8e4e45c 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -71,6 +71,7 @@ $(call gb_Dictionary_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clea
$(call gb_Deliver_add_deliverable,$(call gb_Dictionary_get_target,$(1)),$(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1))),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_Dictionary_get_target,$(1)),$(call gb_Dictionary_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Dictionary)
endef
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index e34de00..2fa6750 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -56,6 +56,7 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Executable_Executable_platform,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Executable)
$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index eee1232..888d8c8 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -38,6 +38,7 @@ $(call gb_Extension_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clean
$(call gb_Deliver_add_deliverable,$(call gb_Extension_get_target,$(1)),$(call gb_ExtensionTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_Extension_get_target,$(1)),$(call gb_Extension_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Extension)
endef
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index c69d3ad..8ebefba 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -46,6 +46,7 @@ define gb_ExternalPackage_ExternalPackage
$(call gb_ExternalPackage_ExternalPackage_internal,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_ExternalPackage_get_target,$(1)),$(call gb_ExternalPackage_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),ExternalPackage)
endef
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index ff504bb..ca49c7f 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -66,6 +66,7 @@ $(call gb_ExternalProject_get_target,$(1)) : $(call gb_ExternalProject_get_prepa
$(call gb_ExternalProject_get_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir
$$(eval $$(call gb_Module_register_target,$(call gb_ExternalProject_get_target,$(1)),$(call gb_ExternalProject_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),ExternalProject)
endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index e1e5119..f81a6b4 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -95,6 +95,13 @@ define gb_Helper_get_outdir_clean_target
$$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
endef
+# e.g. 'make CppunitTest_sw_macros_test'
+define gb_Helper_make_userfriendly_targets
+.PHONY: $(2)_$(1) $(2)_$(1)_clean
+$(2)_$(1) : $(call gb_$(2)_get_target,$(1))
+$(2)_$(1).clean : $(call gb_$(2)_get_clean_target,$(1))
+endef
+
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index cb37a49..e172156 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -46,6 +46,7 @@ $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_ta
$(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_InstallModule_get_target,$(1)),$(call gb_InstallModule_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),InstallModule)
endef
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 6b22c43..e3b56f4 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -106,6 +106,7 @@ $(call gb_InstallScript_get_clean_target,$(1)) : $(call gb_InstallScriptTarget_g
$(call gb_Deliver_add_deliverable,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScriptTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_InstallScript_get_target,$(1)),$(call gb_InstallScript_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),InstallScript)
endef
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 587e624..e7c1240 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -60,6 +60,7 @@ $(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarge
$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi)
endef
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 5d53511..2a0890e 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -97,6 +97,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Jar)
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 6ed1f77..cb89d6c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -75,6 +75,8 @@ $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
$(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,$(1)),$(OOO_JUNIT_JAR))
$(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),JunitTest)
+
endef
define gb_JunitTest_set_defs
@@ -191,6 +193,8 @@ $(call gb_JunitTest_get_target,%) :
define gb_JunitTest_JunitTest
$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),JunitTest)
+
endef
gb_JunitTest_set_defs :=
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 6b22f0b..0552c86 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -72,6 +72,7 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
$$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Library)
$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 534e39a..31728bb 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -78,6 +78,7 @@ endef
define gb_Package_Package
$(call gb_Package_Package_internal,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Package)
endef
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 60d98ac..7f69ccc 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -60,6 +60,7 @@ define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Pagein)
$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
endef
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 9ad8b36..42fbbf0 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -37,6 +37,7 @@ $(call gb_Pyuno_get_clean_target,%) :
define gb_Pyuno_Pyuno
$(call gb_Zip_Zip,Pyuno/$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,Pyuno/$(1))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index ad4562d..1a67865 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -63,6 +63,7 @@ $(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Rdb)
endef
define gb_Rdb_add_component
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 65e77b8..74514dc 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -60,6 +60,7 @@ $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_
$(call gb_StaticLibrary_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),StaticLibrary)
$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 47a1a78..e29fd1a 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -158,6 +158,8 @@ $(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui
endif
$$(eval $$(call gb_Module_register_target,$(call gb_UI_get_target,$(1)),$(call gb_UI_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),UI)
+
endef
# gb_UI__get_outdir_filename target file lang?
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index a5ecfda..05e6524 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -53,6 +53,7 @@ $(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarg
$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
endef
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
index d321219..afa66ca 100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -43,6 +43,7 @@ $(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),UnoApiMerge)
endef
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 6e0fa28..e6ed638 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -220,6 +220,7 @@ define gb_UnpackedTarball_UnpackedTarball
$(call gb_UnpackedTarball_UnpackedTarball_internal,$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_UnpackedTarball_get_final_target,$(1)),$(call gb_UnpackedTarball_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),UnpackedTarball)
endef
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 62e4bbf..2555fa8 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -7,6 +7,7 @@ gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
define gb_WinResTarget_WinResTarget
$(call gb_WinResTarget_WinResTarget_init,$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_WinResTarget_get_target,$(1)),$(call gb_WinResTarget_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),WinResTarget)
endef
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 715b495..f446415 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -85,6 +85,7 @@ define gb_Zip_Zip
$(call gb_Zip_Zip_internal,$(1),$(2))
$(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),Zip)
endef
More information about the Libreoffice-commits
mailing list