summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/AllLangZip.mk3
-rw-r--r--solenv/gbuild/CliAssembly.mk9
-rw-r--r--solenv/gbuild/CliLibrary.mk6
-rw-r--r--solenv/gbuild/CliNativeLibrary.mk6
-rw-r--r--solenv/gbuild/CliUnoApi.mk6
-rw-r--r--solenv/gbuild/ComponentTarget.mk4
-rw-r--r--solenv/gbuild/Configuration.mk22
-rw-r--r--solenv/gbuild/CustomTarget.mk4
-rw-r--r--solenv/gbuild/Dictionary.mk6
-rw-r--r--solenv/gbuild/ExtensionTarget.mk3
-rw-r--r--solenv/gbuild/ExternalPackage.mk6
-rw-r--r--solenv/gbuild/ExternalProject.mk6
-rw-r--r--solenv/gbuild/InstallModule.mk3
-rw-r--r--solenv/gbuild/InstallModuleTarget.mk18
-rw-r--r--solenv/gbuild/InstallScript.mk6
-rw-r--r--solenv/gbuild/Package.mk5
-rw-r--r--solenv/gbuild/Rdb.mk5
-rw-r--r--solenv/gbuild/UnoApiTarget.mk4
-rw-r--r--solenv/gbuild/UnpackedTarball.mk6
-rw-r--r--solenv/gbuild/gbuild.mk7
20 files changed, 7 insertions, 128 deletions
diff --git a/solenv/gbuild/AllLangZip.mk b/solenv/gbuild/AllLangZip.mk
index fa3b9debfbab..e3cbc6a2f97f 100644
--- a/solenv/gbuild/AllLangZip.mk
+++ b/solenv/gbuild/AllLangZip.mk
@@ -14,9 +14,6 @@
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 $@
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index e3a87bdf52ae..f78fae5097ed 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -21,9 +21,6 @@ $(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,$@,$*,$<)
@@ -64,12 +61,6 @@ $(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))
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 9cf6bd577b21..d22fc2e5b0f1 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -47,12 +47,6 @@ $(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,$@,$*,$<,$?,$^)
diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk
index f5c124923ea6..6ced5e920541 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -22,12 +22,6 @@ $(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,$@,$*,$<)
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f0a27356d3f1..fae03433d8f3 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -29,12 +29,6 @@ $(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,%) : \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index e99ffababcf5..f01a68753982 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -55,10 +55,6 @@ $(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,$<,$@)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index e02d0dad0a79..716891783eaf 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -101,12 +101,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,$<,$@))
@@ -148,12 +142,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,$<,$@))
@@ -191,10 +179,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,$<,$@))
@@ -230,12 +214,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,$<,$@))
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index d8b59d2b15c3..95eb3d147001 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -26,10 +26,6 @@
#
#*************************************************************************
-# 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 $@
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index c40e376ee8fa..1634c62f62d4 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -22,12 +22,6 @@ $(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,$@,$*)
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 75b9e0c16bd8..9c108ae7874b 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -71,9 +71,6 @@ $(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)
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index f24a2caeed87..31a18482c07a 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -19,12 +19,6 @@
#
# 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 $@
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 5731cbf65360..b8dc5d4976a8 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -33,12 +33,6 @@
# 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 $@
diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index cb37a49625c4..1ac028c7b907 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -27,9 +27,6 @@
# 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 $@
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index b008bddc8e5d..345aff587237 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -53,9 +53,6 @@ $(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,$@,$*)
@@ -92,9 +89,6 @@ $(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,$@,$*)
@@ -125,9 +119,6 @@ $(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,$@,$*)
@@ -161,9 +152,6 @@ $(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,$@,$*)
@@ -195,9 +183,6 @@ $(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,$@,$*)
@@ -253,9 +238,6 @@ $(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,$@,$*)
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 6b22c4313a9b..c521c00b97bf 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -61,12 +61,6 @@ $(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,$@,$*)
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 534e39ad0233..24d23d27d6f8 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -31,12 +31,7 @@
# 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
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 03281567c805..ce11ee006448 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -47,11 +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,$<,$@)
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index c085c4c4dff7..88d3e9de978e 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -42,10 +42,6 @@ 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 $@
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 63f32a6d5f8d..599b52caf485 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -58,9 +58,6 @@ $(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)
@@ -154,9 +151,6 @@ $(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 $@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8334ead0df64..bd1b315ce3db 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -69,6 +69,13 @@ 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)
generated by cgit (git 2.34.1) at 2024-07-03 22:04:18 +0000