[Libreoffice-commits] .: idlc/source xml2cmp/source xml2cmp/util

[Tor Lillqvist]

 idlc/source/makefile.mk            |    6 +++++-
 idlc/source/preproc/makefile.mk    |    6 +++++-
 xml2cmp/source/finder/makefile.mk  |    6 +++++-
 xml2cmp/source/support/makefile.mk |    6 +++++-
 xml2cmp/source/xcd/makefile.mk     |    6 +++++-
 xml2cmp/util/makefile.mk           |    6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit 7d47e8b09eaf3e9acde76ae56eae1ed40771feb4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jun 4 13:49:47 2011 +0300

    Rehash cross-compilation ideas
    
    Drop the TARGETPLATFORM=BUILD indication of stuff that is to be built
    for the build platform. I will handle the split of stuff built for the
    build or host platforms differently.
    
    Add explicit rules to do nothing for the cross-compilation case, but
    likely even that will be unnecessary in the case of complete modules
    like xml2cmp. I will just mark modules that are for the build platform
    only with an own flag in BUILD_TYPE.

diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
index 9cdc546..7b85efd 100644
--- a/idlc/source/makefile.mk
+++ b/idlc/source/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..
 PRJNAME=idlc
 TARGET=idlc
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 LIBTARGET=NO
 
 ENABLE_EXCEPTIONS=TRUE
@@ -39,6 +38,11 @@ INCPRE=$(MISC)
 # --- Settings -----------------------------------------------------
 
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk
index 8b0c723..6afe98f 100644
--- a/idlc/source/preproc/makefile.mk
+++ b/idlc/source/preproc/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..$/..
 PRJNAME=idlc
 TARGET=idlcpp
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 
 # --- Settings -----------------------------------------------------
 
@@ -39,6 +38,11 @@ LIBSALCPPRT=$(0)
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 OBJFILES=   \
diff --git a/xml2cmp/source/finder/makefile.mk b/xml2cmp/source/finder/makefile.mk
index 928e2a8..fee7e41 100644
--- a/xml2cmp/source/finder/makefile.mk
+++ b/xml2cmp/source/finder/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..$/..
 PRJNAME=xml2cmp
 TARGET=srvdepy
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 
 # --- Settings -----------------------------------------------------
 
@@ -38,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
diff --git a/xml2cmp/source/support/makefile.mk b/xml2cmp/source/support/makefile.mk
index 4259353..4c24317 100644
--- a/xml2cmp/source/support/makefile.mk
+++ b/xml2cmp/source/support/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..$/..
 PRJNAME=xml2cmp
 TARGET=x2c_support
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 
 # --- Settings -----------------------------------------------------
 
@@ -38,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
diff --git a/xml2cmp/source/xcd/makefile.mk b/xml2cmp/source/xcd/makefile.mk
index ca3f7b4..096d5c7 100644
--- a/xml2cmp/source/xcd/makefile.mk
+++ b/xml2cmp/source/xcd/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..$/..
 PRJNAME=xml2cmp
 TARGET=x2c_xcd
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 
 LIBTARGET=NO
 
@@ -40,6 +39,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 LIBONLYFILES=\
diff --git a/xml2cmp/util/makefile.mk b/xml2cmp/util/makefile.mk
index 082cf13..b50d318 100644
--- a/xml2cmp/util/makefile.mk
+++ b/xml2cmp/util/makefile.mk
@@ -30,13 +30,17 @@ PRJ=..
 PRJNAME=xml2cmp
 TARGET=xml2cmp
 TARGETTYPE=CUI
-TARGETPLATFORM=BUILD
 
 # --- Settings -----------------------------------------------------
 ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 # --- Targets ------------------------------------------------------