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

Tor Lillqvist tml at collabora.com
Thu Mar 19 12:57:56 PDT 2015


 connectivity/Library_tdeab1.mk    |    1 -
 connectivity/Library_tdeabdrv1.mk |    1 -
 shell/Library_tdebe.mk            |    5 -----
 vcl/Library_vclplug_tde.mk        |    1 -
 4 files changed, 8 deletions(-)

New commits:
commit 3a699403f1c6d979fc61f4bc14e5c1f740c8aab0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 19 21:54:24 2015 +0200

    No need to use -I$(SRCDIR)/include/shell
    
    We always use -I$(SRCDIR)/include, and the #include statements use
    <shell/*.h>.
    
    Change-Id: I62d32b3a1bd0840f3a4bb149c5552c2aed98cb56

diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk
index 8243280..298ed4c 100644
--- a/connectivity/Library_tdeab1.mk
+++ b/connectivity/Library_tdeab1.mk
@@ -18,7 +18,6 @@ $(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 1398d9f..8301e5f 100644
--- a/connectivity/Library_tdeabdrv1.mk
+++ b/connectivity/Library_tdeabdrv1.mk
@@ -12,7 +12,6 @@ $(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 3b516d8..dc5b735 100644
--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -9,11 +9,6 @@
 
 $(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/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index af5da99d..ad1ed40 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Library_set_include,vclplug_tde,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
     -I$(SRCDIR)/vcl/inc/unx/kde \
-    -I$(SRCDIR)/include/shell \
 ))
 
 $(eval $(call gb_Library_set_include,vclplug_tde,\


More information about the Libreoffice-commits mailing list