[Libreoffice-commits] .: 4 commits - basebmp/test basegfx/test o3tl/qa sax/qa
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Jun 6 14:57:20 PDT 2011
basebmp/test/makefile.mk | 5 +++++
basegfx/test/makefile.mk | 5 +++++
o3tl/qa/makefile.mk | 7 ++++---
sax/qa/cppunit/makefile.mk | 5 +++++
4 files changed, 19 insertions(+), 3 deletions(-)
New commits:
commit cde97c2cc112a98fb3a5e3551d3a9c08fd33c4ff
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:46:11 2011 +0300
No testing, sorry, when cross-compiling
diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk
index e06eca2..229a038 100644
--- a/sax/qa/cppunit/makefile.mk
+++ b/sax/qa/cppunit/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
CFLAGSCXX += $(CPPUNIT_CFLAGS)
DLLPRE = # no leading "lib" on .so files
commit a8e0fff14a726f021282faeff1071d97107b32ee
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:45:56 2011 +0300
No testing, sorry, when cross-compiling
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 2c0f30c..cd29bc7 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -36,6 +36,11 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# --- Common ----------------------------------------------------------
commit d37a42636538a01f410f42f98d1ec45d5ce38107
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:45:42 2011 +0300
No testing, sorry, when cross-compiling
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index cdb4cce..6941ed9 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
.IF "$(debug)"!="" || "$(DEBUG)"!=""
.IF "$(COM)"=="MSC"
commit 225df51174baf2dc157da04e143f5a308e60d3b6
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 11:32:30 2011 +0300
Bypass when cross-compiling in general, not just for iOS
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 67dcede..14dbe62 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -36,7 +36,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(OS)"!="IOS"
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
CFLAGSCXX += $(CPPUNIT_CFLAGS)
@@ -70,8 +73,6 @@ SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
.ENDIF # L10N_framework
-.ENDIF
-
.INCLUDE : target.mk
# --- Enable test execution in normal build ------------------------
More information about the Libreoffice-commits
mailing list