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

[Christian Lohmaier]

 gettext/makefile.mk |   69 ++++++++++++++++++++++++++--------------------------
 icu/makefile.mk     |    4 ---
 2 files changed, 35 insertions(+), 38 deletions(-)

New commits:
commit a22285d5a58f08cb58a4ed5f52aed44149599973
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Jun 4 18:51:16 2011 +0200

    add --disable-dependency-tracking, --disable-acl, verbosity switches

diff --git a/gettext/makefile.mk b/gettext/makefile.mk
index 3b52dea..cf13c73 100644
--- a/gettext/makefile.mk
+++ b/gettext/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_gettext
 
 .IF "$(SYSTEM_GETTEXT)" == "YES"
 all:
-    @echo "An already available installation of gettext should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
+	@echo "An already available installation of gettext should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -53,43 +53,44 @@ PATCH_FILES=
 .IF "$(OS)"=="MACOSX"
 
 CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) --disable-curses --without-emacs --without-git --disable-java
+CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
+CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
 
 BUILD_ACTION=$(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
 
 EXTRPATH=LOADER
-OUT2LIB+=gettext-tools$/intl$/.libs$/libintl.*.dylib
-OUT2LIB+=gettext-runtime$/libasprintf$/.libs$/libasprintf.*.dylib
-OUT2LIB+=gettext-tools$/gnulib-lib$/.libs$/libgettextlib-*.dylib
-OUT2LIB+=gettext-tools$/src$/.libs$/libgettextsrc-*.dylib
-OUT2LIB+=gettext-tools$/libgettextpo$/.libs$/libgettextpo.*.dylib
-
-OUT2INC+=gettext-tools$/intl$/libintl.h
-OUT2INC+=gettext-runtime$/libasprintf$/autosprintf.h
-OUT2INC+=gettext-tools$/libgettextpo$/gettext-po.h
-
-OUT2BIN+=gettext-tools$/src$/.libs$/msgattrib
-OUT2BIN+=gettext-tools$/src$/.libs$/msgcat
-OUT2BIN+=gettext-tools$/src$/.libs$/msgcmp
-OUT2BIN+=gettext-tools$/src$/.libs$/msgcomm
-OUT2BIN+=gettext-tools$/src$/.libs$/msgconv
-OUT2BIN+=gettext-tools$/src$/.libs$/msgen
-OUT2BIN+=gettext-tools$/src$/.libs$/msgexec
-OUT2BIN+=gettext-tools$/src$/.libs$/msgfilter
-OUT2BIN+=gettext-tools$/src$/.libs$/msgfmt
-OUT2BIN+=gettext-tools$/src$/.libs$/msggrep
-OUT2BIN+=gettext-tools$/src$/.libs$/msginit
-OUT2BIN+=gettext-tools$/src$/.libs$/msgmerge
-OUT2BIN+=gettext-tools$/src$/.libs$/msgunfmt
-OUT2BIN+=gettext-tools$/src$/.libs$/msguniq
-OUT2BIN+=gettext-tools$/src$/.libs$/urlget
-OUT2BIN+=gettext-tools$/src$/.libs$/xgettext
+OUT2LIB+=gettext-tools/intl/.libs/libintl.*.dylib
+OUT2LIB+=gettext-runtime/libasprintf/.libs/libasprintf.*.dylib
+OUT2LIB+=gettext-tools/gnulib-lib/.libs/libgettextlib-*.dylib
+OUT2LIB+=gettext-tools/src/.libs/libgettextsrc-*.dylib
+OUT2LIB+=gettext-tools/libgettextpo/.libs/libgettextpo.*.dylib
+
+OUT2INC+=gettext-tools/intl/libintl.h
+OUT2INC+=gettext-runtime/libasprintf/autosprintf.h
+OUT2INC+=gettext-tools/libgettextpo/gettext-po.h
+
+OUT2BIN+=gettext-tools/src/.libs/msgattrib
+OUT2BIN+=gettext-tools/src/.libs/msgcat
+OUT2BIN+=gettext-tools/src/.libs/msgcmp
+OUT2BIN+=gettext-tools/src/.libs/msgcomm
+OUT2BIN+=gettext-tools/src/.libs/msgconv
+OUT2BIN+=gettext-tools/src/.libs/msgen
+OUT2BIN+=gettext-tools/src/.libs/msgexec
+OUT2BIN+=gettext-tools/src/.libs/msgfilter
+OUT2BIN+=gettext-tools/src/.libs/msgfmt
+OUT2BIN+=gettext-tools/src/.libs/msggrep
+OUT2BIN+=gettext-tools/src/.libs/msginit
+OUT2BIN+=gettext-tools/src/.libs/msgmerge
+OUT2BIN+=gettext-tools/src/.libs/msgunfmt
+OUT2BIN+=gettext-tools/src/.libs/msguniq
+OUT2BIN+=gettext-tools/src/.libs/urlget
+OUT2BIN+=gettext-tools/src/.libs/xgettext
 
 .ELIF "$(OS)"=="IOS"
 
-BUILD_DIR=gettext-runtime$/intl
+BUILD_DIR=gettext-runtime/intl
 BUILD_ACTION=dmake
 .IF "$(VERBOSE)"!=""
 BUILD_ACTION+=VERBOSE=t
@@ -100,11 +101,11 @@ ADDITIONAL_FILES=\
     gettext-runtime/intl/libgnuintl.h \
     gettext-runtime/intl/libintl.h \
     gettext-runtime/config.h
-OUT2INC+=gettext-runtime$/intl$/libintl.h
+OUT2INC+=gettext-runtime/intl/libintl.h
 
 .ELIF "$(OS)"=="WNT"
 
-BUILD_DIR=gettext-runtime$/intl
+BUILD_DIR=gettext-runtime/intl
 BUILD_ACTION=dmake
 PATCH_FILES=gettext-0.18.1.1.patch
 ADDITIONAL_FILES=\
@@ -112,7 +113,7 @@ ADDITIONAL_FILES=\
     gettext-runtime/intl/libgnuintl.h \
     gettext-runtime/intl/libintl.h \
     gettext-runtime/config.h
-OUT2INC+=gettext-runtime$/intl$/libintl.h
+OUT2INC+=gettext-runtime/intl/libintl.h
 .ELSE
 .ENDIF
 
commit 37a6c1d99e0fd1a9cc182a5cb98cd22f5345a9eb
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Jun 4 18:20:31 2011 +0200

    data/mappings/ucm*.mk & data/translit/trn*.mk don't exist in current icu anymore

diff --git a/icu/makefile.mk b/icu/makefile.mk
index 6395e1f..fe9f43c 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -79,9 +79,6 @@ icu_CFLAGS+=-O $(ARCH_FLAGS)
 icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
 icu_CXXFLAGS+=-O $(ARCH_FLAGS)
 
-# remove conversion and transliteration data to reduce binary size.
-CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
-
 # until someone introduces SOLARIS 64-bit builds
 .IF "$(OS)"=="SOLARIS"
 DISABLE_64BIT=--enable-64bit-libs=no
@@ -167,7 +164,6 @@ OUT2BIN= \
 .IF "$(GUI)"=="WNT"
 CONFIGURE_DIR=source
 .IF "$(COM)"=="GCC"
-CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 icu_LDFLAGS+=-shared-libgcc
 .ENDIF