Revert "gbuild: use one pattern rule for creating directories"

It does not work with make 3.82 which prefers pattern rules
with longest match, so wrong rules are chosen in workdir.

This reverts commit bc234b4e.

solenv/gbuild/AllLangZip.mk

@@ -14,6 +14,9 @@
 
 gb_AllLangZip_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
 
+$(dir $(call gb_AllLangZip_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_AllLangZip_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),ALZ,4)
 	touch $@

solenv/gbuild/CliAssembly.mk

@@ -21,6 +21,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliConfigTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliConfigTarget_get_target,%) :
 	$(call gb_CliConfigTarget__command,$@,$*,$<)
 
@@ -61,6 +64,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliAssemblyTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliAssemblyTarget_get_target,%) :
 	$(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set))
 	$(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set))

solenv/gbuild/CliLibrary.mk

@@ -47,6 +47,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliLibraryTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliLibraryTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliLibraryTarget_get_target,%) :
 	$(call gb_CliLibraryTarget__command,$@,$*,$<,$?,$^)
 

solenv/gbuild/CliNativeLibrary.mk

@@ -22,6 +22,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliNativeLibraryTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliNativeLibraryTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CliNativeLibraryTarget_get_target,%) :
 	$(call gb_CliNativeLibraryTarget__command,$@,$*,$<)
 

solenv/gbuild/CliUnoApi.mk

@@ -29,6 +29,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 # TODO depending on the whole URE might be overkill, but I do not have a
 # Windows machine to debug it...
 $(call gb_CliUnoApiTarget_get_target,%) : \

solenv/gbuild/ComponentTarget.mk

@@ -55,6 +55,10 @@ $(call gb_ComponentTarget_get_target,%) : \
 		$(call gb_ComponentTarget_get_source,%) $(gb_XSLTPROCTARGET)
 	$(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,$<,$@)
 

solenv/gbuild/Configuration.mk

@@ -101,6 +101,12 @@ $(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,$<,$@))
@@ -142,6 +148,12 @@ $(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,$<,$@))
@@ -179,6 +191,10 @@ $(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,$<,$@))
@@ -214,6 +230,12 @@ $(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,$<,$@))

solenv/gbuild/CustomTarget.mk

@@ -26,6 +26,10 @@
 #
 #*************************************************************************
 
+# the .dir is for make 3.81, which ignores trailing /
+$(call gb_CustomTarget_get_workdir,%)/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_CustomTarget_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),CUS,3)
 	touch $@

solenv/gbuild/Dictionary.mk

@@ -22,6 +22,12 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 	#$(gb_ThesaurusIndexTarget_CHECK_COMMAND) $(THESAURUS_FILE) && \
 
+$(dir $(call gb_ThesaurusIndexTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_ThesaurusIndexTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_TARGET) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
 	$(call gb_ThesaurusIndexTarget__command,$@,$*)
 

solenv/gbuild/ExtensionTarget.mk

@@ -71,6 +71,9 @@ $(if $(PLATFORM),\
 	cp -f $(1) $(2))
 endef
 
+$(call gb_ExtensionTarget_get_workdir,%)/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 # remove extension directory in workdir and oxt file in workdir
 $(call gb_ExtensionTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),OXT,3)

solenv/gbuild/ExternalPackage.mk

@@ -19,6 +19,12 @@
 #
 # Uff, I hope this is at least partially understandable :-)
 
+$(dir $(call gb_ExternalPackage_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_ExternalPackage_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ExternalPackage_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),EPK,2)
 	touch $@

solenv/gbuild/ExternalProject.mk

@@ -33,6 +33,12 @@
 # directory is work dir, accessible only from recipes via variable
 # $(EXTERNAL_WORKDIR).
 
+$(dir $(call gb_ExternalProject_get_statedir,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_ExternalProject_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ExternalProject_get_preparation_target,%) :
 	touch $@
 

solenv/gbuild/InstallModule.mk

@@ -27,6 +27,9 @@
 
 # InstallModule class
 
+$(dir $(call gb_InstallModule_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_InstallModule_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),IMO,3)
 	touch $@

solenv/gbuild/InstallModuleTarget.mk

@@ -53,6 +53,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_ScpTemplateTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ScpTemplateTarget_get_target,%) : $(gb_ScpTemplateTarget_TARGET)
 	$(call gb_ScpTemplateTarget__command,$@,$*)
 
@@ -89,6 +92,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET)
 	$(call gb_ScpPreprocessTarget__command,$@,$*)
 
@@ -119,6 +125,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
 	$(call gb_ScpMergeTarget__command,$@,$*)
 
@@ -152,6 +161,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_TARGET)
 	$(call gb_ScpConvertTarget__command,$@,$*)
 
@@ -183,6 +195,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_ScpTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_ScpTarget_get_target,%) : $(gb_ScpTarget_TARGET)
 	$(call gb_ScpTarget__command,$@,$*)
 
@@ -238,6 +253,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_InstallModuleTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_InstallModuleTarget_get_target,%) :
 	$(call gb_InstallModuleTarget__command,$@,$*)
 

solenv/gbuild/InstallScript.mk

@@ -61,6 +61,12 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_InstallScriptTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_InstallScriptTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_InstallScriptTarget_get_target,%) : $(gb_InstallScriptTarget_TARGET)
 	$(call gb_InstallScriptTarget__command,$@,$*)
 

solenv/gbuild/Package.mk

@@ -31,7 +31,12 @@
 
 # a pattern rule with multiple targets is actually executed only once for each
 # match, so define only pattern rules with one target here
+# the .dir is for make 3.81, which ignores trailing /
 define gb_PackagePart__rule
+$(1)/.dir :
+	$$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@))
+$(1)/%/.dir :
+	$$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@))
 $(1)/% :
 	$$(call gb_Deliver_deliver,$$<,$$@)
 endef

solenv/gbuild/Rdb.mk

@@ -47,6 +47,11 @@ $(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,$<,$@)
 

solenv/gbuild/UnoApiTarget.mk

@@ -42,6 +42,10 @@ gb_UnoApiPartTarget_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp
 # invoked with the .idl file corresponding to the .urd in that case.
 # Touch the .urd file, so it is newer than the .done file, causing that to
 # be rebuilt and overwriting the .urd file again.
+# the .dir is for make 3.81, which ignores trailing /
+$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_UnoApiPartTarget_get_target,%.urd) :
 	touch $@
 

solenv/gbuild/UnpackedTarball.mk

@@ -58,6 +58,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_UnpackedTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_UnpackedTarget_get_target,%).tar.bz2 :
 	$(call gb_UnpackedTarget__command,untar,$@,$*,-j)
 
@@ -151,6 +154,9 @@ $(call gb_Helper_abbreviate_dirs,\
 )
 endef
 
+$(dir $(call gb_UnpackedTarball_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_UnpackedTarball_get_preparation_target,%) :
 	touch $@
 

solenv/gbuild/gbuild.mk

@@ -69,13 +69,6 @@ endif
 
 include $(GBUILDDIR)/Output.mk
 
-# general purpose rules for creating directories
-# the .dir is for make 3.81, which ignores trailing /
-$(OUTDIR)/%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(WORKDIR)/%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 ifneq ($(strip $(PRODUCT)$(product)),)
 gb_PRODUCT := $(true)