[Libreoffice-commits] core.git: connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk shell/Library_tdebe.mk vcl/Executable_tdefilepicker.mk vcl/Library_vclplug_tde.mk

[Timothy Pearson]

 connectivity/Library_tdeab1.mk    |    1 +
 connectivity/Library_tdeabdrv1.mk |    1 +
 shell/Library_tdebe.mk            |    5 +++++
 vcl/Executable_tdefilepicker.mk   |    2 +-
 vcl/Library_vclplug_tde.mk        |    3 ++-
 5 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 38e2ef81204529691b3888076e33218342825801
Author: Timothy Pearson <kb9vqf at pearsoncomputing.net>
Date:   Wed Jul 16 02:04:39 2014 +0000

    Fix FTBFS with TDE support enabled
    
    Change-Id: Ib85371542c5d79ef69bc76f6aa388acdfd9dd849
    Reviewed-on: https://gerrit.libreoffice.org/10348
    Reviewed-by: Timothy Pearson <kb9vqf at pearsoncomputing.net>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 298ed4c..8243280 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/ka
 
 $(eval $(call gb_Library_set_include,tdeab1,\
 	-I$(SRCDIR)/connectivity/source/inc \
+        -I$(SRCDIR)/include/shell \
 	$$(INCLUDE) \
 ))
 
diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk
index 8301e5f..1398d9f 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,tdeabdrv1))
 
 $(eval $(call gb_Library_set_include,tdeabdrv1,\
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(SRCDIR)/include/shell \
 	$$(INCLUDE) \
 	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
 ))
diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk
index dc5b735..3b516d8 100644
--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,tdebe1))
 
+$(eval $(call gb_Library_set_include,tdebe1,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/include/shell \
+))
+
 $(eval $(call gb_Library_use_sdk_api,tdebe1))
 
 $(eval $(call gb_Library_use_externals,tdebe1,\
diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk
index 6a39235..9811e6d 100644
--- a/vcl/Executable_tdefilepicker.mk
+++ b/vcl/Executable_tdefilepicker.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/solenv/inc \
-    -I$(SRCDIR)/vcl/inc/unx/tde \
+    -I$(SRCDIR)/vcl/inc/unx/kde \
 ))
 
 $(eval $(call gb_Executable_use_libraries,tdefilepicker,\
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 74551bd..d05780b 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -15,7 +15,8 @@ $(eval $(call gb_Library_set_include,vclplug_tde,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/solenv/inc \
-    -I$(SRCDIR)/vcl/inc/unx/tde \
+    -I$(SRCDIR)/vcl/inc/unx/kde \
+    -I$(SRCDIR)/include/shell \
 ))
 
 $(eval $(call gb_Library_set_include,vclplug_tde,\