Kaydet (Commit) 2c78d496 authored tarafından Michael Stahl's avatar Michael Stahl

tdf#90753 scp2: move firebirdsdbc packages to AutoInstall

Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda
üst ce38f881
......@@ -2925,6 +2925,10 @@ endef
else # !SYSTEM_FIREBIRD
$(eval $(call gb_Helper_register_packages_for_install,firebirdsdbc,\
firebird \
))
#$(call gb_LinkTarget__use_libatomic_ops,$(1))
#$(call gb_LinkTarget__use_libtommath,$(1))
......
......@@ -22,6 +22,7 @@ $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,extensions_numbertext,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
......
......@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
base \
base_brand \
firebirdsdbc \
postgresqlsdbc \
))
......
......@@ -18,6 +18,8 @@
#include "macros.inc"
#include "AutoInstall/firebirdsdbc"
#if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD )
Module gid_Module_Optional_Firebird
......@@ -25,17 +27,8 @@ Module gid_Module_Optional_Firebird
Description = "Firebird embedded database";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand;
Files = (
File gid_File_Firebird
);
Files = (auto_firebirdsdbc_ALL);
Styles = (HIDDEN_ROOT);
End
File gid_File_Firebird
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "firebird.filelist";
End
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment