Rename firebird-sdbc to firebird_sdbc to compile with latest master.

Change-Id: I56e3180095c8a1fa660e1e27588320bdce972952

Repository.mk

@@ -251,7 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	flat \
 	file \
 	filterconfig \
-	firebird-sdbc \
+	firebird_sdbc \
 	fpicker \
 	fps_office \
 	for \

connectivity/Library_firebird-sdbc.mk → connectivity/Library_firebird_sdbc.mk

@@ -7,33 +7,35 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Library_Library,firebird-sdbc))
+$(eval $(call gb_Library_Library,firebird_sdbc))
 
-$(eval $(call gb_Library_use_sdk_api,firebird-sdbc))
+$(eval $(call gb_Library_use_sdk_api,firebird_sdbc))
 
-$(eval $(call gb_Library_use_externals,firebird-sdbc,\
+$(eval $(call gb_Library_use_externals,firebird_sdbc,\
 	libfbembed \
 ))
 
-$(eval $(call gb_Library_set_include,firebird-sdbc,\
+$(eval $(call gb_Library_set_include,firebird_sdbc,\
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
 
-$(eval $(call gb_Library_use_libraries,firebird-sdbc, \
+$(eval $(call gb_Library_use_libraries,firebird_sdbc, \
     comphelper \
     cppu \
     cppuhelper \
     dbtools \
     sal \
     salhelper \
+    utl \
+    vcl \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,firebird-sdbc,connectivity/source/drivers/firebird/firebird-sdbc))
+$(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc))
 
-$(eval $(call gb_Library_add_exception_objects,firebird-sdbc,\
+$(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\
     connectivity/source/drivers/firebird/propertyids \
     connectivity/source/drivers/firebird/FConnection \
     connectivity/source/drivers/firebird/FDatabaseMetaData \

connectivity/Module_connectivity.mk

@@ -87,8 +87,8 @@ endif
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_firebird \
-	Library_firebird-sdbc \
-	Rdb_firebird-sdbc \
+	Library_firebird_sdbc \
+	Rdb_firebird_sdbc \
 ))
 endif
 

connectivity/Rdb_firebird-sdbc.mk → connectivity/Rdb_firebird_sdbc.mk

@@ -7,8 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Rdb_Rdb,firebird-sdbc))
+$(eval $(call gb_Rdb_Rdb,firebird_sdbc))
 
-$(eval $(call gb_Rdb_add_components,firebird-sdbc,\
-	connectivity/source/drivers/firebird/firebird-sdbc \
+$(eval $(call gb_Rdb_add_components,firebird_sdbc,\
+	connectivity/source/drivers/firebird/firebird_sdbc \
 ))

scp2/source/base/module_base.scp

@@ -47,12 +47,12 @@ Module gid_Module_Prg_Base_Bin
 End
 
 /* This could be moved to a std location */
-STD_LIB_FILE(gid_File_Lib_FirebirdSdbc, firebird-sdbc)
+STD_LIB_FILE(gid_File_Lib_FirebirdSdbc, firebird_sdbc)
 
 File gid_File_FirebirdSdbc_Rdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program_Services;
-    Name = "firebird-sdbc.rdb";
+    Name = "firebird_sdbc.rdb";
     Styles = (PACKED);
 End