fixes for libmerged

Change-Id: I77c7ebcbba4fd2c78d66d6088bbbf4a3122f7c8a

solenv/gbuild/LinkTarget.mk

@@ -454,7 +454,9 @@ $(call gb_LinkTarget_get_target,Library/%.exports) : $(gb_Library_OUTDIRLOCATION
 $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
 	$(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktargetname,$(lib)))),\
 	$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\
-	$(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) && echo invalid > $@),$(call gb_LinkTarget__command,$@,$*))
+	$(call gb_LinkTarget__command,$@,$*),\
+	mkdir -p $(dir $@) && echo invalid > $@ \
+	$(if $(SOVERSION),&& echo invalid > $@.$(SOVERSION))),$(call gb_LinkTarget__command,$@,$*))
 	$(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -870,6 +872,7 @@ gb_BUILD_HELPER_LIBS := basegfx \
 
 gb_BUILD_HELPER_TOOLS := cppumaker \
 	idlc \
+	reg2unoidl \
 	regmerge \
 	rsc \
 	svidl