Author: arist
Date: Wed Nov 14 23:42:31 2012
New Revision: 1409567
URL: http://svn.apache.org/viewvc?rev=1409567&view=rev
Log:
gnumake4_081_cd671263f60a.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1302711100 0
# Node ID cd671263f60a5da66a4877421910c649a28b8eef
# Parent 4cbea75d255a838ecbf703daee0cfdf7cdbd3975
gnumake4: Helper.mk: check for duplicate registration;
the error message you would get when trying to build a twice
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk?rev=1409567&r1=1409566&r2=1409567&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Helper.mk Wed Nov 14
23:42:31 2012
@@ -139,6 +139,12 @@ define gb_Helper_register_executables
ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables.
Valid groups are: $$(gb_Executable_VALIDGROUPS)))
endif
+$(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Executable_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_executables: already registered:
$(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_executables: contains duplicates:
$(2)))
gb_Executable_$(1) += $(2)
@@ -148,6 +154,12 @@ define gb_Helper_register_libraries
ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid
groups are: $$(gb_Library_VALIDGROUPS)))
endif
+$(foreach group,$(gb_Library_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_Library_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: already registered:
$(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates:
$(2)))
gb_Library_$(1) += $(2)
@@ -157,6 +169,12 @@ define gb_Helper_register_static_librari
ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for static
libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
endif
+$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\
+ $(foreach target,$(2),\
+ $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: already
registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: contains
duplicates: $(2)))
gb_StaticLibrary_$(1) += $(2)
