From c0e285d840373a26cee98deaccb521c1f8f1efdb Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 10 Apr 2018 13:59:16 +0200 Subject: dbaccess: fix --without-java build Change-Id: I9c1ac64745301deda1501806534f13c1527a33b3 Reviewed-on: https://gerrit.libreoffice.org/52670 Reviewed-by: Heiko Tietze Tested-by: Heiko Tietze Tested-by: Jenkins Reviewed-by: Miklos Vajna --- dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 1 - dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk | 2 -- dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 4 ---- 3 files changed, 7 deletions(-) diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index 9713871988ea..ddf69296cb28 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -68,7 +68,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_RowSetClones,\ comphelper/util/comphelp \ configmgr/source/configmgr \ connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/drivers/jdbc/jdbc \ connectivity/source/manager/sdbc2 \ dbaccess/util/dba \ dbaccess/util/dbu \ diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index 443213fe9410..6a92256937b3 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -22,7 +22,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_embeddeddb_performancetest, dbaxml \ dbtools \ firebird_sdbc \ - jvmfwk \ sal \ subsequenttest \ utl \ @@ -48,7 +47,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_embeddeddb_performancetest, configmgr/source/configmgr \ connectivity/source/cpool/dbpool2 \ connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/drivers/jdbc/jdbc \ connectivity/source/manager/sdbc2 \ dbaccess/util/dba \ dbaccess/source/filter/xml/dbaxml \ diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index b6bc33a2cf87..bb4fd0c8e2d6 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -23,7 +23,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_hsqldb_test, \ dbaxml \ dbtools \ firebird_sdbc \ - jvmfwk \ sal \ subsequenttest \ utl \ @@ -42,15 +41,12 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_hsqldb_test,\ $(eval $(call gb_CppunitTest_use_ure,dbaccess_hsqldb_test)) $(eval $(call gb_CppunitTest_use_vcl,dbaccess_hsqldb_test)) -$(eval $(call gb_CppunitTest_use_java_ure,dbaccess_hsqldb_test)) - $(eval $(call gb_CppunitTest_use_components,dbaccess_hsqldb_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ connectivity/source/cpool/dbpool2 \ connectivity/source/drivers/firebird/firebird_sdbc \ - connectivity/source/drivers/jdbc/jdbc \ connectivity/source/manager/sdbc2 \ dbaccess/util/dba \ dbaccess/source/filter/xml/dbaxml \ -- cgit