diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-27 12:22:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-30 09:55:57 +0100 |
| commit | 628d84d9a82bd2759faf869d7a28233538094578 (patch) | |
| tree | 9eeb4bf4831111f124e1e2211c06f61b13c69c46 /solenv | |
| parent | 4e6b4fbac4d3e1cbbb486aa26940f484a1cb65d1 (diff) | |
gbuild: remove gb_Gallery__UNO_COMPONENTS and gb_Gallery__make_env_args
These are presumably a relic from pre-INSTDIR days: gengal should find
all this stuff via redirect.rc, fundamental.rc and services.rdb.
The UNO services should be found via services.rdb too after the
dependency was added in the previous commit.
Change-Id: I3d452acc7c4b05f254bef936c4f18a2ea8615cf8
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 2ce708d8bdb3..d08fe69aef55 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -14,19 +14,6 @@ gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery -# BRAND_BASE_DIR is for resource files -define gb_Gallery__make_env_args -"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD))" \ -"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry)" \ -"-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \ - $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\ - $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \ -"-env:UNO_TYPES=$(foreach item,offapi udkapi,\ - $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \ --env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \ --env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)) -endef - define gb_Gallery__command $(call gb_Output_announce,$(2),$(true),GAL,1) $(call gb_Helper_abbreviate_dirs,\ @@ -37,7 +24,6 @@ $(call gb_Helper_abbreviate_dirs,\ SAL_USE_VCLPLUGIN=svp \ )) \ $(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \ - $(call gb_Gallery__make_env_args) \ --build-tree \ --destdir $(GALLERY_BASEDIR) \ --name "$(GALLERY_NAME)" \ |