diff options
Diffstat (limited to 'solenv/gbuild/InstallModuleTarget.mk')
| -rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 3d7fcd02ac89..379baefb7882 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -212,7 +212,6 @@ $(call gb_Output_announce,SCP:$(2),$(true),DEP,2) $(call gb_Helper_abbreviate_dirs,\ $(gb_ScpTarget_DEPCOMMAND) \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ - $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ -f $(1) \ -p \ ) @@ -295,18 +294,14 @@ $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \ $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_FILES := $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS := -$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := +$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := -I$(SRCDIR)/scp2/inc $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_TEMPLATE_INCLUDE := +$(call gb_InstallModuleTarget_use_custom_headers,$(1),scp2/macros) $(call gb_InstallModuleTarget_InstallModuleTarget_platform,$(1)) endef -define gb_InstallModuleTarget_set_include -$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := $(2) - -endef - define gb_InstallModuleTarget_add_defs $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS += $(2) @@ -333,13 +328,14 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ endef -define gb_InstallModuleTarget_use_package -$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_Package_get_target,$(2)) +define gb_InstallModuleTarget_use_custom_header +$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_CustomTarget_get_target,$(2)) +$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) \ endef -define gb_InstallModuleTarget_use_packages -$(foreach package,$(2),$(call gb_InstallModuleTarget_use_package,$(1),$(package))) +define gb_InstallModuleTarget_use_custom_headers +$(foreach customtarget,$(2),$(call gb_InstallModuleTarget_use_custom_header,$(1),$(customtarget))) endef |