Merge remote branch 'dieterbe/experimental'

Conflicts:
	uzbl-core.c

1 files changed, 65 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 2a0982c..167881f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,94 @@
 # 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) -fPIC -W -Wall -Wextra -pedantic -ggdb3
-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) -fPIC -W -Wall -Wextra -pedantic -ggdb3
+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 -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -ggdb3
+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 -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -ggdb3
 
 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
+SRC = uzbl-core.c events.c callbacks.c inspector.c
+OBJ = ${SRC:.c=.o}
+
+all: uzbl-browser options
+
+options:
+	@echo
+	@echo BUILD OPTIONS:
+	@echo "CFLAGS   = ${CFLAGS}"
+	@echo "LDFLAGS  = ${LDFLAGS}"
+	@echo
+	@echo See the README file for usage instructions.
+
+
+.c.o:
+	@echo COMPILING $<
+	@${CC} -c ${CFLAGS} $<
+	@echo ... done.
+
+${OBJ}: uzbl-core.h events.h callbacks.h inspector.h config.h
+
+uzbl-core: ${OBJ}
+	@echo
+	@echo LINKING object files
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@echo ... done.
+	@echo Stripping binary
+	@strip $@
+	@echo ... done.
+
+
+
+uzbl-browser: uzbl-core
 
 PREFIX?=$(DESTDIR)/usr/local
 
 # When compiling unit tests, compile uzbl as a library first
-tests: uzbl.o
-	$(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
+tests: uzbl-core.o uzbl-events.o
+	$(CC) -DUZBL_LIBRARY -shared -Wl uzbl-core.o uzbl-events.o -o ./tests/libuzbl-core.so
 	cd ./tests/; $(MAKE)
 
-test: uzbl
-	./uzbl --uri http://www.uzbl.org --verbose
+test: uzbl-core
+	                    ./uzbl-core --uri http://www.uzbl.org --verbose
 
-test-dev: uzbl
-	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
+test-browser: uzbl-browser
+	PATH="`pwd`:$$PATH" ./uzbl-browser --uri http://www.uzbl.org --verbose
 
-test-share: uzbl
-	XDG_DATA_HOME=${PREFIX}/share/uzbl/examples/data XDG_CONFIG_HOME=${PREFIX}/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose
+test-dev: uzbl-core
+	XDG_DATA_HOME=./examples/data                    XDG_CONFIG_HOME=./examples/config                                        ./uzbl-core --uri http://www.uzbl.org --verbose
 
+test-dev-browser: uzbl-browser
+	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/cookie_daemon.py start -nv &
+	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./uzbl-browser --uri http://www.uzbl.org --verbose
+	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/cookie_daemon.py stop -v
+
+test-share: uzbl-core
+	XDG_DATA_HOME=${PREFIX}/share/uzbl/examples/data XDG_CONFIG_HOME=${PREFIX}/share/uzbl/examples/config                     ./uzbl-core --uri http://www.uzbl.org --verbose
+
+test-share-browser: uzbl-browser
+	XDG_DATA_HOME=${PREFIX}/share/uzbl/examples/data XDG_CONFIG_HOME=${PREFIX}/share/uzbl/examples/config PATH="`pwd`:$$PATH" ./uzbl-browser --uri http://www.uzbl.org --verbose
 
 clean:
-	rm -f uzbl
-	rm -f uzbl.o
+	rm -f uzbl-core
+	rm -f uzbl-core.o
+	rm -f events.o
+	rm -f callbacks.o
+	rm -f inspector.o
 	cd ./tests/; $(MAKE) clean
 
-install:
+install: all
 	install -d $(PREFIX)/bin
 	install -d $(PREFIX)/share/uzbl/docs
 	install -d $(PREFIX)/share/uzbl/examples
-	install -m755 uzbl $(PREFIX)/bin/uzbl
 	cp -rp docs     $(PREFIX)/share/uzbl/
 	cp -rp config.h $(PREFIX)/share/uzbl/docs/
 	cp -rp examples $(PREFIX)/share/uzbl/
-	install -m644 AUTHORS $(PREFIX)/share/uzbl/docs
-	install -m644 README  $(PREFIX)/share/uzbl/docs
+	install -m755 uzbl-core    $(PREFIX)/bin/uzbl-core
+	install -m755 uzbl-browser $(PREFIX)/bin/uzbl-browser
+	install -m644 AUTHORS      $(PREFIX)/share/uzbl/docs
+	install -m644 README       $(PREFIX)/share/uzbl/docs
 
 
 uninstall:
-	rm -rf $(PREFIX)/bin/uzbl
+	rm -rf $(PREFIX)/bin/uzbl-*
 	rm -rf $(PREFIX)/share/uzbl
+