sal: rename "cppunit/cppunittester" executable

... and put it in OOO layer since it's used by the smoketest instset.

It was in subdirectory for hysteric reasons, to pick up libraries from
module local output directories in the dmake build system.

Change-Id: I73b66672b17ede52c03071eb2ddee1a23c059ea9

4 files changed, 12 insertions, 26 deletions

diff --git a/Repository.mk b/Repository.mk
index 78a4936ce3df..cb71e155dce8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 	cfgex \
 	concat-deps \
 	cpp \
-	cppunit/cppunittester \
 	$(if $(filter MSC,$(COM)), \
 		gcc-wrapper \
 		g++-wrapper \
@@ -443,6 +442,11 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	unotest \
 ))
 
+# this is packaged in the "Test" instset, in the "program" dir :-/
+$(eval $(call gb_Helper_register_executables,OOO, \
+	cppunittester \
+))
+
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 	subsequenttest \
 	testtools_cppobj \
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
index e29ab2fe7dae..7d26ac6a5d70 100644
--- a/sal/Executable_cppunittester.mk
+++ b/sal/Executable_cppunittester.mk
@@ -8,24 +8,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Executable_Executable,cppunit/cppunittester))
+$(eval $(call gb_Executable_Executable,cppunittester))
 
-$(eval $(call gb_Executable_set_include,cppunit/cppunittester,\
+$(eval $(call gb_Executable_set_include,cppunittester,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/sal/inc \
 ))
 
-$(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\
+$(eval $(call gb_Executable_use_libraries,cppunittester,\
 	sal \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Executable_use_externals,cppunit/cppunittester,\
+$(eval $(call gb_Executable_use_externals,cppunittester,\
 	boost_headers \
 	cppunit \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\
+$(eval $(call gb_Executable_add_exception_objects,cppunittester,\
 	sal/cppunittester/cppunittester \
 ))
 
diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk
deleted file mode 100644
index 5fb3c52aac8d..000000000000
--- a/sal/qa/cppunit_local.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# cppunittester is built in this module; cannot use delivered version
-# this should be kept in sync with the definition in solenv/inc/settings.mk
-.IF "$(CROSS_COMPILING)"=="YES"
-CPPUNITTESTER=\#
-.ELSE
-CPPUNITTESTER = $(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(BIN)/cppunittester
-.ENDIF
-
-.INCLUDE : _cppunit.mk
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b372195109ad..aeda7e3e0fae 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -45,8 +45,8 @@ endif
 #  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
-gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppunit/cppunittester)
+gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunittester)
+gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppunittester)
 
 define gb_CppunitTest__make_args
 $(HEADLESS) \