diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-18 16:17:12 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-18 16:22:53 +0200 |
| commit | 2290b98d311ed4962bf0470e5c119a1f5ff3c01d (patch) | |
| tree | 5ffb8da89b9de1edcdf45ae437ec6c2fbc565a63 /connectivity | |
| parent | 2009b20dec72c20a6f3fc1d9223c24e7a68d5ad2 (diff) | |
fix TDE FTBFS
Change-Id: Icde6310d922a3d5e2822789a23403b9f188efaf4
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/Configuration_tdeab.mk | 4 | ||||
| -rw-r--r-- | connectivity/Library_tdeab1.mk | 5 | ||||
| -rw-r--r-- | connectivity/Library_tdeabdrv1.mk | 9 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 2 | ||||
| -rw-r--r-- | connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu (renamed from connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu) | 0 |
5 files changed, 18 insertions, 2 deletions
diff --git a/connectivity/Configuration_tdeab.mk b/connectivity/Configuration_tdeab.mk index 190b85e72dfe..1ce14dd18199 100644 --- a/connectivity/Configuration_tdeab.mk +++ b/connectivity/Configuration_tdeab.mk @@ -14,6 +14,8 @@ # Major Contributor(s): # Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> # (initial developer) +# Copyright (C) 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> +# (TDE version) # # All Rights Reserved. # @@ -28,7 +30,7 @@ $(eval $(call gb_Configuration_Configuration,driver_tdeab)) $(eval $(call gb_Configuration_add_spool_modules,driver_tdeab,connectivity/registry/tdeab,\ - org/openoffice/Office/DataAccess/Drivers-tab.xcu \ + org/openoffice/Office/DataAccess/Drivers-tdeab.xcu \ )) $(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 63602f490306..2192b19c07b6 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -33,6 +33,11 @@ $(eval $(call gb_Library_use_externals,tdeab1,\ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1)) +$(eval $(call gb_Library_set_include,tdeab1,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_api,tdeab1,\ offapi \ udkapi \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 1f3a8ea80f9f..165a05b35124 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -27,11 +27,20 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) +$(eval $(call gb_Library_set_include,tdeabdrv1,\ + -I$(SRCDIR)/connectivity/source/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_api,tdeabdrv1,\ offapi \ udkapi \ )) +$(eval $(call gb_Library_use_externals,tdeabdrv1,\ + tde \ +)) + $(eval $(call gb_Library_add_libs,tdeabdrv1,\ -lkabc \ )) diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index a57b42d0269a..b0dcdf836b14 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -74,7 +74,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(ENABLE_TAB),TRUE) +ifeq ($(ENABLE_TDEAB),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_tdeab \ Library_tdeab1 \ diff --git a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu index 6e7907aa2197..6e7907aa2197 100644 --- a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu |