diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:04:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:17 +0200 |
| commit | 5ac6c4818aa533746c84c1a42fb07b82bc7ec713 (patch) | |
| tree | e8fa3df031fa33a9b50458b759a5938853b625b0 /scp2 | |
| parent | 53fd7e8690fa5c545da674d562da7ea8f2b686c0 (diff) | |
scp2: move postgresqlsdbc libraries to AutoInstall
Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_base.mk | 5 | ||||
| -rw-r--r-- | scp2/source/base/postgresqlsdbc.scp | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index f40e0a4fc22d..1958e746f4a2 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -24,6 +24,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND $(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,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index ca85bf5b0978..84942d7990b2 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -9,7 +9,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) -$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\ + base \ + postgresqlsdbc \ +)) $(eval $(call gb_InstallModule_define_if_set,scp2/base,\ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp index d27cf43d6f77..ba6d094080d4 100644 --- a/scp2/source/base/postgresqlsdbc.scp +++ b/scp2/source/base/postgresqlsdbc.scp @@ -9,14 +9,15 @@ #include "macros.inc" +#include "AutoInstall/postgresqlsdbc" + #if defined WITH_POSTGRESQL_SDBC Module gid_Module_Optional_PostgresqlSdbc PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC); ParentID = gid_Module_Prg_Base_Bin; - Files = (gid_File_Lib_PostgresqlSdbc, - gid_File_Lib_PostgresqlSdbcImpl, + Files = (auto_postgresqlsdbc_ALL, gid_File_PostgresqlSdbc_Ini, gid_File_PostgresqlSdbc_Rdb, gid_File_PostgresqlSdbc_Xcd); @@ -25,10 +26,6 @@ Module gid_Module_Optional_PostgresqlSdbc Styles = (); End -STD_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc) - -STD_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl) - File gid_File_PostgresqlSdbc_Ini TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; |