diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 16:45:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 16:46:55 +0200 |
| commit | 5b29d3a7fd759fd3d35af4a13e0977be6c20cd99 (patch) | |
| tree | cb43d76a9eb69bd59356cf4385fdfeadcb99795d /solenv | |
| parent | 7d97ec9a3eba9ceacbea631a56185e40b62fdec7 (diff) | |
gbuild: refactor UnoApi to remove rdb files from OUTDIR
- gb_UnoApi_get_target returns the files in INSTDIR
- stop using rdb files from OUTDIR
- remove gb_UnoApi_install
- remove pointless 2nd parameter of gb_UnoApi_UnoApi
- order-only dependency from gb_UnoApi_get_target to
gb_UnoApiHeadersTarget_get_target because INSTDIR .rdb is always outdated
Change-Id: Id418f75e9b38d6fe135b55eca2594c2624bc41cc
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 6131af1ababe..cdf828b3d947 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -35,7 +35,8 @@ gb_PackagePart_get_destinations = \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res -gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb +# kind of lame but with just 3 of these why bother with registration etc. +gb_UnoApi_get_target = $(INSTDIR)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb # instdir target patterns @@ -307,6 +308,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ UIImageListTarget \ UILocalizeTarget \ UIMenubarTarget \ + UnoApi \ UnoApiHeadersTarget \ UnoApiTarget \ UnpackedTarball \ @@ -329,7 +331,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ CliNativeLibrary \ CliUnoApi \ InstallScript \ - UnoApi \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 1b6494116f3c..959581539549 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -14,8 +14,9 @@ $(call gb_UnoApi_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_UnoApi_get_target,$*)) +# call gb_UnoApi_UnoApi,api define gb_UnoApi_UnoApi -$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(2)) +$(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) @@ -24,7 +25,7 @@ endif $(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_UnoApiHeadersTarget_get_target,$(1)) +$(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)) @@ -35,14 +36,6 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef -define gb_UnoApi_install -$(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.)) -$(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \ - $(INSTROOT)/$(2), \ - $(call gb_UnoApiTarget_get_target,$(1))) - -endef - ifneq ($(gb_UnoApi_ENABLE_INSTALL),) # Create a package of IDL files for putting into SDK. |