[Libreoffice-commits] .: cppuhelper/qa
Tor Lillqvist
tml at kemper.freedesktop.org
Sun Jun 5 14:34:27 PDT 2011
cppuhelper/qa/ifcontainer/makefile.mk | 5 +++++
cppuhelper/qa/propertysetmixin/makefile.mk | 5 +++++
cppuhelper/qa/unourl/makefile.mk | 5 +++++
cppuhelper/qa/weak/makefile.mk | 5 +++++
4 files changed, 20 insertions(+)
New commits:
commit 10f52859441b49d648de668ed38c133b6029b2dd
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 00:33:04 2011 +0300
Bypass qa thingies for now when cross-compiling
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index 6f3476a..5284f4b 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/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)
# BEGIN ----------------------------------------------------------------
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 04aa247..be4cfc3 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -41,6 +41,11 @@ my_components = $(TARGET).cpp $(TARGET).java
.INCLUDE: settings.mk
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+ @echo Nothing done when cross-compiling
+.ENDIF
+
.IF "$(OS)" == "WNT"
my_file = file:///
.ELSE
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index 4e46dd0..f48b724 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/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)
# BEGIN ----------------------------------------------------------------
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 5116886..7895504 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -33,6 +33,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
More information about the Libreoffice-commits
mailing list