summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-10 09:32:13 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-10 09:35:02 +0300
commit0abcc8b6e3721e6bc50651bb961cafc72d824bb6 (patch)
treef4565667f71edd101176f0d1e7108876a2a568ba
parentdd1e686fed8dddf641266637c51b48754c75d280 (diff)
Don't pointlessly build the i18npool build-time tools when cross-compiling
-rw-r--r--i18npool/source/breakiterator/makefile.mk4
-rw-r--r--i18npool/source/collator/makefile.mk4
-rw-r--r--i18npool/source/indexentry/makefile.mk5
-rw-r--r--i18npool/source/localedata/makefile.mk4
-rw-r--r--i18npool/source/textconversion/makefile.mk4
5 files changed, 20 insertions, 1 deletions
diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index 434fdc9f5d88..961d7aa1ac6e 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/makefile.mk
@@ -57,6 +57,8 @@ SLOFILES= \
$(SLO)/xdictionary.obj \
$(subst,$(MISC)/,$(SLO)/ $(MY_MISC_CXXFILES:s/.c/.obj/))
+.IF "$(CROSS_COMPILING)" != "YES"
+
OBJFILES = $(OBJ)/gendict.obj
APP1TARGET = gendict
@@ -67,6 +69,8 @@ APP1OBJS = $(DEPOBJFILES)
APP1STDLIBS = $(SALLIB)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.IF "$(SYSTEM_ICU)" == "YES"
diff --git a/i18npool/source/collator/makefile.mk b/i18npool/source/collator/makefile.mk
index 654b857b7d25..b9be239a00e4 100644
--- a/i18npool/source/collator/makefile.mk
+++ b/i18npool/source/collator/makefile.mk
@@ -49,6 +49,8 @@ SLOFILES= \
$(SLO)$/chaptercollator.obj \
$(rules_obj)
+.IF "$(CROSS_COMPILING)" != "YES"
+
APP1TARGET = gencoll_rule
APP1RPATH = NONE
@@ -61,6 +63,8 @@ APP1STDLIBS = $(SALLIB) \
$(ICUUCLIB) \
$(ICUDATALIB)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/i18npool/source/indexentry/makefile.mk b/i18npool/source/indexentry/makefile.mk
index 6b4ea3ed5ff2..79e3eaf95c4e 100644
--- a/i18npool/source/indexentry/makefile.mk
+++ b/i18npool/source/indexentry/makefile.mk
@@ -37,7 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-
# --- Files --------------------------------------------------------
SLOFILES= \
@@ -47,6 +46,8 @@ SLOFILES= \
$(SLO)$/indexentrysupplier_default.obj \
$(SLO)$/indexentrysupplier_common.obj
+.IF "$(CROSS_COMPILING)" != "YES"
+
OBJFILES = $(OBJ)$/genindex_data.obj
APP1TARGET = genindex_data
@@ -60,6 +61,8 @@ APP1STDLIBS = $(SALLIB) \
$(ICUUCLIB) \
$(ICUDATALIB)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/i18npool/source/localedata/makefile.mk b/i18npool/source/localedata/makefile.mk
index 9a671e8bcd6b..798b401d21f7 100644
--- a/i18npool/source/localedata/makefile.mk
+++ b/i18npool/source/localedata/makefile.mk
@@ -58,6 +58,8 @@ CDEFS+=-D__STD_LIMITS
SLOFILES= $(SLO)$/localedata.obj
+.IF "$(CROSS_COMPILING)" != "YES"
+
OBJFILES = \
$(OBJ)$/saxparser.obj \
$(OBJ)$/LocaleNode.obj \
@@ -78,6 +80,8 @@ DEPOBJFILES = \
$(OBJ)$/LocaleNode.obj \
$(OBJ)$/filewriter.obj
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/i18npool/source/textconversion/makefile.mk b/i18npool/source/textconversion/makefile.mk
index 2b91d964b2ad..dca748309ca7 100644
--- a/i18npool/source/textconversion/makefile.mk
+++ b/i18npool/source/textconversion/makefile.mk
@@ -44,6 +44,8 @@ SLOFILES= \
$(SLO)$/textconversion_ko.obj \
$(SLO)$/textconversion_zh.obj
+.IF "$(CROSS_COMPILING)" != "YES"
+
OBJFILES = $(OBJ)$/genconv_dict.obj
APP1TARGET = genconv_dict
@@ -53,6 +55,8 @@ APP1OBJS = $(OBJ)$/genconv_dict.obj
APP1STDLIBS = $(SALLIB)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk