fdo#39491 more of unnecessary include paths

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,\

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,\

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) \
 ))
 

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) \
 ))
 

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 \

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 \
 ))
 

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,\

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/) \

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) \
 ))
 

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,\

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) \

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) \

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) \
 ))
 

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) \

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) \
 ))
 

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) \

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,\

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 \
 ))

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 \
 ))

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,\

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,\

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,\

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,\

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,\

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,\

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,\