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

LinkTarget: remove old object owner implementation

üst 3e5eece3
...@@ -347,8 +347,6 @@ gb_AsmObject_AsmObject = ...@@ -347,8 +347,6 @@ gb_AsmObject_AsmObject =
# LinkTarget class # LinkTarget class
gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS) gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
gb_LinkTarget_OBJECTOWNER :=
gb_LinkTarget_OBJECTS :=
# defined by platform # defined by platform
# gb_LinkTarget_CXXFLAGS # gb_LinkTarget_CXXFLAGS
...@@ -775,11 +773,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2) ...@@ -775,11 +773,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_CObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_CObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_add_cxxobject define gb_LinkTarget_add_cxxobject
...@@ -798,11 +791,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2) ...@@ -798,11 +791,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_CxxObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_CxxObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_add_objcobject define gb_LinkTarget_add_objcobject
...@@ -821,11 +809,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS += $(2) ...@@ -821,11 +809,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_ObjCObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_add_objcxxobject define gb_LinkTarget_add_objcxxobject
...@@ -844,11 +827,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2) ...@@ -844,11 +827,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCxxObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_ObjCxxObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_add_asmobject define gb_LinkTarget_add_asmobject
...@@ -866,11 +844,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS += $(2) ...@@ -866,11 +844,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_AsmObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_AsmObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_AsmObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_AsmObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_add_generated_c_object define gb_LinkTarget_add_generated_c_object
...@@ -888,11 +861,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS += $(2) ...@@ -888,11 +861,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_GenCObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_GenCObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_add_generated_cxx_object define gb_LinkTarget_add_generated_cxx_object
...@@ -910,11 +878,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) ...@@ -910,11 +878,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2))
endif endif
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
gb_LinkTarget_OBJECTOWNER += $(call gb_GenCxxObject_get_target,$(2)):$(1)
gb_LinkTarget_OBJECTS += $(call gb_GenCxxObject_get_target,$(2))
endif
endef endef
define gb_LinkTarget_yacc_add_cpp_dep define gb_LinkTarget_yacc_add_cpp_dep
......
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Initial Developer of the Original Code is
# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
# Portions created by the Initial Developer are Copyright (C) 2010 the
# Initial Developer. All Rights Reserved.
#
# Major Contributor(s):
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
ifeq ($(gb_CHECKOBJECTOWNER),$(true))
define gb_LinkTarget_check_object_owner
ifneq (1,$$(words $$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
$$(info \
$(patsubst $(WORKDIR)/%,%,$(1))\
is linked in by\
$$(patsubst $(1):%,%,$$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
gb_CHECKOBJECTOWNER_VALID := $(false)
endif
endef
gb_CHECKOBJECTOWNER_VALID := $(true)
$(foreach object,$(sort $(gb_LinkTarget_OBJECTS)),$(eval $(call gb_LinkTarget_check_object_owner,$(object))))
ifneq ($(gb_CHECKOBJECTOWNER_VALID),$(true))
$(eval $(call gb_Output_warn,duplicate linked objects))
endif
endif
# vim: set noet ts=4 sw=4:
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