diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-15 21:11:22 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 16:40:16 +0200 |
| commit | f32dc63b5219e3b8ff99b3b04ec06b48b3c20eab (patch) | |
| tree | a47420e60d3eee5bbd3bc3e1915e7d89412c934d /postprocess | |
| parent | 35f02179210929fc125f69c6989a53610bd115df (diff) | |
Make firebird-sdbc install consistent with other drivers.
Change-Id: I01673bda5a08ca793f4fba89ddae036e3f1483e2
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 1 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 12 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 8dcc6891dee7..2e16ad8aad7d 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -49,6 +49,7 @@ $(packimages_DIR)/%.zip : \ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 6963c9759490..85abfd06d344 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -339,6 +339,11 @@ postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu postprocess_DRIVERS += hsqldb jdbc endif +ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +postprocess_FILES_main += \ + $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu +postprocess_DRIVERS += firebird_sdbc +endif ifeq ($(ENABLE_TDEAB),TRUE) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu endif @@ -426,13 +431,6 @@ postprocess_FILES_postgresqlsdbc := $(postprocess_MOD)/org/openoffice/Office/Dat postprocess_DRIVERS += postgresql endif -ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -postprocess_XCDS += firebirdsdbc.xcd -postprocess_DEPS_firebirdsdbc := main -postprocess_FILES_firebirdsdbc := $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu -postprocess_DRIVERS += firebird -endif - ifeq (unx,$(GUIBASE)) ifneq (,$(or $(filter TRUEYES,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO)))) postprocess_XCDS += gnome.xcd diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 4bc5f12f677e..10ce2d4eb42c 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -240,6 +240,9 @@ $(eval $(call gb_Rdb_add_components,services,\ wizards/com/sun/star/wizards/report/report \ wizards/com/sun/star/wizards/table/table \ ) \ + $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \ + connectivity/source/drivers/firebird/firebird_sdbc \ + ) \ )) ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) |