[Libreoffice-commits] .: 3 commits - svx/AllLangResTarget_gal.mk svx/AllLangResTarget_svx.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk

[Jan Holesovsky]

 svx/AllLangResTarget_gal.mk       |    4 ++--
 svx/AllLangResTarget_svx.mk       |    6 +++---
 svx/Library_svx.mk                |    6 +++---
 svx/Library_svxcore.mk            |   10 +++++-----
 svx/Library_textconversiondlgs.mk |    4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 3febb0385d10b0ea4ecb967a75c223bc95a3d0f2
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Mar 18 13:14:39 2011 +0100

    Fix typo in gallery makefile
    
    realpath exposes typo in path name - needs to be gallery2

diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index 3b00b8e..986a110 100755
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
 $(eval $(call gb_SrsTarget_set_include,svx/gal,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(realpath $(SRCDIR)/svx/source/gallery) \
+    -I$(realpath $(SRCDIR)/svx/source/gallery2) \
     -I$(realpath $(SRCDIR)/svx/inc/) \
 ))
 
commit 447c1623ed2a18c7c352857968fbafac0598e089
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Mar 18 11:55:31 2011 +0200

    Sprinkle some realpath goodness here, too

diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index eb0b5b1..3b00b8e 100755
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -36,8 +36,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal))
 $(eval $(call gb_SrsTarget_set_include,svx/gal,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(SRCDIR)/svx/source/gallery \
-    -I$(SRCDIR)/svx/inc/ \
+    -I$(realpath $(SRCDIR)/svx/source/gallery) \
+    -I$(realpath $(SRCDIR)/svx/inc/) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/gal,\
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index a18852a..3ae2664 100755
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -40,9 +40,9 @@ $(eval $(call gb_SrsTarget_set_include,svx/res,\
     -I$(OUTDIR)/inc \
     -I$(WORKDIR)/inc \
     -I$(WORKDIR)/inc/svx \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/source/dialog \
-    -I$(SRCDIR)/svx/inc/ \
+    -I$(realpath $(SRCDIR)/svx/source/inc) \
+    -I$(realpath $(SRCDIR)/svx/source/dialog) \
+    -I$(realpath $(SRCDIR)/svx/inc/) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,svx/res,\
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a2346cf..99d51dd 100755
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,svx))
 $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
 
 $(eval $(call gb_Library_set_include,svx,\
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/source/inc \
-    -I$(SRCDIR)/svx/inc/pch \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/source/inc) \
+    -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(SOLARINC) \
     -I$(OUTDIR)/inc/offuh \
 ))
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 03a457b..513789f 100755
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -30,8 +30,8 @@ $(eval $(call gb_Library_Library,textconversiondlgs))
 $(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
 
 $(eval $(call gb_Library_set_include,textconversiondlgs,\
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/inc/pch \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/inc/pch) \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
 ))
commit 9e7b1de6d12558743de1d5c70756a1bdd2e345b1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Mar 18 11:31:50 2011 +0200

    Sprinkle some realpath goodness here, too

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 7cd1a52..105eca6 100755
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -37,9 +37,9 @@ $(eval $(call gb_Library_add_package_headers,svxcore,\
 ))
 
 $(eval $(call gb_Library_set_include,svxcore,\
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/inc/pch \
-    -I$(SRCDIR)/svx/source/inc \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/inc/pch) \
+    -I$(realpath $(SRCDIR)/svx/source/inc) \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc/offuh \
     -I$(WORKDIR)/SdiTarget/svx/sdi \
@@ -446,8 +446,8 @@ $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
 
 $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
     $$(INCLUDE) \
-    -I$(SRCDIR)/svx/inc \
-    -I$(SRCDIR)/svx/sdi \
+    -I$(realpath $(SRCDIR)/svx/inc) \
+    -I$(realpath $(SRCDIR)/svx/sdi) \
 ))
 
 # vim: set noet sw=4 ts=4: