[Libreoffice-commits] .: testtools/com testtools/source

Tor Lillqvist tml at kemper.freedesktop.org
Sun Jun 12 03:01:29 PDT 2011


 testtools/com/sun/star/comp/bridge/makefile.mk |    5 +++++
 testtools/source/bridgetest/idl/makefile.mk    |    8 ++++++++
 testtools/source/bridgetest/makefile.mk        |    7 +++++++
 testtools/source/bridgetest/pyuno/makefile.mk  |    6 ++++++
 testtools/source/cliversioning/makefile.mk     |    6 ++++++
 5 files changed, 32 insertions(+)

New commits:
commit f0c047b25a26339ddcde1287328d9ad0cde69011
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 12 13:01:12 2011 +0300

    Don't do anything when cross-compiling for now

diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 7083f23..0a6b9a8 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -34,6 +34,11 @@ TARGET=com_sun_star_comp_bridge
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # ------------------------------------------------------------------
 
 .IF "$(SOLAR_JAVA)" != ""
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
index b056aec..dce276e 100644
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ b/testtools/source/bridgetest/idl/makefile.mk
@@ -30,8 +30,16 @@ PRJNAME := testtools
 TARGET := bridgetest_idl
 
 .INCLUDE: settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .INCLUDE: target.mk
+
 .IF "$(L10N_framework)"==""
+
 ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done
 
 $(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 8ce4116..3932d04 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -34,7 +34,14 @@ ENABLE_EXCEPTIONS=TRUE
 LIBTARGET=NO
 
 .INCLUDE: settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .IF "$(L10N_framework)"==""
+
 DLLPRE = # no leading "lib" on .so files
 
 .IF "$(GUI)"=="WNT"
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index b5d90cb..b7a7294 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -38,6 +38,12 @@ my_components = pythonloader
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 .IF "$(DISABLE_PYTHON)" != "TRUE"
 .IF "$(L10N_framework)"==""
diff --git a/testtools/source/cliversioning/makefile.mk b/testtools/source/cliversioning/makefile.mk
index bb9cd3d..803fda8 100644
--- a/testtools/source/cliversioning/makefile.mk
+++ b/testtools/source/cliversioning/makefile.mk
@@ -33,6 +33,12 @@ TARGET := test_climaker
 PACKAGE = cliversion
 
 .INCLUDE: settings.mk
+
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
 .IF "$(debug)" != ""


More information about the Libreoffice-commits mailing list