drop extraneous delivery rules

These destinations are already covered by the default delivery rules
created in Package.mk .

Change-Id: Idc77f01ef468223a23632f9fae02f7b14a35c7d9

5 files changed, 2 insertions, 63 deletions

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 629c310a519e..9638d2432301 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -386,13 +386,6 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
 		$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
 		rm -f $${RESPONSEFILE})
 
-$(call gb_ResTarget_get_outdir_target,%) :
-	$(call gb_Deliver_deliver,$<,$@)
-
-$(call gb_ResTarget_get_unittest_target,%) :
-	$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@))
-	$(call gb_Deliver_deliver,$<,$@)
-
 define gb_ResTarget_ResTarget
 $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
 $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
@@ -402,9 +395,11 @@ $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clea
 $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
 
 $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) 
+$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir
 $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
 
 $(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
+$(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call gb_ResTarget_get_unittest_target,$(1))).dir
 $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
 
 endef
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 313b185776b9..94f4c8def02c 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -60,13 +60,6 @@ $(call gb_ComponentTarget_get_target,%) : \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_ComponentTarget__command,$@,$<,$*)
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_ComponentTarget_get_outdir_target,%) :
-	$(call gb_Deliver_deliver,$<,$@)
-
 define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
 $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 65e9885e219d..11b5f0759df0 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -114,16 +114,6 @@ $(call gb_XcsTarget_get_clean_target,%) :
 		rm -f $(call gb_XcsTarget_get_target,$*) \
 			  $(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcsTarget_get_outdir_target,%)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcsTarget_get_outdir_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@))
-
 
 # XcuDataTarget class
 
@@ -162,16 +152,6 @@ $(call gb_XcuDataTarget_get_clean_target,%) :
 		rm -f $(call gb_XcuDataTarget_get_target,$*) \
 			  $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuDataTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcuDataTarget_get_outdir_target,)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcuDataTarget_get_outdir_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@))
-
 
 # XcuModuleTarget class
 
@@ -206,14 +186,6 @@ $(call gb_XcuModuleTarget_get_clean_target,%) :
 		rm -f $(call gb_XcuModuleTarget_get_target,$*) \
 			  $(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuModuleTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcuModuleTarget_get_outdir_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@))
-
 
 # XcuLangpackTarget class
 
@@ -245,16 +217,6 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
 			  $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
 			  $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang))))
 
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuLangpackTarget_get_outdir_target,))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcuLangpackTarget_get_outdir_target,)).dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcuLangpackTarget_get_outdir_target,%) :
-	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Deliver_deliver,$<,$@))
-
 
 # XcuMergeTarget class
 
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 146f1b5a43fe..6acd4a8c230e 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -54,9 +54,6 @@ $(call gb_Pagein_get_clean_target,%) :
 $(call gb_Pagein_get_target,%) :
 	$(call gb_Pagein__command,$@,$*,$^)
 	
-$(call gb_Pagein_get_outdir_target,%) : $(call gb_Pagein_get_target,%)
-	$(call gb_Deliver_deliver,$<,$@)
-
 define gb_Pagein_Pagein
 $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
 $(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 7b57524d91f0..3223d04a87dd 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -47,14 +47,6 @@ $(call gb_Rdb_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*))
 
-# DO NOT DEFINE: it overwrites the definition from Package.mk for xml/
-# and doesn't work on 3.81
-#$(dir $(call gb_Rdb_get_outdir_target,))%/.dir :
-#	mkdir -p $(dir $@)
-
-$(call gb_Rdb_get_outdir_target,%) :
-	$(call gb_Deliver_deliver,$<,$@)
-
 define gb_Rdb_Rdb
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
 $(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS :=