diff options
-rw-r--r-- | solenv/gbuild/AllLangPackage.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/Dictionary.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Gallery.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/HelpTarget.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/Pyuno.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/UIConfig.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/UnoApi.mk | 1 |
8 files changed, 0 insertions, 12 deletions
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk index e8a2a19e3070..cc8c0b8f2b3c 100644 --- a/solenv/gbuild/AllLangPackage.mk +++ b/solenv/gbuild/AllLangPackage.mk @@ -44,7 +44,6 @@ endef # gb_AllLangPackage__AllLangPackage_lang group package srcdir define gb_AllLangPackage__AllLangPackage_onelang $(call gb_Package_Package_internal,$(2),$(3)) -$(call gb_Package_set_outdir,$(2),$(INSTROOT)) $(call gb_AllLangPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2)) $(call gb_AllLangPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2)) diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 1803bf469a7b..651d5ae9827d 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -213,8 +213,6 @@ $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)),$( $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)_generated),$(WORKDIR)) $(call gb_PackageSet_PackageSet_internal,$(call gb_Dictionary_get_packagesetname,$(1))) -$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(INSTROOT)) -$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(INSTROOT)) $(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1))) ifeq (,$(gb_Dictionary_ALL_LANGS)) diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 0a9336cada31..bc60a3b3e75a 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -109,7 +109,6 @@ $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2 # setup the files package - we install all of these too $(call gb_Package_Package_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2)) -$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTROOT)) $(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(call gb_Gallery_get_files_packagename,$(1))) $(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Gallery_get_files_packagename,$(1))) @@ -124,7 +123,6 @@ gb_Gallery_basedir = $(patsubst %/,%,$(dir $(SRCDIR)/$(1))) # gb_Gallery__Gallery_impl gallery package basedir name define gb_Gallery__Gallery_impl $(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1))) -$(call gb_Package_set_outdir,$(2),$(INSTROOT)) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdg,$(1).sdg) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdv,$(1).sdv) $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).thm,$(1).thm) diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index da9e5af20315..d3ae728d5813 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -594,7 +594,6 @@ $(call gb_HelpLinkTarget_HelpLinkTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) $(call gb_Package_Package_internal,$(5),$(4)) -$(call gb_Package_set_outdir,$(5),$(INSTROOT)) $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index dd4228697cd4..860b890aac98 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -74,7 +74,6 @@ endef define gb_Library__Library_impl_copy $(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR)) -$(call gb_Package_set_outdir,Library_Copy_$(1),$(INSTROOT)) $(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2)) $(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2) endef diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index a4d310447e04..25f8c8fe9485 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -33,7 +33,6 @@ gb_Pyuno_get_packagename = Pyuno/$(1) # gb_Pyuno_Pyuno component define gb_Pyuno_Pyuno $(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2)) -$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(INSTROOT)) $(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1))) $(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index e2c17672d103..0f1ee1afced9 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -209,8 +209,6 @@ $(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$ $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR)) $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR)) -$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(INSTROOT)) -$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(INSTROOT)) $(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1))) $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir @@ -230,7 +228,6 @@ endef define gb_UIConfig__UIConfig_for_lang $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)) -$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(INSTROOT)) $(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2))) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 69ae8a928adf..5f40ee31bcaf 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -20,7 +20,6 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) -$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) endif $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir |