[Libreoffice-commits] .: 2 commits - starmath/AllLangResTarget_sm.mk starmath/JunitTest_starmath_unoapi.mk starmath/Library_smd.mk starmath/Library_sm.mk starmath/Package_uiconfig.mk

[Fridrich Strba]

 starmath/AllLangResTarget_sm.mk       |    2 +-
 starmath/JunitTest_starmath_unoapi.mk |    6 +++---
 starmath/Library_sm.mk                |    8 ++++----
 starmath/Library_smd.mk               |    4 ++--
 starmath/Package_uiconfig.mk          |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6995090df649bdc04febfa8147a2723bfa3d8856
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 30 16:24:45 2011 +0200

    Avoiding to be too keen in realpathing

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index ec2107f..1fc0a76 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_Library,sm))
 
 $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots))
 
-$(eval $(call gb_Library_add_precompiled_header,sm,$(realpath $(SRCDIR)/starmath/inc/pch/precompiled_starmath)))
+$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
 
 $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm))
 
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index a7a27b1..538f921 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -21,7 +21,7 @@
 
 $(eval $(call gb_Library_Library,smd))
 
-$(eval $(call gb_Library_add_precompiled_header,smd,$(realpath $(SRCDIR)/starmath/inc/pch/precompiled_starmath)))
+$(eval $(call gb_Library_add_precompiled_header,smd,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
 
 $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
 
commit efec83afee62d3e8d6d2e79e9ba6557ff922f19e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 30 16:19:25 2011 +0200

    realpathing starmath module

diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index 75f8b1d..5f606d9 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_SrsTarget_set_include,starmath/res,\
 	$$(INCLUDE) \
 	-I$(OUTDIR)/inc \
 	-I$(WORKDIR)/inc/starmath \
-	-I$(SRCDIR)/starmath/inc \
+	-I$(realpath $(SRCDIR)/starmath/inc) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,starmath/res,\
diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk
index 8d26a56..27a18d9 100644
--- a/starmath/JunitTest_starmath_unoapi.mk
+++ b/starmath/JunitTest_starmath_unoapi.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_JunitTest_JunitTest,starmath_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\
     $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \
+    -Dorg.openoffice.test.arg.sce=$(realpath $(SRCDIR)/starmath/qa/unoapi/sm.sce) \
+    -Dorg.openoffice.test.arg.xcl=$(realpath $(SRCDIR)/starmath/qa/unoapi/knownissues.xcl) \
+    -Dorg.openoffice.test.arg.tdoc=$(realpath $(SRCDIR)/starmath/qa/unoapi/testdocuments) \
 ))
 
 $(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 92571a4..ec2107f 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -23,13 +23,13 @@ $(eval $(call gb_Library_Library,sm))
 
 $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots))
 
-$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
+$(eval $(call gb_Library_add_precompiled_header,sm,$(realpath $(SRCDIR)/starmath/inc/pch/precompiled_starmath)))
 
 $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm))
 
 $(eval $(call gb_Library_set_include,sm,\
-        -I$(SRCDIR)/starmath/inc/pch \
-        -I$(SRCDIR)/starmath/inc \
+        -I$(realpath $(SRCDIR)/starmath/inc/pch) \
+        -I$(realpath $(SRCDIR)/starmath/inc) \
         -I$(WORKDIR)/SdiTarget/starmath/sdi \
         -I$(WORKDIR)/Misc/starmath/ \
         $$(INCLUDE) \
@@ -100,8 +100,8 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
 $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath))
 
 $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\
-        -I$(SRCDIR)/starmath/inc \
-        -I$(SRCDIR)/starmath/sdi \
+        -I$(realpath $(SRCDIR)/starmath/inc) \
+        -I$(realpath $(SRCDIR)/starmath/sdi) \
         $$(INCLUDE) \
         -I$(OUTDIR)/inc \
 ))
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 2a0016e..a7a27b1 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -21,13 +21,13 @@
 
 $(eval $(call gb_Library_Library,smd))
 
-$(eval $(call gb_Library_add_precompiled_header,smd,$(SRCDIR)/starmath/inc/pch/precompiled_starmath))
+$(eval $(call gb_Library_add_precompiled_header,smd,$(realpath $(SRCDIR)/starmath/inc/pch/precompiled_starmath)))
 
 $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
 
 $(eval $(call gb_Library_set_include,smd,\
-        -I$(SRCDIR)/starmath/inc/pch \
-        -I$(SRCDIR)/starmath/inc \
+        -I$(realpath $(SRCDIR)/starmath/inc/pch) \
+        -I$(realpath $(SRCDIR)/starmath/inc) \
         -I$(WORKDIR)/Misc/sm/ \
         $$(INCLUDE) \
         -I$(OUTDIR)/inc/offuh \
diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk
index e312bf4..d83485c 100644
--- a/starmath/Package_uiconfig.mk
+++ b/starmath/Package_uiconfig.mk
@@ -19,7 +19,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,sm_uiconfig,$(SRCDIR)/starmath/uiconfig))
+$(eval $(call gb_Package_Package,sm_uiconfig,$(realpath $(SRCDIR)/starmath/uiconfig)))
 $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml))
 $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml))
 $(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml))