diff options
| -rw-r--r-- | Repository.mk | 8 | ||||
| -rw-r--r-- | testtools/Library_bridgetest.mk | 18 | ||||
| -rw-r--r-- | testtools/Library_constructors.mk | 14 | ||||
| -rw-r--r-- | testtools/Library_cppobj.mk | 18 | ||||
| -rw-r--r-- | testtools/StaticLibrary_bridgetest.mk | 13 |
5 files changed, 33 insertions, 38 deletions
diff --git a/Repository.mk b/Repository.mk index a113a6bd060c..f3e6bcdced65 100644 --- a/Repository.mk +++ b/Repository.mk @@ -590,9 +590,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ endif $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ - cppobj \ - bridgetest \ - constructors \ acceptor \ binaryurp \ bootstrap \ @@ -607,6 +604,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ reflection \ stocservices \ streams \ + testtools_cppobj \ + testtools_bridgetest \ + testtools_constructors \ textinstream \ textoutstream \ uuresolver \ @@ -647,7 +647,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ shlxthandler_common \ shlxthandler_common_x64 \ salcpprt \ - testtools_bridgetest \ + testtools_bridgetest_s \ transex \ ulingu \ vclmain \ diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk index b2765f692622..a8f8fa58605e 100644 --- a/testtools/Library_bridgetest.mk +++ b/testtools/Library_bridgetest.mk @@ -24,34 +24,34 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Library_Library,bridgetest)) +$(eval $(call gb_Library_Library,testtools_bridgetest)) -$(eval $(call gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest)) +$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest)) -$(eval $(call gb_Executable_set_include,bridgetest,\ +$(eval $(call gb_Executable_set_include,testtools_bridgetest,\ -I$(SRCDIR)/testtools/source/bridgetest \ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_internal_api,bridgetest,\ +$(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\ bridgetest \ )) -$(eval $(call gb_Library_use_api,bridgetest,\ +$(eval $(call gb_Library_use_api,testtools_bridgetest,\ udkapi \ )) -$(eval $(call gb_Library_use_static_libraries,bridgetest,\ - testtools_bridgetest \ +$(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\ + testtools_bridgetest_s \ )) -$(eval $(call gb_Library_use_libraries,bridgetest,\ +$(eval $(call gb_Library_use_libraries,testtools_bridgetest,\ cppu \ cppuhelper \ sal \ )) -$(eval $(call gb_Library_add_exception_objects,bridgetest,\ +$(eval $(call gb_Library_add_exception_objects,testtools_bridgetest,\ testtools/source/bridgetest/bridgetest \ )) diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk index abf273b1d581..3de70083ca2b 100644 --- a/testtools/Library_constructors.mk +++ b/testtools/Library_constructors.mk @@ -24,30 +24,30 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Library_Library,constructors)) +$(eval $(call gb_Library_Library,testtools_constructors)) -$(eval $(call gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors)) +$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors)) -$(eval $(call gb_Executable_set_include,constructors,\ +$(eval $(call gb_Executable_set_include,testtools_constructors,\ -I$(SRCDIR)/testtools/source/bridgetest \ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_internal_api,constructors,\ +$(eval $(call gb_Library_use_internal_api,testtools_constructors,\ bridgetest \ )) -$(eval $(call gb_Library_use_api,constructors,\ +$(eval $(call gb_Library_use_api,testtools_constructors,\ udkapi \ )) -$(eval $(call gb_Library_use_libraries,constructors,\ +$(eval $(call gb_Library_use_libraries,testtools_constructors,\ cppu \ cppuhelper \ sal \ )) -$(eval $(call gb_Library_add_exception_objects,constructors,\ +$(eval $(call gb_Library_add_exception_objects,testtools_constructors,\ testtools/source/bridgetest/constructors \ )) diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk index 649f71a7e8e8..0bbdf231fc9b 100644 --- a/testtools/Library_cppobj.mk +++ b/testtools/Library_cppobj.mk @@ -24,34 +24,34 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Library_Library,cppobj)) +$(eval $(call gb_Library_Library,testtools_cppobj)) -$(eval $(call gb_Library_set_componentfile,cppobj,testtools/source/bridgetest/cppobj)) +$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj)) -$(eval $(call gb_Executable_set_include,cppobj,\ +$(eval $(call gb_Executable_set_include,testtools_cppobj,\ -I$(SRCDIR)/testtools/source/bridgetest \ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_internal_api,cppobj,\ +$(eval $(call gb_Library_use_internal_api,testtools_cppobj,\ bridgetest \ )) -$(eval $(call gb_Library_use_api,cppobj,\ +$(eval $(call gb_Library_use_api,testtools_cppobj,\ udkapi \ )) -$(eval $(call gb_Library_use_static_libraries,cppobj,\ - testtools_bridgetest \ +$(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\ + testtools_bridgetest_s \ )) -$(eval $(call gb_Library_use_libraries,cppobj,\ +$(eval $(call gb_Library_use_libraries,testtools_cppobj,\ cppu \ cppuhelper \ sal \ )) -$(eval $(call gb_Library_add_exception_objects,cppobj,\ +$(eval $(call gb_Library_add_exception_objects,testtools_cppobj,\ testtools/source/bridgetest/cppobj \ )) diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index c3bde3c0c8f7..ed96f3489f42 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -25,22 +25,17 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest)) +$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) -$(eval $(call gb_StaticLibrary_set_include,cppobj,\ - -I$(SRCDIR)/testtools/source/bridgetest \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\ +$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\ bridgetest \ )) -$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\ +$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest_s,\ udkapi \ )) -$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest,\ +$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest_s,\ testtools/source/bridgetest/currentcontextchecker \ testtools/source/bridgetest/multi \ )) |