From 2c78d4965a8ddd77b926edc0e0aa4a19577e2453 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 9 Jan 2017 14:45:11 +0100
Subject: tdf#90753 scp2: move firebirdsdbc packages to AutoInstall

Change-Id: Ifabb9fa65115fcc1728fa16e142ef008834eedda
---
 scp2/AutoInstall.mk           |  1 +
 scp2/InstallModule_base.mk    |  1 +
 scp2/source/base/firebird.scp | 13 +++----------
 3 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'scp2')

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 43c53ab7dadf..409ceb9ed21f 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -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))
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 2efba1843919..709d1493e0d8 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -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 \
 ))
 
diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp
index dd7288f38ea1..61cfff9cc496 100644
--- a/scp2/source/base/firebird.scp
+++ b/scp2/source/base/firebird.scp
@@ -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
-- 
cgit