mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gb_Library__get_final_target: don't be phony target

Browse Source 
Change-Id: I299b088aebc0bb40bc395b774154d2fae1f5d669
This commit is contained in:
Matúš Kukan
2013-09-24 15:35:07 +02:00
parent 937cc1b38f
commit 042bf3ca65
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
solenv/gbuild/Library.mk
View File

@@ -36,8 +36,12 @@ gb_Library_LAYER_DIRS := \
OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \ OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \
NONE:$(gb_Library_DLLDIR) \ NONE:$(gb_Library_DLLDIR) \
$(dir $(call gb_Library__get_final_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
# doesn't do anything, just used for hooking up component target # doesn't do anything, just used for hooking up component target
.PHONY: $(call gb_Library__get_final_target,%) $(call gb_Library__get_final_target,%) :
touch $@
# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows # EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
.PHONY : $(WORKDIR)/Clean/Library/% .PHONY : $(WORKDIR)/Clean/Library/%
@@ -92,6 +96,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \ $(gb_Library_DEFS) \
) )
$(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1)) $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
$(call gb_Library__get_final_target,$(1)) :| $(dir $(call gb_Library__get_final_target,$(1))).dir
$(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1)) $(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1))
$(call gb_LinkTarget_get_headers_target,$(2)) : \ $(call gb_LinkTarget_get_headers_target,$(2)) : \
| $(dir $(call gb_Library_get_ilib_target,$(1))).dir | $(dir $(call gb_Library_get_ilib_target,$(1))).dir