Revert "Repository.mk: adjust layer of libraries in smoketest instset"

This reverts commit 1b736bf5.

Obsoleted by commit 359472b2.

Repository.mk

@@ -438,20 +438,16 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 
 endif
 
-# these libraries are packaged in the "Test" instset, in the "program" dir :-/
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	smoketest \
-	test \
-	unobootstrapprotector \
-	unoexceptionprotector \
-	unotest \
-))
-
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+	smoketest \
 	subsequenttest \
+	test \
 	testtools_cppobj \
 	testtools_bridgetest \
 	testtools_constructors \
+	unobootstrapprotector \
+	unoexceptionprotector \
+	unotest \
 	scqahelper \
 	unowinreg \
 ))

RepositoryExternal.mk

@@ -192,7 +192,7 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
     cppunit \
 ))
 

external/cppunit/ExternalProject_cppunit.mk

@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
 			--disable-html-docs \
 			--disable-latex-docs \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
 			$(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
 			$(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
 			$(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \