[Libreoffice-commits] .: icu/makefile.mk

[Fridrich Strba]

 icu/makefile.mk |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ecffbc34ab2d24f81815c61ec6932689dce97afa
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 17 15:30:26 2011 +0100

    Don't build things we don't use and that are broken

diff --git a/icu/makefile.mk b/icu/makefile.mk
index cad69ca..a7c41a9 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -106,7 +106,9 @@ LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-
 
 CONFIGURE_DIR=source
 
-CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
+./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \
+--disable-extras $(DISABLE_64BIT)'
 
 CONFIGURE_FLAGS=
 
@@ -159,7 +161,12 @@ icu_LIBS=-lmingwthrd
 icu_LIBS+=-lstdc++_s
 .ENDIF
 icu_LDFLAGS+=-Wl,--enable-runtime-pseudo-reloc-v2
-CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" ./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
+./configure --enable-layout --enable-static --enable-shared=yes --disable-icuio --disable-samples --disable-tests \
+--disable-extras $(DISABLE_64BIT)'
+CONFIGURE_ACTION+=sh -c 'CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" LDFLAGS="$(icu_LDFLAGS)" LIBS="$(icu_LIBS)" \
+./configure --build=i586-pc-mingw32 --enable-layout --enable-static --enable-shared=yes --disable-icuio \
+--disable-samples --disable-tests --disable-extras --enable-64bit-libs=no'
 
 CONFIGURE_FLAGS=