8 files changed, 4 insertions, 77 deletions
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index dbdd1d7c8782..7d22385bae78 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -150,43 +150,6 @@ $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
 
 endef
 
-# ScpConvertTarget class
-
-# platform:
-#  gb_ScpConvertTarget_ScpConvertTarget_platform
-
-gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
-gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
-
-define gb_ScpConvertTarget__command
-$(call gb_Output_announce,$(2),$(true),SCC,1)
-$(call gb_Helper_abbreviate_dirs,\
-	$(gb_ScpConvertTarget_COMMAND) $(SCP_FLAGS) -o $(1) $(SCP_CONVERT_ULF) \
-)
-endef
-
-$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
-	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_DEPS)
-	$(call gb_ScpConvertTarget__command,$@,$*)
-
-.PHONY : $(call gb_ScpConvertTarget_get_clean_target,%)
-$(call gb_ScpConvertTarget_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),SCC,1)
-	rm -f $(call gb_ScpConvertTarget_get_target,$*)
-
-# gb_ScpConvertTarget_ScpConvertTarget(<target>,<ulffile>)
-define gb_ScpConvertTarget_ScpConvertTarget
-$(call gb_ScpConvertTarget_get_target,$(1)) : $(2)
-$(call gb_ScpConvertTarget_get_target,$(1)) :| $(dir $(call gb_ScpConvertTarget_get_target,$(1))).dir
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_CONVERT_ULF := $(2)
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS :=
-
-$(call gb_ScpConvertTarget_ScpConvertTarget_platform,$(1))
-
-endef
-
 # ScpTarget class
 
 gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl
@@ -232,16 +195,14 @@ endef
 define gb_ScpTarget_set_localized
 ifneq ($(gb_WITH_LANG),)
 $(call gb_ScpMergeTarget_ScpMergeTarget,$(1))
-$(call gb_ScpConvertTarget_ScpConvertTarget,$(1),$(call gb_ScpMergeTarget_get_target,$(1)))
+$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call gb_ScpMergeTarget_get_target,$(1))
+$(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_target,$(1))
 $(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpMergeTarget_get_clean_target,$(1))
 else
-$(call gb_ScpConvertTarget_ScpConvertTarget,$(1),$(call gb_ScpMergeTarget_get_source,$(1)))
+$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call gb_ScpMergeTarget_get_source,$(1))
+$(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1))
 endif
 
-$(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpConvertTarget_get_target,$(1))
-$(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpConvertTarget_get_clean_target,$(1))
-$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call gb_ScpConvertTarget_get_target,$(1))
-
 endef
 
 # InstallModuleTarget class
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b46070e1e205..6fa782b719ce 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -176,7 +176,6 @@ gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
 gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
-gb_ScpConvertTarget_get_target = $(WORKDIR)/ScpConvertTarget/$(1).ulf
 gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
 gb_ScpPreprocessTarget_get_target = $(WORKDIR)/ScpPreprocessTarget/$(1).pre
 gb_ScpTarget_get_external_target = $(WORKDIR)/ScpTarget/$(1).external
@@ -292,7 +291,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	Pyuno \
 	Rdb \
 	ResTarget \
-	ScpConvertTarget \
 	ScpMergeTarget \
 	ScpPreprocessTarget \
 	ScpTarget \
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 3d14f54df9fe..e29a9bf67c1f 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -259,10 +259,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
 # InstallScript class
 
 gb_InstallScript_EXT := .ins
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 5b5c21ec9113..b70e84b46eb5 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -394,14 +394,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-# ScpConvertTarget class
-
-define gb_ScpConvertTarget_ScpConvertTarget_platform
-$(call gb_ScpConvertTarget_get_target,$(1)) :| $(OUTDIR)/bin/msi-encodinglist.txt
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS := -t $(OUTDIR)/bin/msi-encodinglist.txt
-
-endef
-
 # InstallScript class
 
 gb_InstallScript_EXT := .inf
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 9e9c87cc34bd..89be027d1e1f 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -538,14 +538,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-# ScpConvertTarget class
-
-define gb_ScpConvertTarget_ScpConvertTarget_platform
-$(call gb_ScpConvertTarget_get_target,$(1)) :| $(OUTDIR)/bin/msi-encodinglist.txt
-$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS := -t $(OUTDIR)/bin/msi-encodinglist.txt
-
-endef
-
 # InstallScript class
 
 gb_InstallScript_EXT := .inf
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 29e3549e3c76..c770d9094d46 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -347,10 +347,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
 # InstallScript class
 
 gb_InstallScript_EXT := .ins
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 67c5e88a3d38..d7a14c53c8e2 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -380,10 +380,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
 # InstallScript class
 
 gb_InstallScript_EXT := .ins
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5009ef548bfc..63aafda7de0e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -378,10 +378,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 
 endef
 
-# ScpConvertTarget class
-
-gb_ScpConvertTarget_ScpConvertTarget_platform :=
-
 # InstallScript class
 
 gb_InstallScript_EXT := .ins