diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-05 09:10:18 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 10:14:50 +0200 |
| commit | df149d2fa6c05207998b346b6593070184f3aaba (patch) | |
| tree | f9a5eb80b8abdfea2cb275fc28d6f29099441969 /solenv/gbuild/Jar.mk | |
| parent | gnumake4: #i117340#: CustomTarget: replace broken multi-repo support [hg:a639... (diff) | |
| download | core-df149d2fa6c05207998b346b6593070184f3aaba.tar.gz core-df149d2fa6c05207998b346b6593070184f3aaba.zip | |
gnumake4: Jar.mk: remove unnecessary final target [hg:1e9ce815719e]
Diffstat (limited to 'solenv/gbuild/Jar.mk')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 7e6a222a5f5e..36ec13abaf11 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -56,16 +56,10 @@ endef $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_Jar_get_classsetname,%)) $(call gb_Output_announce,$*,$(false),JAR,3) $(call gb_Helper_abbreviate_dirs,\ - rm -rf $(dir $(call gb_Jar_get_target,$*)) && \ - rm -f $(call gb_Jar_get_final_target,$*) && \ - rm -f $(call gb_Jar_get_outdir_target,$*)) + rm -f $(call gb_Jar_get_target,$*) $(call gb_Jar_get_outdir_target,$*)) -# the final target is a touch target; we use it as registered targets should be in workdir, not in outdir # the outdir target depends on the workdir target and is built by delivering the latter # the workdir target is created by cd'ing to the target directory and adding/updating the files -$(call gb_Jar_get_final_target,%) : $(call gb_Jar_get_outdir_target,%) - $(call gb_Helper_abbreviate_dirs,\ - touch $@) # rule for creating the jar file using the command defined above $(call gb_Jar_get_target,%) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,%)) @@ -82,7 +76,7 @@ $(call gb_Jar_get_target,$(1)) : MANIFEST := $(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2)) -$(eval $(call gb_Module_register_target,$(call gb_Jar_get_final_target,$(1)),$(call gb_Jar_get_clean_target,$(1)))) +$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1)))) $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1))) $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) |