diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-03-13 14:18:52 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-03-13 14:33:55 +0100 |
commit | 3f07029fc23923a290f94797a5d4b9b7276bca29 (patch) | |
tree | 2d9d63b40dbc831957d1819d171bbfa373a18439 /solenv/gbuild/UnoApi.mk | |
parent | 14574684dd8ccc04db94b10b331765ca5aa1d781 (diff) |
gbuild: refactor SDK packaging of IDL files:
- UnoApi: stop delivering IDL files to $(OUTDIR)/idl
- add ZipUnoApi to package IDL files for SDK
- convert udkapi and offapi to ZipUnoApi and package them in scp2
- odk: remove ugly CustomTarget_idl that uses "find"
Change-Id: I8dc4e0e7d0dc51c1abf18f31bfe095760d3c2104
Diffstat (limited to 'solenv/gbuild/UnoApi.mk')
-rw-r--r-- | solenv/gbuild/UnoApi.mk | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 7dd961c9995f..43b7b77b0af8 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -33,21 +33,17 @@ $(call gb_UnoApi_get_clean_target,%) : define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) -$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_UnoApiTarget_set_root,$(1),UCR) $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_idl) $(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_inc) $(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_Package_get_clean_target,$(1)_idl) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc) -$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) $(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) @@ -57,11 +53,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef -define gb_UnoApi__add_idlfile -$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(2)),$(2)) - -endef - define gb_UnoApi__add_headerfile_impl $(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3)) $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3)) @@ -75,13 +66,7 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$ endef -define gb_UnoApi__add_idlfile_noheader -$(call gb_UnoApi__add_idlfile,$(1),$(2).idl) - -endef - define gb_UnoApi__add_idlfile_nohdl -$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)) $(call gb_UnoApi__add_headerfile,$(1),$(2).hpp) endef @@ -121,13 +106,11 @@ endef # for old-style services and modules define gb_UnoApi_add_idlfile_noheader $(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) -$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3)) endef define gb_UnoApi_add_idlfiles_noheader $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) -$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl))) endef |