X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=b23b0204629f6a30bcb21bb2edad3f8a21a21f5a;hb=264c01baa1cf9287cf44dd28e9de7c1716d5141e;hp=de4fe4df9a2a7ab602ef7542f6165b352f2b261e;hpb=158043454ca86600bb96e94dd15325431edbf556;p=uzbl-mobile

diff --git a/Makefile b/Makefile
index de4fe4d..b23b020 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,37 @@
-CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -Wall -W
-LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0)
-.PHONY: all test clean install
-all: uzbl
+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4) -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 libsoup-2.4) -pthread $(LDFLAGS)
+all: uzbl uzblctrl
 
-test:
-	./uzbl --uri http://www.archlinux.org
+PREFIX?=$(DESTDIR)/usr
 
+test: uzbl
+	./uzbl --uri http://www.uzbl.org --verbose
+
+test-config-dev: uzbl
+	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
+
+test-config-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
+
+	
 clean:
 	rm -f uzbl
+	rm -f uzblctrl
 
 install:
-	install -d $(DESTDIR)/usr/bin
-	install -d $(DESTDIR)/usr/share/uzbl/docs
-	install -d $(DESTDIR)/usr/share/uzbl/examples/scripts
-	install -d $(DESTDIR)/usr/share/uzbl/examples/configs
-	install -D -m755 uzbl $(DESTDIR)/usr/bin/uzbl
-	install -D -m644 extra/* $(DESTDIR)/usr/share/uzbl/examples/scripts
-	install -D -m644 sampleconfig $(DESTDIR)/usr/share/uzbl/examples/configs
-	install -D -m644 README $(DESTDIR)/usr/share/uzbl/docs
+	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
+
+
+uninstall:
+	rm -rf $(PREFIX)/bin/uzbl
+	rm -rf $(PREFIX)/bin/uzblctrl
+	rm -rf $(PREFIX)/share/uzbl