X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=4e9d2829daab3ab2b8054fb016baf8eb8913278a;hb=2161d9ef902c2701376ae9d8e46db176491d3fdc;hp=4c3a4836f8bf0dcc0dde95de6477a14f8e615cdc;hpb=2e1033c24873586d8cc0ace2d76de30a6408d06d;p=uzbl-mobile

diff --git a/Makefile b/Makefile
index 4c3a483..4e9d282 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,18 @@
-CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS)
-LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) $(LDFLAGS)
+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)
+LDFLAGS:=$(shell 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
+	./uzbl --uri http://www.uzbl.org --verbose
 
-test-config: uzbl
-	./uzbl --uri http://www.uzbl.org < examples/configs/sampleconfig-dev
+test-dev: uzbl
+	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
+
+test-share: uzbl
+	XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose
 
-test-config-real: uzbl
-	./uzbl --uri http://www.uzbl.org < /usr/share/uzbl/examples/configs/sampleconfig
 	
 clean:
 	rm -f uzbl
@@ -21,13 +22,13 @@ install:
 	install -d $(PREFIX)/bin
 	install -d $(PREFIX)/share/uzbl/docs
 	install -d $(PREFIX)/share/uzbl/examples
-	install -D -m755 uzbl $(PREFIX)/bin/uzbl
-	install -D -m755 uzblctrl $(PREFIX)/bin/uzblctrl
-	cp -ax docs     $(PREFIX)/share/uzbl/
-	cp -ax config.h $(PREFIX)/share/uzbl/docs/
-	cp -ax examples $(PREFIX)/share/uzbl/
-	install -D -m644 AUTHORS $(PREFIX)/share/uzbl/docs
-	install -D -m644 README  $(PREFIX)/share/uzbl/docs
+	install -m755 uzbl $(PREFIX)/bin/uzbl
+	install -m755 uzblctrl $(PREFIX)/bin/uzblctrl
+	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
 
 
 uninstall: