solenv/gbuild/AutoInstall.mk | 3 ++-
solenv/gbuild/Executable.mk | 2 +-
solenv/gbuild/ExternalProject.mk | 2 +-
solenv/gbuild/Jar.mk | 2 +-
solenv/gbuild/JavaClassSet.mk | 2 +-
solenv/gbuild/Library.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 4 ++--
7 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 5852b137e07db63f556dc604b173fca8ca59a163
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Feb 13 12:57:11 2014 +0100
gbuild: AutoInstall: RepositoryExternal.mk may contain these too
Change-Id: Ieb76643e2f53d19b1796f118bae2a7e954e6f015
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index cdcef0a..0087b54 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -19,7 +19,8 @@ endef
$(dir $(call gb_AutoInstall_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk
$(GBUILDDIR)/AutoInstall.mk
+$(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
+ $(SRCDIR)/Repository.mk $(SRCDIR)/RepositoryExternal.mk
$(call gb_Output_announce,$*,$(true),AIN,3)
echo "/* autogenerated installs for group $* */" > $@
$(call gb_AutoInstall__make_define,\
commit c489fe73ac76be111577dea0315689885663a306
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Feb 13 12:55:55 2014 +0100
gbuild: improve error messages about missing registrations
Change-Id: Ib3c5d8f3921801f143447d8e01463905d80ac319
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 11312ea..9cf7e1a 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -59,7 +59,7 @@ define gb_Executable_Executable
$(call gb_Postprocess_register_target,AllExecutables,Executable,$(1))
ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN)))
$$(eval $$(call gb_Output_info,Currently known executables: $(sort
$(gb_Executable_KNOWN)),ALL))
-$$(eval $$(call gb_Output_error,Executable $(1) must be registered in
Repository.mk))
+$$(eval $$(call gb_Output_error,Executable $(1) must be registered in
Repository.mk or RepositoryExternal.mk))
endif
$(call gb_Executable__Executable_impl,$(1),$(call
gb_Executable_get_linktarget,$(1)))
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 732197d..0495340 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -178,7 +178,7 @@ endef
define gb_ExternalProject_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))
+$$(eval $$(call gb_Output_error,Cannot link against library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk or RepositoryExternal.mk))
endif
ifneq (,$$(filter $$(gb_MERGEDLIBS),$(2)))
$$(eval $$(call gb_Output_error,Cannot link against library/libraries
$$(filter $$(gb_MERGEDLIBS),$(2)) because they are merged.))
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 56a4ef8..726643a 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -95,7 +95,7 @@ endef
define gb_Jar_Jar
ifeq (,$$(findstring $(1),$$(gb_Jar_KNOWN)))
$$(eval $$(call gb_Output_info,Currently known jars are: $(sort
$(gb_Jar_KNOWN)),ALL))
-$$(eval $$(call gb_Output_error,Jar $(1) must be registered in Repository.mk))
+$$(eval $$(call gb_Output_error,Jar $(1) must be registered in Repository.mk
or RepositoryExternal.mk))
endif
$(call gb_Jar_get_target,$(1)) : MANIFEST :=
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index b24cdef..58a16d9 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -108,7 +108,7 @@ endef
define gb_JavaClassSet_use_jar
ifneq (,$$(filter-out $(gb_Jar_KNOWN),$(2)))
$$(eval $$(call gb_Output_info,currently known jars are: $(sort
$(gb_Jar_KNOWN)),ALL))
-$$(eval $$(call gb_Output_error,Cannot link against jar $$(filter-out
$(gb_Jar_KNOWN),$(2)). Jars must be registered in Repository.mk))
+$$(eval $$(call gb_Output_error,Cannot link against jar $$(filter-out
$(gb_Jar_KNOWN),$(2)). Jars must be registered in Repository.mk or
RepositoryExternal.mk))
endif
$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_Jar_get_target,$(2))
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(call
gb_Jar_get_target,$(2))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 61b5b0f..9c8f914 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -51,7 +51,7 @@ define gb_Library_Library
$(call gb_Postprocess_register_target,AllLibraries,Library,$(1))
ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
$$(eval $$(call gb_Output_info,Currently known libraries are: $(sort
$(gb_Library_KNOWNLIBS)),ALL))
-$$(eval $$(call gb_Output_error,Library $(1) must be registered in
Repository.mk))
+$$(eval $$(call gb_Output_error,Library $(1) must be registered in
Repository.mk or RepositoryExternal.mk))
endif
$(if $(gb_Package_PRESTAGEDIR),\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e68d888..4e34a15 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -831,7 +831,7 @@ 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))
+$$(eval $$(call gb_Output_error,Cannot link against library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk or RepositoryExternal.mk))
endif
ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true))
@@ -1078,7 +1078,7 @@ endef
define gb_LinkTarget_use_library_objects
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 import objects library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk))
+$$(eval $$(call gb_Output_error,Cannot import objects library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk or RepositoryExternal.mk))
endif
$(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach lib,$(2),$(call
gb_Library_get_linktarget,$(lib))))
$(call gb_LinkTarget_get_headers_target,$(1)) : \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
