Author: arist
Date: Wed Nov 14 23:29:23 2012
New Revision: 1409551
URL: http://svn.apache.org/viewvc?rev=1409551&view=rev
Log:
gnumake4_054_1e9ce815719e.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1301994618 0
# Node ID 1e9ce815719e1153d9378f57e781fb34af852a9f
# Parent 109b444232fdfab9a43e6e19dd7b9083a5f10a45
gnumake4: Jar.mk: remove unnecessary final target
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/Jar.mk
incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Jar.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Jar.mk?rev=1409551&r1=1409550&r2=1409551&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Jar.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Jar.mk Wed Nov 14 23:29:23
2012
@@ -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)) : MANIFES
$(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)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk?rev=1409551&r1=1409550&r2=1409551&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
(original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk Wed Nov
14 23:29:23 2012
@@ -57,7 +57,6 @@ gb_GenCxxObject_get_target = $(WORKDIR)/
gb_Executable_get_external_headers_target =
$(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
-gb_Jar_get_final_target = $(WORKDIR)/Jar/$(1).done
gb_Jar_get_classsetname = Jar/$(1)
gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
