Match gb_CppunitTest_CppunitTest,* and CppunitTest_*.mk

...so that "make CppunitTest_svgio" work.

Change-Id: I7f9ad01c4e96f6b99b55531801970dc7a258389f

svgio/CppunitTest_svgio.mk

@@ -7,30 +7,30 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,svgio_import_test))
+$(eval $(call gb_CppunitTest_CppunitTest,svgio))
 
-$(eval $(call gb_CppunitTest_set_componentfile,svgio_import_test,svgio/svgio))
+$(eval $(call gb_CppunitTest_set_componentfile,svgio,svgio/svgio))
 
-$(eval $(call gb_CppunitTest_set_include,svgio_import_test,\
+$(eval $(call gb_CppunitTest_set_include,svgio,\
     $$(INCLUDE) \
     -I$(SRCDIR)/svgio/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,svgio_import_test,\
+$(eval $(call gb_CppunitTest_use_externals,svgio,\
     boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,svgio_import_test,\
+$(eval $(call gb_CppunitTest_use_api,svgio,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_library_objects,svgio_import_test,\
+$(eval $(call gb_CppunitTest_use_library_objects,svgio,\
     svgio \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,svgio_import_test,\
+$(eval $(call gb_CppunitTest_use_libraries,svgio,\
     basegfx \
     drawinglayer \
     cppu \
@@ -46,14 +46,14 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio_import_test,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,svgio_import_test,\
+$(eval $(call gb_CppunitTest_add_exception_objects,svgio,\
     svgio/qa/cppunit/SvgImportTest \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,svgio_import_test))
-$(eval $(call gb_CppunitTest_use_vcl,svgio_import_test))
+$(eval $(call gb_CppunitTest_use_ure,svgio))
+$(eval $(call gb_CppunitTest_use_vcl,svgio))
 
-$(eval $(call gb_CppunitTest_use_components,svgio_import_test,\
+$(eval $(call gb_CppunitTest_use_components,svgio,\
     configmgr/source/configmgr \
     dtrans/util/mcnttype \
     framework/util/fwk \
@@ -68,6 +68,6 @@ $(eval $(call gb_CppunitTest_use_components,svgio_import_test,\
     sax/source/expatwrap/expwrap \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,svgio_import_test))
+$(eval $(call gb_CppunitTest_use_configuration,svgio))
 
 # vim: set noet sw=4 ts=4: