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

[Christian Lohmaier]

 librsvg/makefile.mk |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 42d455f1eb2fda772b72c488c59a4874e67fc136
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Thu Jun 2 19:05:59 2011 +0200

    link against the SDK (Mac)

diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 4ab786b..af082c3 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_librsvg
 
 .IF "$(SYSTEM_LIBRSVG)" == "YES"
 all:
-    @echo "An already available installation of librsvg 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 librsvg should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -57,21 +57,21 @@ PATCH_FILES=librsvg-2.32.1.patch
 LIBXML_LIBS=-lxml2
 .ENDIF
 
-CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
+CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))
 CONFIGURE_DIR=
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure \
-                 --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
+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_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" \
+                 GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
                  GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \
-                 GTHREAD_CFLAGS=-I$(SOLARINCDIR)$/external/$glib-2.0 \
+                 GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \
                  GTHREAD_LIBS=-lgthread-2.0 \
-                 LIBCROCO_CFLAGS="-I$(SOLARINCDIR)$/external$/libcroco-0.6" \
+                 LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \
                  LIBCROCO_LIBS=-lcroco-0.6 \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0 -I$(SOLARINCDIR)$/external$/pango-1.0 -I$(SOLARINCDIR)$/cairo" \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \
                  LDFLAGS="$(CONFIGURE_LDFLAGS)"
 
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
@@ -81,7 +81,7 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
 BUILD_DIR=$(CONFIGURE_DIR)
 
 EXTRPATH=LOADER
-OUT2LIB+=.libs$/librsvg-2.2.dylib
+OUT2LIB+=.libs/librsvg-2.2.dylib
 
 OUT2INC+=librsvg-enum-types.h
 OUT2INC+=librsvg-features.h