gbuild: avoid unnecessary Packages while processing scp2 files

This is first in do-not-duplicate-stuff-in-solver patch series.
Adds direct include path for gb_ScpPreprocessTarget.
Avoids copying .par files by using gb_InstallScriptTarget__get_dirs
for include paths.

Change-Id: I0a2b76accbbe7f33c83816fb8ad69cc29590e9e2

1 files changed, 0 insertions, 37 deletions

diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index 7ff5a9effff1..cb37a49625c4 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -40,23 +40,15 @@ $(call gb_InstallModule_get_clean_target,%) :
 
 define gb_InstallModule_InstallModule
 $(call gb_InstallModuleTarget_InstallModuleTarget,$(1))
-$(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1)))
 
 $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1))
-$(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par)
 $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir
 $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))
-$(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_par)
 
 $$(eval $$(call gb_Module_register_target,$(call gb_InstallModule_get_target,$(1)),$(call gb_InstallModule_get_clean_target,$(1))))
 
 endef
 
-define gb_InstallModule_set_include
-$(call gb_InstallModuleTarget_set_include,$(1),$(2))
-
-endef
-
 define gb_InstallModule_add_defs
 $(call gb_InstallModuleTarget_add_defs,$(1),$(2))
 
@@ -77,52 +69,23 @@ $(call gb_InstallModuleTarget_define_mingw_dll_if_set,$(1),$(2))
 
 endef
 
-define gb_InstallModule_use_package
-$(call gb_InstallModuleTarget_use_package,$(1),$(2))
-
-endef
-
-define gb_InstallModule_use_packages
-$(call gb_InstallModuleTarget_use_packages,$(1),$(2))
-
-endef
-
-define gb_InstallModule__add_scpfile_impl
-$(call gb_Package_add_file,$(1)_par,par/osl/$(notdir $(2)),$(2))
-
-endef
-
-define gb_InstallModule__add_scpfile
-$(call gb_InstallModule__add_scpfile_impl,$(1),$(dir $(2))$(notdir $(call gb_ScpTarget_get_target,$(2))))
-
-endef
-
-define gb_InstallModule__add_scpfiles
-$(foreach scpfile,$(2),$(call gb_InstallModule__add_scpfile,$(1),$(scpfile)))
-
-endef
-
 define gb_InstallModule_add_scpfile
 $(call gb_InstallModuleTarget_add_scpfile,$(1),$(2))
-$(call gb_InstallModule__add_scpfile,$(1),$(2))
 
 endef
 
 define gb_InstallModule_add_scpfiles
 $(call gb_InstallModuleTarget_add_scpfiles,$(1),$(2))
-$(call gb_InstallModule__add_scpfiles,$(1),$(2))
 
 endef
 
 define gb_InstallModule_add_localized_scpfile
 $(call gb_InstallModuleTarget_add_localized_scpfile,$(1),$(2))
-$(call gb_InstallModule__add_scpfile,$(1),$(2))
 
 endef
 
 define gb_InstallModule_add_localized_scpfiles
 $(call gb_InstallModuleTarget_add_localized_scpfiles,$(1),$(2))
-$(call gb_InstallModule__add_scpfiles,$(1),$(2))
 
 endef