diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-11 06:48:30 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 16:40:11 +0200 |
| commit | 304ab4488ccbb3737f046a87ac2a5d924edcaa08 (patch) | |
| tree | b064708f418749ad0256a1fdc27f32ca3b986b30 /connectivity | |
| parent | 99dfc2632754330f49f3fd2bb9eefbb9c6f10ad7 (diff) | |
Rename firebird-sdbc to firebird_sdbc to compile with latest master.
Change-Id: I56e3180095c8a1fa660e1e27588320bdce972952
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/Library_firebird_sdbc.mk (renamed from connectivity/Library_firebird-sdbc.mk) | 16 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 4 | ||||
| -rw-r--r-- | connectivity/Rdb_firebird_sdbc.mk (renamed from connectivity/Rdb_firebird-sdbc.mk) | 6 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/firebird_sdbc.component (renamed from connectivity/source/drivers/firebird/firebird-sdbc.component) | 0 |
4 files changed, 14 insertions, 12 deletions
diff --git a/connectivity/Library_firebird-sdbc.mk b/connectivity/Library_firebird_sdbc.mk index d69bdb0fb729..b05870ff21d1 100644 --- a/connectivity/Library_firebird-sdbc.mk +++ b/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 \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 3b6b0d97aaa6..ad2401b78ac4 100644 --- a/connectivity/Module_connectivity.mk +++ b/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 diff --git a/connectivity/Rdb_firebird-sdbc.mk b/connectivity/Rdb_firebird_sdbc.mk index c3346cd36e46..2679186f333b 100644 --- a/connectivity/Rdb_firebird-sdbc.mk +++ b/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 \ )) diff --git a/connectivity/source/drivers/firebird/firebird-sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component index 2624f2e7b00b..2624f2e7b00b 100644 --- a/connectivity/source/drivers/firebird/firebird-sdbc.component +++ b/connectivity/source/drivers/firebird/firebird_sdbc.component |