[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/CppunitTest.mk    |    1 -
 solenv/gbuild/Executable.mk     |    1 -
 solenv/gbuild/InternalUnoApi.mk |   12 ------------
 solenv/gbuild/Library.mk        |    1 -
 solenv/gbuild/LinkTarget.mk     |    5 -----
 solenv/gbuild/Module.mk         |    2 +-
 solenv/gbuild/StaticLibrary.mk  |    1 -
 solenv/gbuild/UnoApi.mk         |    4 ----
 8 files changed, 1 insertion(+), 26 deletions(-)

New commits:
commit 54a8acb3d6b4fe8078bfe074185a028f994b08a0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 25 10:39:21 2013 +0100

    Last use of obsolete gb_*_add_api is long gone
    
    Change-Id: Ia6c938ef0e45ec86c0c202e95ef28d49fccd3497

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e883ade..30a1d9f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -330,7 +330,6 @@ gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_lin
 endef
 
 $(eval $(foreach method,\
-	add_api \
 	add_cobject \
 	add_cobjects \
 	add_cxxobject \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 403497e..7989d24 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -127,7 +127,6 @@ $(eval $(foreach method,\
 	use_system_darwin_frameworks \
 	use_system_win32_libs \
 	set_library_path_flags \
-	add_api \
 	use_api \
 	use_sdk_api \
 	use_udk_api \
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index e7c1240..2d77d0d 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -81,19 +81,11 @@ $(call gb_UnoApiTarget_get_external_headers_target,$(1)_out) : $(call gb_UnoApiT
 
 endef
 
-define gb_InternalUnoApi_add_api
-$$(call gb_Output_error,gb_InternalUnoApi_add_api: use gb_InternalUnoApi_use_api instead.)
-endef
-
 define gb_InternalUnoApi_use_api
 $(foreach rdb,$(2),$(call gb_InternalUnoApi__use_api,$(1),$(rdb)))
 
 endef
 
-define gb_InternalUnoApi_add_api_dependency
-$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependency: use gb_InternalUnoApi_define_api_dependency instead.)
-endef
-
 # Express that the rdb $(2) depends on rdb $(3).
 #
 # This information is already available in the UnoApiTarget definition
@@ -109,10 +101,6 @@ $(call gb_UnoApiHeadersTarget_use_api,$(2),$(3))
 
 endef
 
-define gb_InternalUnoApi_add_api_dependencies
-$$(call gb_Output_error,gb_InternalUnoApi_add_api_dependencies: use gb_InternalUnoApi_define_api_dependencies instead.)
-endef
-
 define gb_InternalUnoApi_define_api_dependencies
 $(foreach dep,$(3),$(call gb_InternalUnoApi_define_api_dependency,$(1),$(2),$(dep)))
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 0552c86..9309736 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -200,7 +200,6 @@ $(eval $(foreach method,\
 	use_system_darwin_frameworks \
 	use_system_win32_libs \
 	set_library_path_flags \
-	add_api \
 	use_api \
 	use_sdk_api \
 	use_udk_api \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 00efc9c..190f671 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -747,11 +747,6 @@ $(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out $$(gb_STDLIBS),$$(
 
 endef
 
-define gb_LinkTarget_add_api
-$$(call gb_Output_error,\
- gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.)
-endef
-
 define gb_LinkTarget__use_api
 $(call gb_LinkTarget_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
 $(call gb_LinkTarget_use_package,$(1),$(2)_inc)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index d20176a..0025641 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -134,7 +134,7 @@ help :
 	@cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
 
 showmodules :
-	$(info $(strip $(gb_Module_ALLMODULES)))
+	$(warning $(strip $(gb_Module_ALLMODULES)))
 	@true 
 
 translations : $(WORKDIR)/pot.done
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 74514dc..716fbd5 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -101,7 +101,6 @@ $(eval $(foreach method,\
 	set_x64 \
 	add_libs \
 	set_library_path_flags \
-	add_api \
 	use_api \
 	use_sdk_api \
 	use_udk_api \
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 05e6524..7dd961c 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -138,10 +138,6 @@ $(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarge
 
 endef
 
-define gb_UnoApi_add_api
-$$(call gb_Output_error,gb_UnoApi_add_api: use gb_UnoApi_use_api instead.)
-endef
-
 define gb_UnoApi_use_api
 $(foreach rdb,$(2),$(call gb_UnoApi__use_api,$(1),$(rdb)))