diff options
| -rw-r--r-- | cppu/CppunitTest_cppu_qa_any.mk | 2 | ||||
| -rw-r--r-- | cppu/CppunitTest_cppu_qa_recursion.mk | 2 | ||||
| -rw-r--r-- | cppu/CppunitTest_cppu_qa_reference.mk | 2 | ||||
| -rw-r--r-- | cppu/CppunitTest_cppu_qa_unotype.mk | 1 | ||||
| -rw-r--r-- | cppu/CppunitTest_cppu_test_cppumaker.mk | 2 | ||||
| -rw-r--r-- | cppu/InternalUnoApi_cppu_qa_cppumaker_types.mk (renamed from cppu/InternalUnoApi_cppu.mk) | 12 | ||||
| -rw-r--r-- | cppu/InternalUnoApi_cppu_qa_types.mk | 25 | ||||
| -rw-r--r-- | cppu/Module_cppu.mk | 3 |
8 files changed, 35 insertions, 14 deletions
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 2e7688d583ad..da0fa37dcb0a 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 ced1234a8a78..36c4886ce8eb 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 c8688b719c9b..acc996bc94e1 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 991d49b246be..45aba8f1d635 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 a7d8a123853e..188d05c71975 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 index dbb5c0394da5..01fc9e7675c5 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_qa_types.mk b/cppu/InternalUnoApi_cppu_qa_types.mk new file mode 100644 index 000000000000..f94eaebed2ee --- /dev/null +++ b/cppu/InternalUnoApi_cppu_qa_types.mk @@ -0,0 +1,25 @@ +# -*- 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: diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk index 3e9e0a9218c7..897295cb03b3 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 \ |