[Libreoffice-commits] .: l10ntools/layout l10ntools/source

Tor Lillqvist tml at kemper.freedesktop.org
Wed Jun 15 09:27:16 PDT 2011


 l10ntools/layout/makefile.mk              |    5 +++++
 l10ntools/source/filter/merge/makefile.mk |    5 +++++
 l10ntools/source/filter/utils/makefile.mk |    5 +++++
 l10ntools/source/help/makefile.mk         |    6 ++++++
 l10ntools/source/makefile.mk              |    5 +++++
 5 files changed, 26 insertions(+)

New commits:
commit cb7948c88ab3e2c8702bef0794455c07ccd88295
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 15 19:26:53 2011 +0300

    Don't do anything here when cross-compiling

diff --git a/l10ntools/layout/makefile.mk b/l10ntools/layout/makefile.mk
index dee3c6e..c977cba 100644
--- a/l10ntools/layout/makefile.mk
+++ b/l10ntools/layout/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)" == "YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .IF "$(SYSTEM_EXPAT)" == "YES"
 CFLAGS+=-DSYSTEM_EXPAT
 .ENDIF
diff --git a/l10ntools/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk
index 8ef73de..cc9efd9 100644
--- a/l10ntools/source/filter/merge/makefile.mk
+++ b/l10ntools/source/filter/merge/makefile.mk
@@ -34,6 +34,11 @@ PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)" == "YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 #----- compile .java files -----------------------------------------
 
 OWNCOPY         =   \
diff --git a/l10ntools/source/filter/utils/makefile.mk b/l10ntools/source/filter/utils/makefile.mk
index 43a28d5..ca92f4b 100644
--- a/l10ntools/source/filter/utils/makefile.mk
+++ b/l10ntools/source/filter/utils/makefile.mk
@@ -34,6 +34,11 @@ PACKAGE = com$/sun$/star$/filter$/config$/tools$/utils
 
 .INCLUDE: settings.mk
 
+.IF "$(CROSS_COMPILING)" == "YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 #----- compile .java files -----------------------------------------
 
 
diff --git a/l10ntools/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index 3fd6879..d79194e 100644
--- a/l10ntools/source/help/makefile.mk
+++ b/l10ntools/source/help/makefile.mk
@@ -35,6 +35,12 @@ TARGETTYPE=CUI
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
+
+.IF "$(CROSS_COMPILING)" == "YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .INCLUDE : helplinker.pmk
  
 .IF "$(SYSTEM_LIBXSLT)" == "YES"
diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk
index 86bcea3..b581c46 100644
--- a/l10ntools/source/makefile.mk
+++ b/l10ntools/source/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)" == "YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 CDEFS+= -DYY_NEVER_INTERACTIVE=1
 
 .IF "$(SYSTEM_EXPAT)" == "YES"


More information about the Libreoffice-commits mailing list