--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -27,6 +27,11 @@
$(eval $(call gb_Library_Library,tdebe1))
+$(eval $(call gb_Library_set_include,tdebe1,\
+ $$(INCLUDE) \
+ $$(TDE_CFLAGS) \
+))
+
$(eval $(call gb_Library_use_packages,tdebe1,\
shell_inc \
))
@@ -40,6 +45,11 @@
tde \
))
+$(eval $(call gb_Library_add_libs,tdebe1,\
+ $$(TDE_LIBS) \
+ -lkio \
+))
+
$(eval $(call gb_Library_use_libraries,tdebe1,\
cppu \
cppuhelper \
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -74,7 +74,7 @@
))
endif
-ifeq ($(ENABLE_TAB),TRUE)
+ifeq ($(ENABLE_TDEAB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_tdeab \
Library_tdeab1 \
--- a/Repository.mk
+++ b/Repository.mk
@@ -300,6 +300,8 @@
itg \
iti \
jdbc \
+ tdeab1 \
+ tdeabdrv1 \
kab1 \
kabdrv1 \
lng \
@@ -534,6 +536,7 @@
hatchwindowfactory \
i18npool \
i18nsearch \
+ tdebe1 \
kdebe1 \
kde4be1 \
localebe1 \
--- a/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
- com.sun.star.comp.sdbc.tdeab.Driver
-
-
- TDE Address Book
-
-
-
-
- true
-
-
-
-
-
-
--- /dev/null
+++ b/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+ com.sun.star.comp.sdbc.tdeab.Driver
+
+
+ TDE Address Book
+
+
+
+
+ true
+
+
+
+
+
+
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -33,11 +33,21 @@
$(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) \
+ $$(TDE_CFLAGS) \
+))
+
$(eval $(call gb_Library_use_api,tdeab1,\
offapi \
udkapi \
))
+$(eval $(call gb_Library_add_libs,tdeab1,\
+ $$(TDE_LIBS) \
+))
+
$(eval $(call gb_Library_use_libraries,tdeab1,\
comphelper \
cppu \
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -27,12 +27,19 @@
$(eval $(call gb_Library_Library,tdeabdrv1))
+$(eval $(call gb_Library_set_include,tdeabdrv1,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+ $$(TDE_CFLAGS) \
+))
+
$(eval $(call gb_Library_use_api,tdeabdrv1,\
offapi \
udkapi \
))
$(eval $(call gb_Library_add_libs,tdeabdrv1,\
+ $$(TDE_LIBS) \
-lkabc \
))
--- 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
# (initial developer)
+# Copyright (C) 2012 Timothy Pearson
+# (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,\