[Libreoffice-commits] core.git: basebmp/StaticLibrary_basebmp.mk basegfx/Library_basegfx.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk comphelper/Library_comphelper.mk cppcanvas/Library_cppcanvas.mk drawinglayer/Library_drawinglayer.mk i18nlangtag/Library_i18nlangtag.mk svl/Library_svl.mk toolkit/Library_tk.mk unotools/Library_utl.mk

Tor Lillqvist tml at iki.fi
Wed Apr 24 01:01:29 PDT 2013 

 basebmp/StaticLibrary_basebmp.mk     |    5 -----
 basegfx/Library_basegfx.mk           |    1 -
 canvas/Library_canvasfactory.mk      |    5 -----
 canvas/Library_canvastools.mk        |    5 -----
 canvas/Library_nullcanvas.mk         |    5 -----
 canvas/Library_simplecanvas.mk       |    5 -----
 canvas/Library_vclcanvas.mk          |    5 -----
 comphelper/Library_comphelper.mk     |    1 -
 cppcanvas/Library_cppcanvas.mk       |    1 -
 drawinglayer/Library_drawinglayer.mk |    5 -----
 i18nlangtag/Library_i18nlangtag.mk   |    5 -----
 svl/Library_svl.mk                   |    1 -
 toolkit/Library_tk.mk                |    1 -
 unotools/Library_utl.mk              |    6 ------
 14 files changed, 51 deletions(-)

New commits:
commit e4e9fba5f471141b14cff6d27586d37e28fc38c0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Apr 24 10:52:20 2013 +0300

    Don't point to inc directories that don't exist any longer
    
    Change-Id: Ia160f0ee3e9480c60056d38bf11a6b139b53424f

diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk
index 721bee0..c80427f 100644
--- a/basebmp/StaticLibrary_basebmp.mk
+++ b/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 \
 ))
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 532cc74..892d0a9 100644
--- a/basegfx/Library_basegfx.mk
+++ b/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) \
 ))
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 2fde4a1..e10fa92 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/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))
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 9e1309a..7dccf3a 100644
--- a/canvas/Library_canvastools.mk
+++ b/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,\
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 5b8c305..863696f 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/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))
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index c5f5b75..223a215 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/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))
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index a31bf1b..e7e4b36 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/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))
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index aa3ff00..1402f3c 100644
--- a/comphelper/Library_comphelper.mk
+++ b/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) \
 ))
 
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index dc4e6b3..7f69cf9 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/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) \
 ))
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 0690231..96e61de 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/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 \
 ))
diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk
index 5d357d3..3faacc4 100644
--- a/i18nlangtag/Library_i18nlangtag.mk
+++ b/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,\
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 5717dba..eb89abf 100644
--- a/svl/Library_svl.mk
+++ b/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) \
 ))
 
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index f06c11d..eebc47d 100644
--- a/toolkit/Library_tk.mk
+++ b/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 \
 ))
 
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index f840fa2..e364811 100644
--- a/unotools/Library_utl.mk
+++ b/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,\

More information about the Libreoffice-commits mailing list