diff options
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/Jar_testComponent.mk | 2 | ||||
| -rw-r--r-- | testtools/Library_bridgetest.mk | 2 | ||||
| -rw-r--r-- | testtools/Library_constructors.mk | 2 | ||||
| -rw-r--r-- | testtools/Library_cppobj.mk | 2 | ||||
| -rw-r--r-- | testtools/Rdb_uno_services.mk | 12 |
5 files changed, 4 insertions, 16 deletions
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk index f3969a42277d..c5d789d1cb7e 100644 --- a/testtools/Jar_testComponent.mk +++ b/testtools/Jar_testComponent.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com)) $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest)) -$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE)) +$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE,uno_services)) $(eval $(call gb_Jar_add_packagedirs,testComponent,\ $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \ diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk index 52f335761fdf..a9fb4558faa5 100644 --- a/testtools/Library_bridgetest.mk +++ b/testtools/Library_bridgetest.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,testtools_bridgetest)) -$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest)) +$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest,uno_services)) $(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\ bridgetest \ diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk index 516c05d62db8..3d5cdf5779c4 100644 --- a/testtools/Library_constructors.mk +++ b/testtools/Library_constructors.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,testtools_constructors)) -$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors)) +$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors,uno_services)) $(eval $(call gb_Executable_set_include,testtools_constructors,\ -I$(SRCDIR)/testtools/source/bridgetest \ diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk index 086b1fa0b6f5..3019b330da90 100644 --- a/testtools/Library_cppobj.mk +++ b/testtools/Library_cppobj.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,testtools_cppobj)) -$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj)) +$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj,uno_services)) $(eval $(call gb_Executable_set_include,testtools_cppobj,\ -I$(SRCDIR)/testtools/source/bridgetest \ diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk index b2ff7d9c73a7..ad83542a4803 100644 --- a/testtools/Rdb_uno_services.mk +++ b/testtools/Rdb_uno_services.mk @@ -9,16 +9,4 @@ $(eval $(call gb_Rdb_Rdb,uno_services)) -$(eval $(call gb_Rdb_add_components,uno_services,\ - testtools/source/bridgetest/cppobj \ - testtools/source/bridgetest/constructors \ - testtools/source/bridgetest/bridgetest \ -)) - -ifneq ($(ENABLE_JAVA),) -$(eval $(call gb_Rdb_add_components,uno_services,\ - testtools/source/bridgetest/testComponent \ -)) -endif - # vim:set noet sw=4 ts=4: |