There are two distinct InternalUnoApis in cppu/qa

Change-Id: I59ab1a6086b1b70c52687c819cd53497fbd09675

cppu/CppunitTest_cppu_qa_any.mk

@@ -23,7 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \
-	cppu \
+	cppu_qa_types \
 	udkapi \
 ))
 

cppu/CppunitTest_cppu_qa_recursion.mk

@@ -21,7 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \
-	cppu \
+	cppu_qa_types \
 	udkapi \
 ))
 

cppu/CppunitTest_cppu_qa_reference.mk

@@ -21,7 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \
-	cppu \
+	cppu_qa_types \
 	udkapi \
 ))
 

cppu/CppunitTest_cppu_qa_unotype.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \
-	cppu \
 	udkapi \
 ))
 

cppu/CppunitTest_cppu_test_cppumaker.mk

@@ -23,7 +23,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
 ))
 
 $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \
-	cppu \
+	cppu_qa_cppumaker_types \
 	udkapi \
 ))
 

cppu/InternalUnoApi_cppu.mk → cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk

@@ -7,22 +7,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu))
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_cppumaker_types))
 
-$(eval $(call gb_InternalUnoApi_use_api,cppu,\
+$(eval $(call gb_InternalUnoApi_use_api,cppu_qa_cppumaker_types,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,cppu,\
+$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_cppumaker_types,\
     -I$(SRCDIR)/udkapi \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa,\
-    types \
-))
-
-$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa/cppumaker,\
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu_qa_cppumaker_types,cppu/qa/cppumaker,\
     types \
 ))
 

cppu/InternalUnoApi_cppu_qa_types.mk

+# -*- 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/.
+#
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu_qa_types))
+
+$(eval $(call gb_InternalUnoApi_use_api,cppu_qa_types,\
+    udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_types,\
+    -I$(SRCDIR)/udkapi \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu_qa_types,cppu/qa,\
+    types \
+))
+
+# vim:set noet sw=4 ts=4:

cppu/Module_cppu.mk

@@ -11,7 +11,8 @@
 $(eval $(call gb_Module_Module,cppu))
 
 $(eval $(call gb_Module_add_targets,cppu,\
-	InternalUnoApi_cppu \
+	InternalUnoApi_cppu_qa_cppumaker_types \
+	InternalUnoApi_cppu_qa_types \
 	Library_affine_uno \
 	Library_cppu \
 	Library_log_uno \