From 81f077bcf2f1dab1ec72b4707f2e2782100d66eb Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 24 Apr 2013 11:27:16 +0300
Subject: Don't point to inc directories that don't exist any longer

Change-Id: If783897a60a545baf3968c5eeccf80a1e186bc51
---
 basebmp/CppunitTest_basebmp.mk                          | 5 -----
 basebmp/Library_basebmp.mk                              | 5 -----
 canvas/Library_cairocanvas.mk                           | 5 -----
 comphelper/CppunitTest_comphelper_test.mk               | 5 -----
 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 5 -----
 salhelper/CppunitTest_salhelper_testapi.mk              | 5 -----
 svl/CppunitTest_svl_lngmisc.mk                          | 1 -
 svtools/Executable_langsupport.mk                       | 1 -
 8 files changed, 32 deletions(-)

diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index 9f55ba1d390e..67113ff0d874 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -9,11 +9,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,basebmp_cpputest))
 
-$(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
-    -I$(SRCDIR)/basebmp/inc/ \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 3f0caeb7ae72..26d8f2a1c868 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -22,11 +22,6 @@ $(eval $(call gb_Library_use_libraries,basebmp,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_set_include,basebmp,\
-    -I$(SRCDIR)/basebmp/inc/ \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,basebmp,\
 	-DBASEBMP_DLLIMPLEMENTATION \
 ))
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index b76c35b90509..dcabb51d4b3c 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,cairocanvas))
 
 $(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas))
 
-$(eval $(call gb_Library_set_include,cairocanvas,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-))
-
 $(eval $(call gb_Library_use_sdk_api,cairocanvas))
 
 ifeq ($(OS),MACOSX)
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index a52e337a4677..89e071044ed7 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -26,9 +26,4 @@ $(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,comphelper_test,\
-    -I$(SRCDIR)/comphelper/inc \
-    $$(INCLUDE) \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index 0bed7f56468f..a1f294336a23 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -37,11 +37,6 @@ $(eval $(call gb_CppunitTest_use_package,i18nlangtag_test_languagetag,langtag_da
 endif
 endif
 
-$(eval $(call gb_CppunitTest_set_include,i18nlangtag_test_languagetag,\
-	-I$(SRCDIR)/i18nlangtag/inc \
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_add_exception_objects,i18nlangtag_test_languagetag,\
 	i18nlangtag/qa/cppunit/test_languagetag \
 ))
diff --git a/salhelper/CppunitTest_salhelper_testapi.mk b/salhelper/CppunitTest_salhelper_testapi.mk
index 1943c1b54a09..bea1cf1fda51 100644
--- a/salhelper/CppunitTest_salhelper_testapi.mk
+++ b/salhelper/CppunitTest_salhelper_testapi.mk
@@ -19,11 +19,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,salhelper_testapi,\
     salhelper/qa/test_api \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,salhelper_testapi,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/salhelper/inc \
-))
-
 $(eval $(call gb_CppunitTest_use_external,salhelper_testapi,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,salhelper_testapi,\
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index 010593fbbcbc..3a59dc0ad14d 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -50,7 +50,6 @@ endif
 
 $(eval $(call gb_CppunitTest_set_include,svl_lngmisc,\
 	-I$(SRCDIR)/svl/source/inc \
-	-I$(SRCDIR)/svl/inc \
 	$$(INCLUDE) \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_langsupport.mk b/svtools/Executable_langsupport.mk
index 7f822cc4476a..94c49fc5e5e3 100644
--- a/svtools/Executable_langsupport.mk
+++ b/svtools/Executable_langsupport.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_Executable_set_targettype_gui,langsupport,YES))
 $(eval $(call gb_Executable_set_include,langsupport,\
     $$(INCLUDE) \
     -I$(SRCDIR)/svtools/inc \
-    -I$(SRCDIR)/svtools/inc/svtools \
     -I$(SRCDIR)/svtools/source/inc \
 ))
 
-- 
cgit