Merge commit 'Dieterbe/experimental' into experimental

diff --combined Makefile
index b2f4431,857494c..a0be348
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,13 -1,17 +1,19 @@@
+ # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
+ 
  CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS)
+ CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS)
+ 
  LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
+ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
+ 
  all: uzbl uzblctrl
  
  PREFIX?=$(DESTDIR)/usr
  
 -test: uzbl
 -      ./uzbl --uri http://www.uzbl.org --verbose
 +# When compiling unit tests, compile uzbl as a library first
 +test: uzbl.o
 +      $(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
 +      cd ./tests/; $(MAKE)
  
  test-dev: uzbl
        XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
@@@ -19,8 -23,6 +25,8 @@@ test-share: uzb
  clean:
        rm -f uzbl
        rm -f uzblctrl
 +      rm -f uzbl.o
 +      cd ./tests/; $(MAKE) clean
  
  install:
        install -d $(PREFIX)/bin