[Libreoffice-commits] .: 3 commits - glib/makefile.mk glib/prj pango/makefile.mk

[Tor Lillqvist]

 glib/makefile.mk  |    8 +++++++-
 glib/prj/d.lst    |    1 +
 pango/makefile.mk |    5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 69d56ed0cca201943ea483f9f429bc5cf754f872
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 30 23:47:53 2011 +0300

    Deliver also the built glib-compile-schemas
    
    It is needed in case a native internal GLib build is used when
    cross-compiling GLib.

diff --git a/glib/makefile.mk b/glib/makefile.mk
index d24e40a..7e355d4 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -74,6 +74,7 @@ OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib
 
 OUT2BIN+=gobject/glib-mkenums
 OUT2BIN+=gobject/.libs/glib-genmarshal
+OUT2BIN+=gio/.libs/glib-compile-schemas
 
 OUT2INC+=glib/glib.h
 OUT2INC+=glib/glib-object.h
diff --git a/glib/prj/d.lst b/glib/prj/d.lst
index 851265c..5ec89f1 100644
--- a/glib/prj/d.lst
+++ b/glib/prj/d.lst
@@ -13,6 +13,7 @@ symlink: %_DEST%\lib%_EXT%\libgobject-2.0.0.dylib %_DEST%\lib%_EXT%\libgobject-2
 ..\%__SRC%\bin\glib-mkenums %_DEST%\bin%_EXT%\glib-mkenums
 ..\%__SRC%\bin\glib-genmarshal %_DEST%\bin%_EXT%\glib-genmarshal
 ..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin%_EXT%\glib-genmarshal.exe
+..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin%_EXT%\glib-compile-schemas
 ..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib%_EXT%\gio-2.0.lib
 ..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib%_EXT%\gmodule-2.0.lib
 ..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib
commit 0f195adf2611d7d632bbcbdfccf78d45a258c923
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 30 23:41:34 2011 +0300

    Propagate verbosity

diff --git a/glib/makefile.mk b/glib/makefile.mk
index 70736ff..d24e40a 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -58,7 +58,12 @@ CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/externa
 CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)"
 
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+
+.IF "$(VERBOSE)"!=""
+VFLAG=V=1
+.ENDIF
+
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
 
 EXTRPATH=LOADER
 OUT2LIB+=gio/.libs/libgio-2.0.0.dylib
commit 708588eb9e71831a4fc1f79d52bd367f1b6966e0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat May 28 16:05:52 2011 +0300

    Propagate verbosity

diff --git a/pango/makefile.mk b/pango/makefile.mk
index fddbbec..6e9165e 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -67,7 +67,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 CONFIGURE_ACTION+="--without-x"
 
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+.IF "$(VERBOSE)"!=""
+VFLAG=V=1
+.ENDIF
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
 BUILD_DIR=$(CONFIGURE_DIR)
 
 EXTRPATH=LOADER