Merge branch 'master' of git://github.com/Dieterbe/uzbl into gtk3

Conflicts:
	Makefile

1 files changed, 55 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 0b99d21..d5a8d51 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 # 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+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
-CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0 glib-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0 glib-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic
 
-LDFLAGS:=$(shell pkg-config --libs gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
-LDFLAGS!=echo `pkg-config --libs gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
+UZBL_LDFLAGS:=$(shell pkg-config --libs gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0 x11) -pthread $(LDFLAGS)
+UZBL_LDFLAGS!=echo `pkg-config --libs gtk+-3.0 webkitgtk-3.0 libsoup-2.4 gthread-2.0 x11` -pthread $(LDFLAGS)
 
 SRC = $(wildcard src/*.c)
 HEAD = $(wildcard src/*.h)
 OBJ = $(foreach obj, $(SRC:.c=.o), $(notdir $(obj)))
 
-all: uzbl-browser
+all: uzbl-browser uzbl-cookie-manager
 
 VPATH:=src
 
@@ -21,10 +21,14 @@ VPATH:=src
 ${OBJ}: ${HEAD}
 
 uzbl-core: ${OBJ}
-	@echo -e "\n${CC} -o $@ ${OBJ} ${LDFLAGS}"
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@echo -e "\n${CC} -o $@ ${OBJ} ${UZBL_LDFLAGS}"
+	@${CC} -o $@ ${OBJ} ${UZBL_LDFLAGS}
 
-uzbl-browser: uzbl-core
+uzbl-cookie-manager: examples/uzbl-cookie-manager.o src/util.o
+	@echo -e "\n${CC} -o $@ uzbl-cookie-manager.o util.o ${LDFLAGS} ${shell pkg-config --libs glib-2.0 libsoup-2.4}"
+	@${CC} -o $@ uzbl-cookie-manager.o util.o ${LDFLAGS} $(shell pkg-config --libs glib-2.0 libsoup-2.4)
+
+uzbl-browser: uzbl-core uzbl-cookie-manager
 
 # packagers, set DESTDIR to your "package directory" and PREFIX to the prefix you want to have on the end-user system
 # end-users who build from source: don't care about DESTDIR, update PREFIX if you want to
@@ -62,20 +66,36 @@ test-uzbl-browser-sandbox: uzbl-browser
 	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser
 	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data
 	cp -np ./misc/env.sh ./sandbox/env.sh
-	source ./sandbox/env.sh && uzbl-cookie-daemon restart -nv &
-	source ./sandbox/env.sh && uzbl-event-manager restart -navv &
+	-source ./sandbox/env.sh && uzbl-cookie-manager -v
+	-source ./sandbox/env.sh && uzbl-event-manager restart -avv
 	source ./sandbox/env.sh && uzbl-browser --uri http://www.uzbl.org --verbose
-	source ./sandbox/env.sh && uzbl-cookie-daemon stop -v
+	kill `cat ./sandbox/home/.cache/uzbl/cookie_daemon_socket.pid`
+	source ./sandbox/env.sh && uzbl-event-manager stop -ivv
+	make DESTDIR=./sandbox uninstall
+	rm -rf ./sandbox/usr
+
+test-uzbl-tabbed-sandbox: uzbl-browser
+	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-core
+	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser
+	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data
+	cp -np ./misc/env.sh ./sandbox/env.sh
+	-source ./sandbox/env.sh && uzbl-cookie-manager -v
+	-source ./sandbox/env.sh && uzbl-event-manager restart -avv
+	source ./sandbox/env.sh && ./sandbox/home/.local/share/uzbl/scripts/uzbl-tabbed
+	kill `cat ./sandbox/home/.cache/uzbl/cookie_daemon_socket.pid`
 	source ./sandbox/env.sh && uzbl-event-manager stop -ivv
 	make DESTDIR=./sandbox uninstall
 	rm -rf ./sandbox/usr
 
 clean:
 	rm -f uzbl-core
+	rm -f uzbl-cookie-manager
 	rm -f uzbl-core.o
 	rm -f events.o
 	rm -f callbacks.o
 	rm -f inspector.o
+	rm -f cookie-jar.o
+	rm -f util.o
 	find ./examples/ -name "*.pyc" -delete
 	cd ./tests/; $(MAKE) clean
 	rm -rf ./sandbox/
@@ -87,7 +107,10 @@ strip:
 
 install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed
 
-install-uzbl-core: all
+install-dirs:
+	[ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin
+
+install-uzbl-core: all install-dirs
 	install -d $(INSTALLDIR)/share/uzbl/
 	install -d $(DOCDIR)
 	install -m644 docs/* $(DOCDIR)/
@@ -96,18 +119,26 @@ install-uzbl-core: all
 	install -m644 AUTHORS $(DOCDIR)/
 	cp -r examples $(INSTALLDIR)/share/uzbl/
 	chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*
-	sed -i 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config
-	install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
-
-install-uzbl-browser:
-	install -D -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
-	install -D -m755 examples/data/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
-	install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
-	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
-	sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
-
-install-uzbl-tabbed:
-	install -D -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
+	mv $(INSTALLDIR)/share/uzbl/examples/config/config $(INSTALLDIR)/share/uzbl/examples/config/config.bak
+	sed 's#^set prefix.*=.*#set prefix     = $(RUN_PREFIX)#' < $(INSTALLDIR)/share/uzbl/examples/config/config.bak > $(INSTALLDIR)/share/uzbl/examples/config/config
+	rm $(INSTALLDIR)/share/uzbl/examples/config/config.bak
+	install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
+
+install-uzbl-browser: uzbl-cookie-manager install-dirs
+	install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+	install -m755 uzbl-cookie-manager $(INSTALLDIR)/bin/uzbl-cookie-manager
+	install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+	mv $(INSTALLDIR)/bin/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser.bak
+	sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < $(INSTALLDIR)/bin/uzbl-browser.bak > $(INSTALLDIR)/bin/uzbl-browser
+	chmod 755 $(INSTALLDIR)/bin/uzbl-browser
+	rm $(INSTALLDIR)/bin/uzbl-browser.bak
+	mv $(INSTALLDIR)/bin/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager.bak
+	sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < $(INSTALLDIR)/bin/uzbl-event-manager.bak > $(INSTALLDIR)/bin/uzbl-event-manager
+	chmod 755 $(INSTALLDIR)/bin/uzbl-event-manager
+	rm $(INSTALLDIR)/bin/uzbl-event-manager.bak
+
+install-uzbl-tabbed: install-dirs
+	install -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
 
 # you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors
 install-example-data: