Merge branch 'master' into feature/gnumake4

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

3 files changed, 78 insertions, 77 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
diff --git a/libcroco/prj/build.lst b/libcroco/prj/build.lst
index ef0578bfe141..b03d58bba3d4 100644
--- a/libcroco/prj/build.lst
+++ b/libcroco/prj/build.lst
@@ -1,3 +1,3 @@
-cr	libcroco	: libxml2 glib soltools NULL
+cr	libcroco	: LIBXML2:libxml2 glib soltools NULL
 cr	libcroco			    usr1	-	all	cr_mkout NULL
 cr	libcroco			    nmake	-	all	cr_libcroco NULL
diff --git a/libcroco/prj/d.lst b/libcroco/prj/d.lst
index f010d0024951..6c89b36fd4b8 100755
--- a/libcroco/prj/d.lst
+++ b/libcroco/prj/d.lst
@@ -1,39 +1,39 @@
-mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\libcroco-0.6
-mkdir: %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco
+mkdir: %_DEST%\inc\external
+mkdir: %_DEST%\inc\external\libcroco-0.6
+mkdir: %_DEST%\inc\external\libcroco-0.6\libcroco
 
-..\%__SRC%\inc\cr-additional-sel.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-additional-sel.h
-..\%__SRC%\inc\cr-input.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-input.h
-..\%__SRC%\inc\cr-rgb.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-rgb.h
-..\%__SRC%\inc\cr-stylesheet.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-stylesheet.h
-..\%__SRC%\inc\cr-attr-sel.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-attr-sel.h
-..\%__SRC%\inc\cr-num.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-num.h
-..\%__SRC%\inc\cr-sel-eng.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-sel-eng.h
-..\%__SRC%\inc\cr-term.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-term.h
-..\%__SRC%\inc\cr-cascade.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-cascade.h
-..\%__SRC%\inc\cr-om-parser.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-om-parser.h
-..\%__SRC%\inc\cr-selector.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-selector.h
-..\%__SRC%\inc\cr-tknzr.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-tknzr.h
-..\%__SRC%\inc\cr-declaration.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-declaration.h
-..\%__SRC%\inc\cr-parser.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-parser.h
-..\%__SRC%\inc\cr-simple-sel.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-simple-sel.h
-..\%__SRC%\inc\cr-token.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-token.h
-..\%__SRC%\inc\cr-doc-handler.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-doc-handler.h
-..\%__SRC%\inc\cr-parsing-location.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-parsing-location.h
-..\%__SRC%\inc\cr-statement.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-statement.h
-..\%__SRC%\inc\cr-utils.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-utils.h
-..\%__SRC%\inc\cr-enc-handler.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-enc-handler.h
-..\%__SRC%\inc\cr-prop-list.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-prop-list.h
-..\%__SRC%\inc\cr-string.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-string.h
-..\%__SRC%\inc\libcroco-config.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\libcroco-config.h
-..\%__SRC%\inc\cr-fonts.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-fonts.h
-..\%__SRC%\inc\cr-pseudo.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-pseudo.h
-..\%__SRC%\inc\cr-style.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\cr-style.h
-..\%__SRC%\inc\libcroco.h %_DEST%\inc%_EXT%\external\libcroco-0.6\libcroco\libcroco.h
+..\%__SRC%\inc\cr-additional-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-additional-sel.h
+..\%__SRC%\inc\cr-input.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-input.h
+..\%__SRC%\inc\cr-rgb.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-rgb.h
+..\%__SRC%\inc\cr-stylesheet.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-stylesheet.h
+..\%__SRC%\inc\cr-attr-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-attr-sel.h
+..\%__SRC%\inc\cr-num.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-num.h
+..\%__SRC%\inc\cr-sel-eng.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-sel-eng.h
+..\%__SRC%\inc\cr-term.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-term.h
+..\%__SRC%\inc\cr-cascade.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-cascade.h
+..\%__SRC%\inc\cr-om-parser.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-om-parser.h
+..\%__SRC%\inc\cr-selector.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-selector.h
+..\%__SRC%\inc\cr-tknzr.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-tknzr.h
+..\%__SRC%\inc\cr-declaration.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-declaration.h
+..\%__SRC%\inc\cr-parser.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-parser.h
+..\%__SRC%\inc\cr-simple-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-simple-sel.h
+..\%__SRC%\inc\cr-token.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-token.h
+..\%__SRC%\inc\cr-doc-handler.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-doc-handler.h
+..\%__SRC%\inc\cr-parsing-location.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-parsing-location.h
+..\%__SRC%\inc\cr-statement.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-statement.h
+..\%__SRC%\inc\cr-utils.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-utils.h
+..\%__SRC%\inc\cr-enc-handler.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-enc-handler.h
+..\%__SRC%\inc\cr-prop-list.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-prop-list.h
+..\%__SRC%\inc\cr-string.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-string.h
+..\%__SRC%\inc\libcroco-config.h %_DEST%\inc\external\libcroco-0.6\libcroco\libcroco-config.h
+..\%__SRC%\inc\cr-fonts.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-fonts.h
+..\%__SRC%\inc\cr-pseudo.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-pseudo.h
+..\%__SRC%\inc\cr-style.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-style.h
+..\%__SRC%\inc\libcroco.h %_DEST%\inc\external\libcroco-0.6\libcroco\libcroco.h
 
-..\%__SRC%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib%_EXT%\libcroco-0.6.3.0.1.dylib
-symlink: %_DEST%\lib%_EXT%\libcroco-0.6.3.0.1.dylib %_DEST%\lib%_EXT%\libcroco-0.6.3.dylib
-symlink: %_DEST%\lib%_EXT%\libcroco-0.6.3.dylib %_DEST%\lib%_EXT%\libcroco-0.6.dylib
+..\%__SRC%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib\libcroco-0.6.3.0.1.dylib
+symlink: %_DEST%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib\libcroco-0.6.3.dylib
+symlink: %_DEST%\lib\libcroco-0.6.3.dylib %_DEST%\lib\libcroco-0.6.dylib
 
-..\%__SRC%\lib\ilibcroco-0.6-3_t1.lib %_DEST%\lib%_EXT%\libcroco-0.6-3.lib
-..\%__SRC%\bin\libcroco-0.6-3.dll %_DEST%\bin%_EXT%\libcroco-0.6-3.dll
+..\%__SRC%\lib\ilibcroco-0.6-3_t1.lib %_DEST%\lib\libcroco-0.6-3.lib
+..\%__SRC%\bin\libcroco-0.6-3.dll %_DEST%\bin\libcroco-0.6-3.dll