diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:27:57 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:27:57 +0200 |
| commit | 5012e466ce473b27b4ff6dbfab53a6c97a4041ca (patch) | |
| tree | 1430faa05e0e2b2fedda8022561cfbc15a6b74f8 /solenv/gbuild/TargetLocations.mk | |
| parent | revert some mismerges in set_soenv.in (diff) | |
| parent | Propagate DISABLE_ACTIVEX also in the WNTGCC case (diff) | |
| download | core-5012e466ce473b27b4ff6dbfab53a6c97a4041ca.tar.gz core-5012e466ce473b27b4ff6dbfab53a6c97a4041ca.zip | |
resyncing to master
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
| -rw-r--r--[-rwxr-xr-x] | solenv/gbuild/TargetLocations.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index bcca63f49c5c..f66e91a9c872 100755..100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -30,11 +30,12 @@ gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT) -gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT) +gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build) gb_PackagePart_get_destinations = \ $(OUTDIR)/xml \ $(OUTDIR)/pck \ $(OUTDIR)/inc \ + $(OUTDIR)/idl \ $(OUTDIR)/bin \ gb_PackagePart_get_target = $(OUTDIR)/$(1) @@ -99,6 +100,10 @@ gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1) gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1))) gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1) +gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb +gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb +gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) +gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1) gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX) gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done @@ -137,7 +142,8 @@ $(eval $(call gb_Helper_make_clean_targets,\ SrsTemplateTarget \ CppunitTest \ CustomTarget \ - WinResTarget \ + UnoApiTarget \ + WinResTarget \ Zip \ )) @@ -146,6 +152,7 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ Library \ Package \ StaticLibrary \ + UnoApiOutTarget \ )) $(eval $(call gb_Helper_make_dep_targets,\ @@ -157,6 +164,7 @@ $(eval $(call gb_Helper_make_dep_targets,\ LinkTarget \ SrsPartTarget \ SrsTarget \ + UnoApiTarget \ )) # other getters |