Don't point to inc directories that don't exist any longer

Change-Id: Ia160f0ee3e9480c60056d38bf11a6b139b53424f

basebmp/StaticLibrary_basebmp.mk

@@ -22,11 +22,6 @@ $(eval $(call gb_StaticLibrary_use_libraries,basebmp,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_StaticLibrary_set_include,basebmp,\
-    -I$(SRCDIR)/basebmp/inc/ \
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_StaticLibrary_add_defs,basebmp,\
 	-DBASEBMP_DLLIMPLEMENTATION \
 ))

basegfx/Library_basegfx.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_libraries,basegfx,\
 ))
 
 $(eval $(call gb_Library_set_include,basegfx,\
-    -I$(SRCDIR)/basegfx/inc \
     -I$(SRCDIR)/basegfx/source/inc \
     $$(INCLUDE) \
 ))

canvas/Library_canvasfactory.mk

@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,canvasfactory))
 
 $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory))
 
-$(eval $(call gb_Library_set_include,canvasfactory,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-))
-
 $(eval $(call gb_Library_use_external,canvasfactory,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,canvasfactory))

canvas/Library_canvastools.mk

@@ -28,11 +28,6 @@
 
 $(eval $(call gb_Library_Library,canvastools))
 
-$(eval $(call gb_Library_set_include,canvastools,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-))
-
 $(eval $(call gb_Library_use_sdk_api,canvastools))
 
 $(eval $(call gb_Library_add_defs,canvastools,\

canvas/Library_nullcanvas.mk

@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,nullcanvas))
 
 $(eval $(call gb_Library_set_componentfile,nullcanvas,canvas/source/null/nullcanvas))
 
-$(eval $(call gb_Library_set_include,nullcanvas,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-))
-
 $(eval $(call gb_Library_use_external,nullcanvas,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,nullcanvas))

canvas/Library_simplecanvas.mk

@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,simplecanvas))
 
 $(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas))
 
-$(eval $(call gb_Library_set_include,simplecanvas,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-))
-
 $(eval $(call gb_Library_use_external,simplecanvas,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,simplecanvas))

canvas/Library_vclcanvas.mk

@@ -30,11 +30,6 @@ $(eval $(call gb_Library_Library,vclcanvas))
 
 $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
 
-$(eval $(call gb_Library_set_include,vclcanvas,\
-	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-))
-
 $(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,vclcanvas))

comphelper/Library_comphelper.mk

@@ -27,7 +27,6 @@ $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
 
 $(eval $(call gb_Library_set_include,comphelper,\
     -I$(SRCDIR)/comphelper/source/inc \
-    -I$(SRCDIR)/comphelper/inc \
     $$(INCLUDE) \
 ))
 

cppcanvas/Library_cppcanvas.mk

@@ -20,7 +20,6 @@
 $(eval $(call gb_Library_Library,cppcanvas))
 
 $(eval $(call gb_Library_set_include,cppcanvas,\
-	-I$(SRCDIR)/cppcanvas/inc \
 	-I$(SRCDIR)/cppcanvas/source/inc \
 	$$(INCLUDE) \
 ))

drawinglayer/Library_drawinglayer.mk

@@ -9,11 +9,6 @@
 
 $(eval $(call gb_Library_Library,drawinglayer))
 
-$(eval $(call gb_Library_set_include,drawinglayer,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/drawinglayer/inc \
-))
-
 $(eval $(call gb_Library_add_defs,drawinglayer,\
     -DDRAWINGLAYER_DLLIMPLEMENTATION \
 ))

i18nlangtag/Library_i18nlangtag.mk

@@ -28,11 +28,6 @@
 
 $(eval $(call gb_Library_Library,i18nlangtag))
 
-$(eval $(call gb_Library_set_include,i18nlangtag,\
-	-I$(SRCDIR)/i18nlangtag/inc \
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,i18nlangtag))
 
 $(eval $(call gb_Library_add_defs,i18nlangtag,\

svl/Library_svl.mk

@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 
 $(eval $(call gb_Library_set_include,svl,\
     -I$(SRCDIR)/svl/source/inc \
-    -I$(SRCDIR)/svl/inc \
     $$(INCLUDE) \
 ))
 

toolkit/Library_tk.mk

@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_external,tk,boost_headers))
 
 $(eval $(call gb_Library_set_include,tk,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/toolkit/inc \
     -I$(SRCDIR)/toolkit/source \
 ))
 

unotools/Library_utl.mk

@@ -16,12 +16,6 @@ $(eval $(call gb_Library_use_external,utl,boost_headers))
 # in case UNO services are exported: declare location of component file
 $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,utl,\
-    -I$(SRCDIR)/unotools/inc \
-    $$(INCLUDE) \
-))
-
 # add any additional definitions to be set for compilation here
 # (e.g. -DLIB_DLLIMPLEMENTATION)
 $(eval $(call gb_Library_add_defs,utl,\