diff options
author | David Tardon <dtardon@redhat.com> | 2013-04-28 14:12:00 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-28 15:20:07 +0200 |
commit | 423bec3b760092cd1aadebd710586b007dd80ee0 (patch) | |
tree | 37f06cee5ef05423bab73d380f596ad0b044c575 /solenv | |
parent | drop forgotten decl. of _inc Package for UnoApi (diff) | |
download | core-423bec3b760092cd1aadebd710586b007dd80ee0.tar.gz core-423bec3b760092cd1aadebd710586b007dd80ee0.zip |
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
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/InternalUnoApi.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/UnoApi.mk | 5 | ||||
-rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 11 |
4 files changed, 1 insertions, 21 deletions
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index dabcdf59990f..869b6a799e20 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -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_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)))) $(call gb_Helper_make_userfriendly_targets,$(1),InternalUnoApi) @@ -55,7 +52,6 @@ define gb_InternalUnoApi__use_api $(call gb_UnoApiTarget_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_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 3c43b361cf39..727e5828a0e9 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -195,8 +195,6 @@ gb_UIImageListTarget_get_target = $(WORKDIR)/UIImageListTarget/$(1).ilst gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1) 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_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) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 26ae9a880677..9d2a80bd6196 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -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_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_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 $(call gb_UnoApiTarget_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_UnoApiTarget_get_external_headers_target,$(1)) : $(call gb_UnoApiTarget_get_headers_target,$(2)) endef diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 0cf7ff6cdfa9..915fd68c1bc9 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -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)) 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__check_mode) $(call gb_UnoApiTarget__command,$@,$*) @@ -134,9 +128,7 @@ $(call gb_UnoApiTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),UNO,4) -$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApiTarget_get_target,$*) \ - $(call gb_UnoApiTarget_get_target,$*).oldformat \ - $(call gb_UnoApiTarget_get_external_headers_target,$*) \ - $(call gb_UnoApiTarget_get_headers_target,$*)) + $(call gb_UnoApiTarget_get_target,$*).oldformat -rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \ $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ $(call gb_UnoApiPartTarget_get_target,$*) @@ -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) : \ $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl) -$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) :| $(call gb_UnoApiTarget_get_external_headers_target,$(1)) endef |