diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 20:25:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:11 +0100 |
| commit | 376d1b594a3df8c04a2cf879561dfe0bd5dbd8a5 (patch) | |
| tree | 79013cbef6b6267c752d2f53e6d0e596b640e219 /scp2 | |
| parent | 8475eb98beb07d955a391e4c8f71846a24b38667 (diff) | |
scp2: move hsqldb to AutoInstall
Change-Id: Ib72e509df6df51c4a42ea56ce7b1927a051baad4
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 3 |
2 files changed, 1 insertions, 4 deletions
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 |