[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - dbaccess/Library_dbui.mk solenv/gbuild svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svx/Library_svx.mk xmloff/Library_xo.mk

[Eike Rathke]

 dbaccess/Library_dbui.mk               |    2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |    2 +-
 svl/Library_fsstorage.mk               |    2 +-
 svl/Library_passwordcontainer.mk       |    2 +-
 svl/Library_svl.mk                     |    2 +-
 svx/Library_svx.mk                     |    2 +-
 xmloff/Library_xo.mk                   |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f1d713a1a768c77bfa287e7c6a3ac0fa7053c882
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 22:43:35 2012 +0100

    use INCLUDE instead of SOLARINC, and after local includes

diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index a5e021b..f17a8b7 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbui,\
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
 	-I$(SRCDIR)/dbaccess/source/ui/dlg \
 	-I$(SRCDIR)/dbaccess/source/inc \
-	$$(SOLARINC) \
+	$$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,dbui,\
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 29b4653..2247c9a 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,fsstorage))
 $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
-    $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(OUTDIR)/inc \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,fsstorage,\
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index d1a740c..6b577b6 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,passwordcontainer))
 $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
 
 $(eval $(call gb_Library_set_include,passwordcontainer,\
-    $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
     -I$(WORKDIR)/inc/ \
     -I$(realpath $(SRCDIR)/svl/inc) \
     -I$(realpath $(SRCDIR)/svl/inc/svl) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
     -I$(OUTDIR)/inc \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,passwordcontainer,\
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 216a80d..337e4ed 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc))
 $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 
 $(eval $(call gb_Library_set_include,svl,\
-    $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/svl/source/inc) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svl,\
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 9165c9e..0e338b3 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
 $(eval $(call gb_Library_set_include,svx,\
     -I$(realpath $(SRCDIR)/svx/inc) \
     -I$(realpath $(SRCDIR)/svx/source/inc) \
-    $$(SOLARINC) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_api,svx,\
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 11173d9..558b5f3 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
 $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
 
 $(eval $(call gb_Library_set_include,xo,\
-    $$(SOLARINC) \
     -I$(realpath $(SRCDIR)/xmloff/inc) \
+    $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,xo,\
commit f212a2a7c4380a107785a3fba7b48bf38937842e
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 13 22:43:34 2012 +0100

    ensure that /usr/include is _appended_ to INCLUDE
    
    At least with gcc 4.6.2 the situation was that if /usr/include was missing
    from the -I... includes, header files were pulled from /usr/include/
    instead of solver/$INPATH/inc/external/
    
    This clearly makes a difference for not --with-system-... libs where the
    internal version is to be used.

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 33aa936..7dddcbb 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -129,7 +129,7 @@ gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
 gb_COMPILERNOOPTFLAGS := -O0
 
-gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -I$(SYSBASE)/usr/include
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))