[Libreoffice-commits] .: 2 commits - i18npool/qa i18npool/source

[Tor Lillqvist]

 i18npool/qa/cppunit/makefile.mk                 |    5 +++++
 i18npool/source/breakiterator/data/makefile.mk  |    2 +-
 i18npool/source/collator/data/makefile.mk       |    2 +-
 i18npool/source/indexentry/data/makefile.mk     |    2 +-
 i18npool/source/localedata/data/makefile.mk     |    4 ++--
 i18npool/source/textconversion/data/makefile.mk |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 2e1d9105ac04444b8b1a049895d6228065e1928e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 8 00:24:44 2011 +0300

    Run tool executables built for the BUILD platform

diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk
index cb37c51..4dd2c1a 100644
--- a/i18npool/source/breakiterator/data/makefile.mk
+++ b/i18npool/source/breakiterator/data/makefile.mk
@@ -77,7 +77,7 @@ DEPOBJFILES= \
 .INCLUDE :  target.mk
 
 $(MISC)$/dict_%.cxx : %.dic
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/gendict $< $@
+    $(AUGMENT_LIBRARY_PATH) $(OUT_FOR_BUILD)$/bin$/gendict $< $@
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gendict$(EXECPOST)
diff --git a/i18npool/source/collator/data/makefile.mk b/i18npool/source/collator/data/makefile.mk
index 2dd7623..59eb1a5 100644
--- a/i18npool/source/collator/data/makefile.mk
+++ b/i18npool/source/collator/data/makefile.mk
@@ -57,7 +57,7 @@ SHL1OBJS=$(SLOFILES)
 .INCLUDE :  target.mk
 
 $(MISC)$/collator_%.cxx : %.txt
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/gencoll_rule $< $@ $*
+    $(AUGMENT_LIBRARY_PATH) $(OUT_FOR_BUILD)$/bin$/gencoll_rule $< $@ $*
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/gencoll_rule$(EXECPOST)
diff --git a/i18npool/source/indexentry/data/makefile.mk b/i18npool/source/indexentry/data/makefile.mk
index 8f698e3..42378da 100644
--- a/i18npool/source/indexentry/data/makefile.mk
+++ b/i18npool/source/indexentry/data/makefile.mk
@@ -60,7 +60,7 @@ LIB1OBJFILES=$(SHL1OBJS)
 .INCLUDE :  target.mk
 
 $(MISC)$/%.cxx : %.txt
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/genindex_data $< $@ $*
+    $(AUGMENT_LIBRARY_PATH) $(OUT_FOR_BUILD)$/bin$/genindex_data $< $@ $*
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.txt") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genindex_data$(EXECPOST)
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index df038d4..c857518 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -326,10 +326,10 @@ MY_MISC_CXXFILES := $(foreach,i,$(DEPOBJFILES) $(MISC)/$(i:b).cxx)
 
 .INCLUDE :  target.mk
 
-$(MY_MISC_CXXFILES) : $(BIN)$/saxparser$(EXECPOST) $(MISC)/saxparser.rdb
+$(MY_MISC_CXXFILES) : $(OUT_FOR_BUILD)$/bin$/saxparser$(EXECPOST) $(MISC)/saxparser.rdb
 
 $(MISC)$/localedata_%.cxx : %.xml
-    $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/saxparser $* $< $@ \
+    $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(OUT_FOR_BUILD)$/bin$/saxparser $* $< $@ \
         $(my_file)$(PWD)/$(MISC)/saxparser.rdb $(SOLARBINDIR)$/types.rdb \
         -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(SOLARSHAREDBIN)
     $(RM) $(BIN)$/$(@:b).rdb
diff --git a/i18npool/source/textconversion/data/makefile.mk b/i18npool/source/textconversion/data/makefile.mk
index a93a404..967b4f9 100644
--- a/i18npool/source/textconversion/data/makefile.mk
+++ b/i18npool/source/textconversion/data/makefile.mk
@@ -61,7 +61,7 @@ LIB1OBJFILES=$(SHL1OBJS)
 
 APP1TARGET = genconv_dict
 $(MISC)$/%.cxx : %.dic
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/genconv_dict $* $< $@
+    $(AUGMENT_LIBRARY_PATH) $(OUT_FOR_BUILD)$/bin$/genconv_dict $* $< $@
 
 # ugly - is this dependency really required here?
 $(foreach,i,$(shell @$(FIND) . -name "*.dic") $(MISC)$/dict_$(i:b).cxx) : $(BIN)$/genconv_dict$(EXECPOST)
commit de984e37c066dd52d9130965b5de43a912d300f6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 8 00:24:12 2011 +0300

    This is a native shop, nothing for you here

diff --git a/i18npool/qa/cppunit/makefile.mk b/i18npool/qa/cppunit/makefile.mk
index 75f4a91..b21d0e9 100644
--- a/i18npool/qa/cppunit/makefile.mk
+++ b/i18npool/qa/cppunit/makefile.mk
@@ -37,6 +37,11 @@ my_components = qa_i18npool
 
 .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