diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-05-24 13:22:21 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-10 22:58:05 +0200 |
| commit | 529b1ea6f4583a136d04ae19af6efee2b6e45946 (patch) | |
| tree | de88488c2951e669378dc6d25c12a6ad4702ae8d | |
| parent | b469cd235bba961abc71d26ddc97423906a2d67e (diff) | |
gbuild: install .res files directly from workdir
Change-Id: I95e4f150c21f991f629530eebf19748c2768f856
| -rwxr-xr-x | scp2/inc/macros.inc | 2 | ||||
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index deb4c3111427..3659dc2b7012 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -95,7 +95,7 @@ #define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc #endif -#define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) +#define RESFILENAME(name,lang) STRING(CONCAT4(ResTarget/,name,lang,.res)) #define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) #define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang)) #define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip)) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index fef707e79623..d9fdbca9e1b2 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -370,9 +370,6 @@ $(call gb_ResTarget_get_clean_target,%) : rm -f \ $(call gb_ResTarget_get_target,$*) \ $(call gb_ResTarget_get_imagelist_target,$*) \ - $(if $(gb_RUNNABLE_INSTDIR),, \ - $(call gb_ResTarget_get_outdir_target,$*) \ - ) \ $(call gb_ResTarget_get_unittest_target,$*)) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ @@ -413,13 +410,6 @@ $(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$ $(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)) -ifeq ($(gb_RUNNABLE_INSTDIR),) -$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) -$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) -endif - endef define gb_ResTarget_add_file diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 984397d8f10f..ff23882c1550 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -35,7 +35,6 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/xml \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) -gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb |