diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-05 19:37:01 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-10 21:23:21 +0100 |
commit | 6c1c06f1c269a75bd36101710c48c55475d91504 (patch) | |
tree | b2c9e1a18a0d252a89b82e80d99eb215729d8665 /solenv | |
parent | 84b3f7b345eabf3995e4d51055e8d4e26479a6e2 (diff) |
gbuild: remove some more realpaths
Where necessary, replace with wildcard, what does not change path.
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 24 | ||||
-rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/Configuration.mk | 18 | ||||
-rw-r--r-- | solenv/gbuild/Package.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/SdiTarget.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 10 |
7 files changed, 33 insertions, 33 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 6dbf7a70c8bb..10eebdd47920 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -57,7 +57,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ -p $(firstword $(subst /, ,$(2))) \ - -i $(realpath $(3)) \ + -i $(3) \ -o $(1) \ -m $(SDF) \ -l all) @@ -85,7 +85,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ -I$(dir $(3)) \ $(DEFS) \ -fp=$(1) \ - $(realpath $(if $(MERGEDFILE),$(MERGEDFILE),$<))" > $${RESPONSEFILE} && \ + $(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \ $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \ rm -rf $${RESPONSEFILE}) @@ -112,7 +112,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := else $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1)) $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1)) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) endif endef @@ -125,7 +125,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_ mkdir -p $$(dir $$@) && \ cp $$< $$@) ifneq ($(strip $(WITH_LANG)),) -$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) +$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) $(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF) endif @@ -310,7 +310,7 @@ endef gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET) gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND) -gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/icon-themes/galaxy)/ +gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RES,2) @@ -326,15 +326,15 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT echo "-r -p \ -lg$(LANGUAGE) \ -fs=$@ \ - -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \ - -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \ - -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \ - -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \ - -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \ - -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \ + -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY) \ + -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE) \ + -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst \ + -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \ + -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \ + -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \ - -subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \ + -subMODULE=$(dir $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \ -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \ -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \ $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \ diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 9eb0ea55a7d3..71e733e80eb9 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -36,7 +36,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ $(gb_XSLTPROC) --nonet --stringparam uri \ '$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \ - $(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2))) + $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2)) endef @@ -54,7 +54,7 @@ $(call gb_ComponentTarget_get_target,%) : # the .dir is for make 3.81, which ignores trailing / $(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir : - mkdir -p $(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 ffced850a4e6..60f5b81a384a 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -103,9 +103,9 @@ $(call gb_XcsTarget_get_clean_target,%) : # the .dir is for make 3.81, which ignores trailing / $(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(dir $(call gb_XcsTarget_get_outdir_target,%)).dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_XcsTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -150,9 +150,9 @@ $(call gb_XcuDataTarget_get_clean_target,%) : # the .dir is for make 3.81, which ignores trailing / $(dir $(call gb_XcuDataTarget_get_outdir_target,))%/.dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(dir $(call gb_XcuDataTarget_get_outdir_target,)).dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_XcuDataTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -193,7 +193,7 @@ $(call gb_XcuModuleTarget_get_clean_target,%) : # the .dir is for make 3.81, which ignores trailing / $(dir $(call gb_XcuModuleTarget_get_outdir_target,))%/.dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_XcuModuleTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -232,9 +232,9 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) : # the .dir is for make 3.81, which ignores trailing / $(dir $(call gb_XcuLangpackTarget_get_outdir_target,))%/.dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(dir $(call gb_XcuLangpackTarget_get_outdir_target,)).dir : - $(if $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_XcuLangpackTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ @@ -271,9 +271,9 @@ $(call gb_XcuMergeTarget_get_clean_target,%) : define gb_XcuMergeTarget_XcuMergeTarget $(call gb_XcuMergeTarget_get_target,$(1)) : \ $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \ - $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) + $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) $(call gb_XcuMergeTarget_get_target,$(1)) : \ - SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) + SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 611373d81e6f..1a4bf52e39c9 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -34,9 +34,9 @@ # the .dir is for make 3.81, which ignores trailing / define gb_PackagePart__rule $(1)/.dir : - $$(if $$(realpath $$(dir $$@)),,mkdir -p $$(dir $$@)) + $$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@)) $(1)/%/.dir : - $$(if $$(realpath $$(dir $$@)),,mkdir -p $$(dir $$@)) + $$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@)) $(1)/% : $$(call gb_Deliver_deliver,$$<,$$@) endef diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 611ba9f81cd4..9510ef9400ab 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -50,7 +50,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET -fx$(EXPORTS) \ -fm$@ \ -fM$(call gb_SdiTarget_get_dep_target,$*) \ - $(realpath $<)) + $<) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_SdiTarget_get_dep_target,%) : $(call gb_SdiTarget_get_target,%) diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index c751dd451a93..af79bee2c3eb 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -204,7 +204,7 @@ $(call gb_UnoApiTarget_get_clean_target,%) : # 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 $(realpath $(dir $@)),,mkdir -p $(dir $@)) + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_UnoApiPartTarget_get_target,%.urd) : touch $@ @@ -258,7 +258,7 @@ endef ifeq ($(gb_FULLDEPS),$(true)) $(call gb_UnoApiPartTarget_get_dep_target,%) : - $(if $(realpath $@),touch $@,\ + $(if $(wildcard $@),touch $@,\ $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd))) $(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 19cfada49c63..6902642858dd 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -287,8 +287,8 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(gb_COMPILERDEPFLAGS) \ -I$(dir $(3)) \ $(INCLUDE) \ - -c $(realpath $(3)) \ - -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(realpath $(3))) + -c $(3) \ + -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(3)) endef @@ -307,8 +307,8 @@ $(call gb_Helper_abbreviate_dirs_native,\ -I$(dir $(3)) \ $(INCLUDE_STL) $(INCLUDE) \ $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ - -c $(realpath $(3)) \ - -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(realpath $(3))) + -c $(3) \ + -Fo$(1)) $(call gb_create_deps,$(1),$(4),$(3)) endef @@ -321,7 +321,7 @@ $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ "$(ML_EXE)" $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \ - echo "$(1) : $(realpath $(3))" > $(4) + echo "$(1) : $(3)" > $(4) endef |