diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-16 15:00:32 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-16 22:07:48 +0100 |
| commit | 268cfdf23ca410d68bc9f7fb03e32a9a603d0e6d (patch) | |
| tree | c88ccdef017890eb31617e5741932b3784662ef3 /solenv | |
| parent | f958657cc5a179a2bccff06f88cd36f80b779184 (diff) | |
gbuild: gb_LinkTarget_set_auxtargets => add_auxtargets
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 8 |
4 files changed, 13 insertions, 8 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 48d2d6aa05a8..194e0032c396 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -85,7 +85,7 @@ $(call gb_Library_get_target,$(1)) : SOVERSIONSCRIPT := $(3) $(call gb_Library_get_target,$(1)) \ $(call gb_Library_get_clean_target,$(1)) : \ 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)) endef diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index c094bb424b54..4a7833c6af35 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -896,7 +896,12 @@ $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2) endef 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 define gb_LinkTarget__add_internal_headers diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index c7387e9d857e..990a12f4518b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -320,7 +320,7 @@ gb_Library_ILIBEXT := .lib define gb_Library_Library_platform $(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)) \ ) @@ -404,7 +404,7 @@ gb_CppunitTest_get_libfilename = test_$(1).dll define gb_CppunitTest_CppunitTest_platform $(call gb_LinkTarget_set_dlltarget,$(2),$(3)) -$(call gb_LinkTarget_set_auxtargets,$(2),\ +$(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.dll,%.map,$(3)) \ ) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index ddf9aea9d201..2b0a1afe6dc7 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -464,7 +464,7 @@ gb_Library_DLLFILENAMES :=\ define gb_Library_Library_platform $(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))) \ $(3).manifest \ $(call gb_LinkTarget_get_pdbfile,$(2)) \ @@ -535,7 +535,7 @@ define gb_StaticLibrary_StaticLibrary_platform $(call gb_LinkTarget_get_target,$(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)) \ ) @@ -549,7 +549,7 @@ gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) gb_Executable_get_rpath := 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))) \ $(call gb_LinkTarget_get_pdbfile,$(2)) \ $(call gb_LinkTarget_get_target,$(2)).manifest \ @@ -583,7 +583,7 @@ gb_CppunitTest_get_libfilename = test_$(1).dll define gb_CppunitTest_CppunitTest_platform $(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))) \ $(3).manifest \ $(patsubst %.dll,%.pdb,$(3)) \ |