Kaydet (Commit) 423bec3b authored tarafından David Tardon's avatar David Tardon

drop UnoApiTarget_get_*headers

This was actually meant for idls, not headers :-) And it is obsolete, as
we do not deliver these to $(OUTDIR) anymore. We use explicit include
paths into $(SRCDIR) instead.

Change-Id: Iccb0dc529a99be59390f032fc331996146829abb
üst 96f582ab
...@@ -33,9 +33,6 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$( ...@@ -33,9 +33,6 @@ $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(
$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir $(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(gb_Helper_MISCDUMMY)
$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1)))) $$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi) $(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi)
...@@ -55,7 +52,6 @@ define gb_InternalUnoApi__use_api ...@@ -55,7 +52,6 @@ define gb_InternalUnoApi__use_api
$(call gb_UnoApiTarget_use_api,$(1),$(2)) $(call gb_UnoApiTarget_use_api,$(1),$(2))
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2)) $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) $(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2))
endef endef
......
...@@ -195,8 +195,6 @@ gb_UIImageListTarget_get_target = $(WORKDIR)/UIImageListTarget/$(1).ilst ...@@ -195,8 +195,6 @@ gb_UIImageListTarget_get_target = $(WORKDIR)/UIImageListTarget/$(1).ilst
gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1) gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml
gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external
gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers
gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap) gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),bootstrap)
gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive) gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/$(call gb_UnoApiHeadersTarget_select_variant,$(1),comprehensive)
......
...@@ -47,10 +47,6 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1 ...@@ -47,10 +47,6 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
ifneq ($(gb_UnoApi_ENABLE_IDL),)
$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
endif
$(call gb_UnoApi__make_outdir_headers_rule,$(1)) $(call gb_UnoApi__make_outdir_headers_rule,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
...@@ -206,7 +202,6 @@ define gb_UnoApi__use_api ...@@ -206,7 +202,6 @@ define gb_UnoApi__use_api
$(call gb_UnoApiTarget_use_api,$(1),$(2)) $(call gb_UnoApiTarget_use_api,$(1),$(2))
$(call gb_UnoApiHeadersTarget_use_api,$(1),$(2)) $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
$(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2)) $(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
$(call gb_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2))
endef endef
......
...@@ -119,12 +119,6 @@ $(if $(UNOAPI_FILES),,$(error No IDL files have been set for the rdb file)) ...@@ -119,12 +119,6 @@ $(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)) $(if $(UNOAPI_ROOT),,$(error No root has been set for the rdb file))
endef endef
$(call gb_UnoApiTarget_get_external_headers_target,%) :
mkdir -p $(dir $@) && touch $@
$(call gb_UnoApiTarget_get_headers_target,%) : $(call gb_UnoApiTarget_get_external_headers_target,%)
mkdir -p $(dir $@) && touch $@
$(call gb_UnoApiTarget_get_target,%) : $(call gb_UnoApiTarget_get_target,%) :
$(call gb_UnoApiTarget__check_mode) $(call gb_UnoApiTarget__check_mode)
$(call gb_UnoApiTarget__command,$@,$*) $(call gb_UnoApiTarget__command,$@,$*)
...@@ -134,9 +128,7 @@ $(call gb_UnoApiTarget_get_clean_target,%) : ...@@ -134,9 +128,7 @@ $(call gb_UnoApiTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UNO,4) $(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\ -$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*) \ rm -f $(call gb_UnoApiTarget_get_target,$*) \
$(call gb_UnoApiTarget_get_target,$*).oldformat \ $(call gb_UnoApiTarget_get_target,$*).oldformat
$(call gb_UnoApiTarget_get_external_headers_target,$*) \
$(call gb_UnoApiTarget_get_headers_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \ -rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
$(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \
$(call gb_UnoApiPartTarget_get_target,$*) $(call gb_UnoApiPartTarget_get_target,$*)
...@@ -201,7 +193,6 @@ $(call gb_UnoApiTarget_get_target,$(1)) : \ ...@@ -201,7 +193,6 @@ $(call gb_UnoApiTarget_get_target,$(1)) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done)
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \ $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
$(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl) $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) :| $(call gb_UnoApiTarget_get_external_headers_target,$(1))
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment