Kaydet (Commit) 268cfdf2 authored tarafından Michael Stahl's avatar Michael Stahl

gbuild: gb_LinkTarget_set_auxtargets => add_auxtargets

üst f958657c
...@@ -85,7 +85,7 @@ $(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT := $(3) ...@@ -85,7 +85,7 @@ $(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT := $(3)
$(call gb_Library_get_target,$(1)) \ $(call gb_Library_get_target,$(1)) \
$(call gb_Library_get_clean_target,$(1)) : \ $(call gb_Library_get_clean_target,$(1)) : \
AUXTARGETS += $(call gb_Library_get_target,$(1)).$(2) AUXTARGETS += $(call gb_Library_get_target,$(1)).$(2)
$(call gb_LinkTarget_set_auxtargets,$(call gb_Library_get_linktargetname,$(1)),\ $(call gb_LinkTarget_add_auxtargets,$(call gb_Library_get_linktargetname,$(1)),\
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2)) $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))).$(2))
endef endef
......
...@@ -896,7 +896,12 @@ $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2) ...@@ -896,7 +896,12 @@ $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2)
endef endef
define gb_LinkTarget_set_auxtargets define gb_LinkTarget_set_auxtargets
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(2) $$(call gb_Output_error,\
gb_LinkTarget_set_auxtargets: use gb_LinkTarget_add_auxtargets instead.)
endef
define gb_LinkTarget_add_auxtargets
$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2)
endef endef
define gb_LinkTarget__add_internal_headers define gb_LinkTarget__add_internal_headers
......
...@@ -320,7 +320,7 @@ gb_Library_ILIBEXT := .lib ...@@ -320,7 +320,7 @@ gb_Library_ILIBEXT := .lib
define gb_Library_Library_platform define gb_Library_Library_platform
$(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3))) $(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3)))
$(call gb_LinkTarget_set_auxtargets,$(2),\ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.dll,%.map,$(3)) \ $(patsubst %.dll,%.map,$(3)) \
) )
...@@ -404,7 +404,7 @@ gb_CppunitTest_get_libfilename = test_$(1).dll ...@@ -404,7 +404,7 @@ gb_CppunitTest_get_libfilename = test_$(1).dll
define gb_CppunitTest_CppunitTest_platform define gb_CppunitTest_CppunitTest_platform
$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
$(call gb_LinkTarget_set_auxtargets,$(2),\ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.dll,%.map,$(3)) \ $(patsubst %.dll,%.map,$(3)) \
) )
......
...@@ -464,7 +464,7 @@ gb_Library_DLLFILENAMES :=\ ...@@ -464,7 +464,7 @@ gb_Library_DLLFILENAMES :=\
define gb_Library_Library_platform define gb_Library_Library_platform
$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
$(call gb_LinkTarget_set_auxtargets,$(2),\ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \ $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
$(3).manifest \ $(3).manifest \
$(call gb_LinkTarget_get_pdbfile,$(2)) \ $(call gb_LinkTarget_get_pdbfile,$(2)) \
...@@ -535,7 +535,7 @@ define gb_StaticLibrary_StaticLibrary_platform ...@@ -535,7 +535,7 @@ define gb_StaticLibrary_StaticLibrary_platform
$(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_target,$(2)) \
$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2)) $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
$(call gb_LinkTarget_set_auxtargets,$(2),\ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(call gb_LinkTarget_get_pdbfile,$(2)) \ $(call gb_LinkTarget_get_pdbfile,$(2)) \
) )
...@@ -549,7 +549,7 @@ gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) ...@@ -549,7 +549,7 @@ gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS)
gb_Executable_get_rpath := gb_Executable_get_rpath :=
define gb_Executable_Executable_platform define gb_Executable_Executable_platform
$(call gb_LinkTarget_set_auxtargets,$(2),\ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \ $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
$(call gb_LinkTarget_get_pdbfile,$(2)) \ $(call gb_LinkTarget_get_pdbfile,$(2)) \
$(call gb_LinkTarget_get_target,$(2)).manifest \ $(call gb_LinkTarget_get_target,$(2)).manifest \
...@@ -583,7 +583,7 @@ gb_CppunitTest_get_libfilename = test_$(1).dll ...@@ -583,7 +583,7 @@ gb_CppunitTest_get_libfilename = test_$(1).dll
define gb_CppunitTest_CppunitTest_platform define gb_CppunitTest_CppunitTest_platform
$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) $(call gb_LinkTarget_set_dlltarget,$(2),$(3))
$(call gb_LinkTarget_set_auxtargets,$(2),\ $(call gb_LinkTarget_add_auxtargets,$(2),\
$(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \ $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
$(3).manifest \ $(3).manifest \
$(patsubst %.dll,%.pdb,$(3)) \ $(patsubst %.dll,%.pdb,$(3)) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment