From 5cabaf5a32188f24344f68fa48cbdc0a8b8cfb41 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Thu, 9 Feb 2012 17:54:00 +0100
Subject: fdo#39491 more of unnecessary include paths

---
 forms/AllLangResTarget_frm.mk         | 1 -
 sc/Library_scfilt.mk                  | 1 -
 scaddins/Library_analysis.mk          | 1 -
 scaddins/Library_date.mk              | 1 -
 sccomp/Library_solver.mk              | 5 -----
 sd/Library_sd.mk                      | 2 --
 sd/Library_sdfilt.mk                  | 1 -
 sfx2/AllLangResTarget_sfx2.mk         | 1 -
 sfx2/Library_sfx.mk                   | 1 -
 svl/AllLangResTarget_svl.mk           | 1 -
 svl/Library_fsstorage.mk              | 1 -
 svl/Library_passwordcontainer.mk      | 1 -
 svtools/AllLangResTarget_svt.mk       | 1 -
 svtools/Executable_bmp.mk             | 1 -
 svtools/Library_hatchwindowfactory.mk | 1 -
 svtools/Library_svt.mk                | 1 -
 sw/Library_msword.mk                  | 1 -
 test/Library_subsequenttest.mk        | 5 -----
 test/Library_test.mk                  | 5 -----
 wizards/AllLangResTarget_cal.mk       | 1 -
 wizards/AllLangResTarget_dbw.mk       | 1 -
 wizards/AllLangResTarget_eur.mk       | 1 -
 wizards/AllLangResTarget_imp.mk       | 1 -
 wizards/AllLangResTarget_tpl.mk       | 1 -
 wizards/AllLangResTarget_wwz.mk       | 1 -
 wizards/AllLangResTarget_wzi.mk       | 1 -
 26 files changed, 39 deletions(-)

diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index 793410f6b925..a073c8ca717c 100644
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,frm/res))
 $(eval $(call gb_SrsTarget_set_include,frm/res,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/forms/source/inc) \
-    -I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,frm/res,\
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index b7c533b87c8f..53bea7aff982 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
         -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
         -I$(realpath $(SRCDIR)/sc/inc) \
         $$(INCLUDE) \
-        -I$(WORKDIR)/oox/inc/ \
 ))
 
 $(eval $(call gb_Library_add_api,scfilt,\
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 8c5e1ac55e5b..99c0708bde3a 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/ana
 
 $(eval $(call gb_Library_set_include,analysis,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
 	-I$(realpath $(WORKDIR)/UnoApiHeaders/offapi) \
 ))
 
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 6366dcdf4d7f..b09fd06d98c7 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
 
 $(eval $(call gb_Library_set_include,date,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
 	-I$(realpath $(WORKDIR)/UnoApiHeaders/offapi) \
 ))
 
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index ba9493a4d68b..806fa779d3aa 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,solver))
 
 $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver))
 
-$(eval $(call gb_Library_set_include,solver,\
-	$$(INCLUDE) \
-	-I$(realpath $(SRCDIR)/sccomp/source/solver) \
-))
-
 $(eval $(call gb_Library_add_api,solver,\
 	offapi \
 	udkapi \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 1b030bb3ff46..849d0c6bc07b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -51,10 +51,8 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\
 $(eval $(call gb_Library_set_include,sd,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/sd/inc) \
-    -I$(realpath $(SRCDIR)/sd/sdi) \
     -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
     -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
-    -I$(WORKDIR)/inc/sd \
     -I$(WORKDIR)/SdiTarget/sd/sdi \
 ))
 
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 957a9e9200b3..b3e74ffddb93 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_Library,sdfilt))
 $(eval $(call gb_Library_set_include,sdfilt,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/sd/inc) \
-    -I$(WORKDIR)/oox/inc/ \
 ))
 
 $(eval $(call gb_Library_add_defs,sdfilt,\
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index d197ef23943c..473f8c6e1228 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res))
 
 $(eval $(call gb_SrsTarget_set_include,sfx/res,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc \
     -I$(realpath $(SRCDIR)/sfx2/source/dialog) \
     -I$(realpath $(SRCDIR)/sfx2/source/inc) \
     -I$(realpath $(SRCDIR)/sfx2/inc/) \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index f6597b583aae..cf7c58078323 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_set_include,sfx,\
     -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \
     -I$(realpath $(SRCDIR)/sfx2/source/inc) \
     -I$(WORKDIR)/SdiTarget/sfx2/sdi \
-    -I$(WORKDIR)/inc/ \
     $$(INCLUDE) \
 ))
 
diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index 70edac226053..d47b9739ddf6 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res))
 
 $(eval $(call gb_SrsTarget_set_include,svl/res,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svl/res,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 33cf144f5195..dee7a5ff21c1 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,fsstorage))
 $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
-    -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 735c952cb835..3eebca6af2f3 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Library_Library,passwordcontainer))
 $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 
 $(eval $(call gb_Library_set_include,passwordcontainer,\
-    -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index be34c69bc149..615a09b7dd10 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/res))
 
 $(eval $(call gb_SrsTarget_set_include,svt/res,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc \
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
 ))
 
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index c2672ba6d942..760edee0e869 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,bmp))
 
 $(eval $(call gb_Executable_set_include,bmp,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svtools/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 9b3edfa12abc..712e81f8c4e6 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_componentfile,hatchwindowfactory,svtools/source/hat
 
 $(eval $(call gb_Library_set_include,hatchwindowfactory,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svtools/inc) \
 ))
 
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fb294dea0c7a..c07d01baa40e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_api,svt,\
 
 $(eval $(call gb_Library_set_include,svt,\
     $$(INCLUDE) \
-    -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svtools/inc/svtools) \
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc) \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 9951fb3076ec..376bab5410a9 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,msword,\
     -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
     -I$(realpath $(SRCDIR)/sw/inc) \
     $$(INCLUDE) \
-    -I$(WORKDIR)/oox/inc/ \
 ))
 
 $(eval $(call gb_Library_add_api,msword,\
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 49fb8332c39a..6c1556f59dac 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -27,11 +27,6 @@
 
 $(eval $(call gb_Library_Library,subsequenttest))
 
-$(eval $(call gb_Library_set_include,subsequenttest,\
-	-I$(SRCDIR)/tools/inc \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,subsequenttest,\
     -DOOO_DLLIMPLEMENTATION_TEST \
 ))
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 4275a1f06e59..d59042522001 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -29,11 +29,6 @@ $(eval $(call gb_Library_Library,test))
 
 $(eval $(call gb_Library_add_package_headers,test,test_inc))
 
-$(eval $(call gb_Library_set_include,test,\
-	-I$(SRCDIR)/tools/inc \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,test,\
     -DOOO_DLLIMPLEMENTATION_TEST \
 ))
diff --git a/wizards/AllLangResTarget_cal.mk b/wizards/AllLangResTarget_cal.mk
index 4f812bb6f4c2..2a312f064963 100644
--- a/wizards/AllLangResTarget_cal.mk
+++ b/wizards/AllLangResTarget_cal.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,cal/res))
 
 $(eval $(call gb_SrsTarget_set_include,cal/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,cal/res,\
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
index f9e1ee11b599..dc596b5e8991 100644
--- a/wizards/AllLangResTarget_dbw.mk
+++ b/wizards/AllLangResTarget_dbw.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbw/res))
 
 $(eval $(call gb_SrsTarget_set_include,dbw/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,dbw/res,\
diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk
index d2ff342b2fdc..a55d679cb93b 100644
--- a/wizards/AllLangResTarget_eur.mk
+++ b/wizards/AllLangResTarget_eur.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,eur/res))
 
 $(eval $(call gb_SrsTarget_set_include,eur/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,eur/res,\
diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk
index afbc44918d92..7a25f06b3598 100644
--- a/wizards/AllLangResTarget_imp.mk
+++ b/wizards/AllLangResTarget_imp.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,imp/res))
 
 $(eval $(call gb_SrsTarget_set_include,imp/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,imp/res,\
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
index d2326fb9bf07..5546ece07f2a 100644
--- a/wizards/AllLangResTarget_tpl.mk
+++ b/wizards/AllLangResTarget_tpl.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,tpl/res))
 
 $(eval $(call gb_SrsTarget_set_include,tpl/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,tpl/res,\
diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk
index a81dcb09faba..c64f40f01b78 100644
--- a/wizards/AllLangResTarget_wwz.mk
+++ b/wizards/AllLangResTarget_wwz.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,wwz/res))
 
 $(eval $(call gb_SrsTarget_set_include,wwz/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,wwz/res,\
diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk
index 8566dc9fa014..e48961808cbc 100644
--- a/wizards/AllLangResTarget_wzi.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
 
 $(eval $(call gb_SrsTarget_set_include,wzi/res,\
 	$$(INCLUDE) \
-	-I$(WORKDIR)/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,wzi/res,\
-- 
cgit