diff options
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4364d126dc27..ede09bf9eea2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3090,7 +3090,7 @@ endef else # !SYSTEM_HSQLDB -$(eval $(call gb_Helper_register_jars,OOO,\ +$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \ hsqldb \ )) diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 7b5b13ef6eb7..7edab00a5b59 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -19,7 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) -$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,python)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a2a9356aeb65..00b6e3d8571b 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -316,9 +316,6 @@ STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif #ifdef ENABLE_JAVA -#ifndef SYSTEM_HSQLDB -STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb ) -#endif STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb ) #endif |