solenv/gbuild/LinkTarget.mk | 32 +++++++++++++++----------- vbahelper/source/vbahelper/vbacommandbars.cxx | 1 2 files changed, 19 insertions(+), 14 deletions(-)
New commits: commit 0083dd24eb50e9305808c5edaf61dbc97fb2367b Author: Michael Stahl <mst...@redhat.com> Date: Sun Apr 7 22:55:33 2013 +0200 warning C4702: unreachable code Change-Id: Id08a2e295d340095651daa1161efd7603947254a diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 0ca27c2..a78757e 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -73,7 +73,6 @@ public: } else throw container::NoSuchElementException(); - return uno::Any(); } }; commit 4984e0edbe85766be2aa04c504dddb9f0c83f8a5 Author: Michael Stahl <mst...@redhat.com> Date: Sun Apr 7 21:59:49 2013 +0200 gbuild: LinkTarget: kill gb_LINKED_LIBS Change-Id: Id5b90a9653bd12e608bc83498271c42495176613 diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 01269d7..46952c8 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -817,35 +817,41 @@ $$(call gb_Output_error,\ endef define gb_PrintDeps_info -$(info LibraryDep: $(4) links against $(2)) +$(info LibraryDep: $(1) links against $(2)) endef -define gb_LinkTarget_use_libraries -ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) -$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) -endif - -gb_LINKED_LIBS := $(if $(filter $(gb_MERGEDLIBS),$(2)), \ - $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),, merged)) \ - $(filter-out $(gb_MERGEDLIBS),$(2)) +define gb_LinkTarget__use_libraries # used by bin/module-deps.pl ifneq ($(ENABLE_PRINT_DEPS),) # exclude libraries in Library_merged ifeq ($(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),) -$$(eval $$(call gb_PrintDeps_info,$(1),$$(gb_LINKED_LIBS),$(3),$(4))) +$$(eval $$(call gb_PrintDeps_info,$(4),$(3))) endif endif -$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $$(gb_LINKED_LIBS) +$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(3) -$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib))) +$(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(3),$(call gb_Library_get_target,$(lib))) $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib))) endef +define gb_LinkTarget_use_libraries +ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) +$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) +$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) +endif + +$(call gb_LinkTarget__use_libraries,$(1),$(2),$(strip \ + $(if $(filter $(gb_MERGEDLIBS),$(2)), \ + $(if $(filter $(1),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_linktargetname,$(lib)))),, merged)) \ + $(filter-out $(gb_MERGEDLIBS),$(2)) \ + ),$(4)) + +endef + define gb_LinkTarget_add_linked_static_libs $$(call gb_Output_error,\ gb_LinkTarget_add_linked_static_libs: use gb_LinkTarget_use_static_libraries instead.) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits