diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Pagein.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Rdb.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Zip.mk | 2 |
8 files changed, 13 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 3b392e3d0688..f19de69c3c1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,7 +124,8 @@ gbuild_TARGETS := AllLangHelp \ UnoApiMerge \ UnpackedTarball \ WinResTarget \ - Zip + Zip \ + ZipPackage # build a generic gbuild target $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules),$(target)_$(module)/%)): $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 0a732c2270db..64876e4bebac 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -106,10 +106,13 @@ $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1)) endef # e.g. 'make CppunitTest_sw_macros_test' +# +# gb_Helper_make_userfriendly_targets target class build-target? clean-target? 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)) +$(2)_$(1) : $(if $(3),$(3),$(call gb_$(2)_get_target,$(1))) +$(2)_$(1).clean : $(if $(4),$(4),$(call gb_$(2)_get_clean_target,$(1))) + endef define gb_Helper_init_registries diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index ff40b3be20f4..12b9d16ca557 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -97,7 +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_Helper_make_userfriendly_targets,$(1),Jar,$(call gb_Jar_get_outdir_target,$(1))) $(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)) $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index b5a9b4ff14f5..7f6231580264 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -73,7 +73,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_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library__get_final_target,$(1))) $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) endef diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk index e49994643093..146f1b5a43fe 100644 --- a/solenv/gbuild/Pagein.mk +++ b/solenv/gbuild/Pagein.mk @@ -61,7 +61,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_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1))) $(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1)) $(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index bcaa3fffcff8..7b57524d91f0 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -63,7 +63,7 @@ $(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \ $(call gb_Deliver_add_deliverable,$(call gb_Rdb_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) +$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_target,$(1))) endef define gb_Rdb_add_component diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index e6ed63851490..d2019963cbf9 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -220,7 +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) +$(call gb_Helper_make_userfriendly_targets,$(1),UnpackedTarball,$(call gb_UnpackedTarball_get_final_target,$(1))) endef diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index 4f8b13948c38..ace9457174a8 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -95,7 +95,7 @@ $(call gb_Zip_Zip_internal,$(1),$(2)) $(call gb_Zip_get_target,$(1)) : $(lastword $(MAKEFILE_LIST)) $(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) +$(call gb_Helper_make_userfriendly_targets,$(1),Zip,$(call gb_Zip_get_final_target,$(1))) endef |