[Libreoffice-commits] core.git: cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppu/InternalUnoApi_cppu.mk cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk cppu/InternalUnoApi_cppu_qa_types.mk cppu/Module_cppu.mk

[Stephan Bergmann]

 cppu/CppunitTest_cppu_qa_any.mk                |    2 -
 cppu/CppunitTest_cppu_qa_recursion.mk          |    2 -
 cppu/CppunitTest_cppu_qa_reference.mk          |    2 -
 cppu/CppunitTest_cppu_qa_unotype.mk            |    1 
 cppu/CppunitTest_cppu_test_cppumaker.mk        |    2 -
 cppu/InternalUnoApi_cppu.mk                    |   29 -------------------------
 cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk |   25 +++++++++++++++++++++
 cppu/InternalUnoApi_cppu_qa_types.mk           |   25 +++++++++++++++++++++
 cppu/Module_cppu.mk                            |    3 +-
 9 files changed, 56 insertions(+), 35 deletions(-)

New commits:
commit 5d004e875653fa7d8632a25306ab7cf0726cbf40
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 18 18:27:59 2013 +0200

    There are two distinct InternalUnoApis in cppu/qa
    
    Change-Id: I59ab1a6086b1b70c52687c819cd53497fbd09675

diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index 2e7688d..da0fa37 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/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 \
 ))
 
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index ced1234..36c4886 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/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 \
 ))
 
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index c8688b7..acc996b 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/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 \
 ))
 
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index 991d49b..45aba8f 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/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 \
 ))
 
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index a7d8a12..188d05c 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/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 \
 ))
 
diff --git a/cppu/InternalUnoApi_cppu.mk b/cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk
similarity index 58%
copy from cppu/InternalUnoApi_cppu.mk
copy to cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk
index dbb5c03..01fc9e7 100644
--- a/cppu/InternalUnoApi_cppu.mk
+++ b/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 \
 ))
 
diff --git a/cppu/InternalUnoApi_cppu.mk b/cppu/InternalUnoApi_cppu_qa_types.mk
similarity index 58%
rename from cppu/InternalUnoApi_cppu.mk
rename to cppu/InternalUnoApi_cppu_qa_types.mk
index dbb5c03..f94eaeb 100644
--- a/cppu/InternalUnoApi_cppu.mk
+++ b/cppu/InternalUnoApi_cppu_qa_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_types))
 
-$(eval $(call gb_InternalUnoApi_use_api,cppu,\
+$(eval $(call gb_InternalUnoApi_use_api,cppu_qa_types,\
     udkapi \
 ))
 
-$(eval $(call gb_InternalUnoApi_set_include,cppu,\
+$(eval $(call gb_InternalUnoApi_set_include,cppu_qa_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_types,cppu/qa,\
     types \
 ))
 
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
index 3e9e0a9..897295c 100644
--- a/cppu/Module_cppu.mk
+++ b/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 \