solenv/gbuild/UnoApiTarget.mk | 28 ++--------------------------
1 file changed, 2 insertions(+), 26 deletions(-)
New commits:
commit 4c46c75ecc6764678c68eacb2d84b4f027fc55a4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Apr 24 13:30:16 2013 +0200
Clean up of dead code, now that UnoApiMerge.mk is gone
Change-Id: Ib65496c3bd26a55a713717776184441a959e5469
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 63807b8..8beba2d 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -101,7 +101,7 @@ define gb_UnoApiTarget__command
$(call gb_Output_announce,$(2),$(true),UNO,4)
mkdir -p $(dir $(1)) && \
rm -f $(1) && \
-$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(if
$(UNOAPI_FILES),$(UNOAPI_FILES),$(UNOAPI_MERGE))) \
+$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)) \
$(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$(2),$(true),DBc,3) \
&& $(gb_UnoApiTarget_REGCOMPARECOMMAND) \
@@ -111,10 +111,7 @@ $(if $(UNOAPI_REFERENCE), \
endef
define gb_UnoApiTarget__check_mode
-$(if $(and $(UNOAPI_FILES),$(UNOAPI_MERGE)),\
- $(error Both IDL files and merged RDBs were used: this is not
supported))
-$(if $(or $(UNOAPI_FILES),$(UNOAPI_MERGE)),,\
- $(error Neither IDL files nor merged RDBs were used: nothing will be
produced))
+$(if $(UNOAPI_FILES),,$(error No IDL files have been set for the rdb file))
$(if $(UNOAPI_ROOT),,$(error No root has been set for the rdb file))
endef
@@ -161,7 +158,6 @@ endif
define gb_UnoApiTarget_UnoApiTarget
$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES :=
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE :=
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT :=
@@ -215,26 +211,6 @@ $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3))
endef
-define gb_UnoApiTarget_merge_rdbfiles
-$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfiles: use
gb_UnoApiTarget_merge_api instead.)
-endef
-
-define gb_UnoApiTarget_merge_api
-$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS)
-
-endef
-
-define gb_UnoApiTarget_merge_rdbfile
-$$(call gb_Output_error,gb_UnoApiTarget_merge_rdbfile: use
gb_UnoApiTarget_merge_api instead.)
-endef
-
-define gb_UnoApiTarget__merge_api
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call
gb_UnoApiTarget_get_target,$(2))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(call
gb_UnoApiTarget_get_target,$(2))
-
-endef
-
define gb_UnoApiTarget_add_reference_rdbfile
$$(call gb_Output_error,gb_UnoApiTarget_add_reference_rdbfile: use
gb_UnoApiTarget_set_reference_rdbfile instead.)
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
