[Libreoffice-commits] .: gdk-pixbuf/makefile.mk gdk-pixbuf/prj librsvg/makefile.mk

[Tor Lillqvist]

 gdk-pixbuf/makefile.mk |    2 ++
 gdk-pixbuf/prj/d.lst   |    1 +
 librsvg/makefile.mk    |    1 +
 3 files changed, 4 insertions(+)

New commits:
commit aff81a28353f543845d5c9369c5b388b7c1960f4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 2 15:06:00 2011 +0300

    No need to build a SVG gdk-pixbuf loader

diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 1e89deb..023b26d 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -70,6 +70,8 @@ BUILD_DIR=$(CONFIGURE_DIR)
 EXTRPATH=LOADER
 OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib
 
+OUT2BIN+=gdk-pixbuf/.libs/gdk-pixbuf-query-loaders
+
 OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h
 OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h
 OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h
diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst
index 54f62a1..ef7776a 100755
--- a/gdk-pixbuf/prj/d.lst
+++ b/gdk-pixbuf/prj/d.lst
@@ -16,5 +16,6 @@ mkdir: %_DEST%\inc%_EXT%\external\gdk-pixbuf-2.0\gdk-pixbuf
 
 ..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib
 symlink: %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib%_EXT%\libgdk_pixbuf-2.0.dylib
+..\%__SRC%\bin\gdk-pixbuf-query-loaders %_DEST%\bin%_EXT%\gdk-pixbuf-query-loaders
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib%_EXT%\gdk_pixbuf-2.0.lib
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 5744dc7..4ab786b 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -62,6 +62,7 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure \
                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
 CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
+                 --disable-pixbuf-loader \
                  LIBRSVG_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo $(LIBXML_CFLAGS)" \
                  LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \
                  GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \