diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 23:23:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-29 00:58:43 +0100 |
| commit | bc15aa35db29fba9a5e2a5434777573423cab429 (patch) | |
| tree | d4aabe0140eabc8e1e9d3da596a79591d01e6de5 /solenv | |
| parent | febbf192651a0ded0d6c24e6a752ff1cb2718213 (diff) | |
gbuild: remove gb_ResTarget_get_unittest_target
Change-Id: I94994645d737b2ee36939ab91d28aa6953e9b475
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index a38d8799de69..e809a07f6bf8 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -370,8 +370,7 @@ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f \ $(call gb_ResTarget_get_target,$*) \ - $(call gb_ResTarget_get_imagelist_target,$*) \ - $(call gb_ResTarget_get_unittest_target,$*)) + $(call gb_ResTarget_get_imagelist_target,$*)) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(gb_ResTarget_RSCDEPS) @@ -403,14 +402,9 @@ define gb_ResTarget_ResTarget $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2) $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3) $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2) -$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_unittest_target,$(1)) $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1)) $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call gb_ResTarget_get_unittest_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) - endef define gb_ResTarget_add_file diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 6e0103e9e992..e8ee181860b0 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -34,8 +34,6 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/unittest \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) -gb_ResTarget_get_unittest_target = \ - $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res # kind of lame but with just 3 of these why bother with registration etc. gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb |