Merge branch 'master' into feature/gnumake4

Conflicts:
	cairo/cairo-1.8.0.patch
	cairo/prj/build.lst
	gdk-pixbuf/makefile.mk
	libcroco/makefile.mk

1 files changed, 41 insertions, 40 deletions

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index 8f80daf60965..d405f9505118 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_libcroco
 
 .IF "$(SYSTEM_LIBCROCO)" == "YES"
 all:
-    @echo "An already available installation of libcroco 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 libcroco should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -51,53 +51,54 @@ PATCH_FILES=
 CONFIGURE_DIR=
 
 .IF "$(OS)"=="MACOSX"
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 .$/configure \
-                 --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR)" \
-                 GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+                 CPPFLAGS="$(EXTRA_CDEFS)" \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
+                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \
+                 GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                  GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
                  LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
                  LIBXML2_LIBS="$(LIBXML_LIBS)"
 
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-                
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
              $(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
 
 EXTRPATH=LOADER
-OUT2LIB+=src$/.libs$/libcroco-0.6.3.0.1.dylib
-
-OUT2INC+=src$/cr-additional-sel.h
-OUT2INC+=src$/cr-input.h
-OUT2INC+=src$/cr-rgb.h
-OUT2INC+=src$/cr-stylesheet.h
-OUT2INC+=src$/cr-attr-sel.h
-OUT2INC+=src$/cr-num.h
-OUT2INC+=src$/cr-sel-eng.h
-OUT2INC+=src$/cr-term.h
-OUT2INC+=src$/cr-cascade.h
-OUT2INC+=src$/cr-om-parser.h
-OUT2INC+=src$/cr-selector.h
-OUT2INC+=src$/cr-tknzr.h
-OUT2INC+=src$/cr-declaration.h
-OUT2INC+=src$/cr-parser.h
-OUT2INC+=src$/cr-simple-sel.h
-OUT2INC+=src$/cr-token.h
-OUT2INC+=src$/cr-doc-handler.h
-OUT2INC+=src$/cr-parsing-location.h
-OUT2INC+=src$/cr-statement.h
-OUT2INC+=src$/cr-utils.h
-OUT2INC+=src$/cr-enc-handler.h
-OUT2INC+=src$/cr-prop-list.h
-OUT2INC+=src$/cr-string.h
-OUT2INC+=src$/libcroco-config.h
-OUT2INC+=src$/cr-fonts.h
-OUT2INC+=src$/cr-pseudo.h
-OUT2INC+=src$/cr-style.h
-OUT2INC+=src$/libcroco.h
+OUT2LIB+=src/.libs/libcroco-0.6.3.0.1.dylib
+
+OUT2INC+=src/cr-additional-sel.h
+OUT2INC+=src/cr-input.h
+OUT2INC+=src/cr-rgb.h
+OUT2INC+=src/cr-stylesheet.h
+OUT2INC+=src/cr-attr-sel.h
+OUT2INC+=src/cr-num.h
+OUT2INC+=src/cr-sel-eng.h
+OUT2INC+=src/cr-term.h
+OUT2INC+=src/cr-cascade.h
+OUT2INC+=src/cr-om-parser.h
+OUT2INC+=src/cr-selector.h
+OUT2INC+=src/cr-tknzr.h
+OUT2INC+=src/cr-declaration.h
+OUT2INC+=src/cr-parser.h
+OUT2INC+=src/cr-simple-sel.h
+OUT2INC+=src/cr-token.h
+OUT2INC+=src/cr-doc-handler.h
+OUT2INC+=src/cr-parsing-location.h
+OUT2INC+=src/cr-statement.h
+OUT2INC+=src/cr-utils.h
+OUT2INC+=src/cr-enc-handler.h
+OUT2INC+=src/cr-prop-list.h
+OUT2INC+=src/cr-string.h
+OUT2INC+=src/libcroco-config.h
+OUT2INC+=src/cr-fonts.h
+OUT2INC+=src/cr-pseudo.h
+OUT2INC+=src/cr-style.h
+OUT2INC+=src/libcroco.h
 .ELIF "$(OS)"=="WNT"
 
 BUILD_ACTION=dmake