Revert "cleanup when uzbl quits"

[uzbl-mobile] / Makefile

diff --git a/Makefile b/Makefile
index 906436f..9254e54 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,37 @@
-CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -Wall -W -DKERNVER="\"$(shell uname -r)\"" -DARCH="\"$(shell uname -m)\"" -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\""
-LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0)
+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
 
+PREFIX?=$(DESTDIR)/usr
+
 test: uzbl
-       ./uzbl --uri http://www.uzbl.org
+       ./uzbl --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-config: uzbl
-       ./uzbl --uri http://www.uzbl.org --config examples/configs/sampleconfig-dev
+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 --config /usr/share/uzbl/examples/configs/sampleconfig
        
 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
-       install -D -m755 uzbl $(DESTDIR)/usr/bin/uzbl
-       install -D -m755 uzblctrl $(DESTDIR)/usr/bin/uzblctrl
-       cp -ax examples $(DESTDIR)/usr/share/uzbl/
-       install -D -m644 CHECKLIST $(DESTDIR)/usr/share/uzbl/docs
-       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 $(DESTDIR)/usr/bin/uzbl
-       rm -rf $(DESTDIR)/usr/bin/uzblctrl
-       rm -rf $(DESTDIR)/usr/share/uzbl
+       rm -rf $(PREFIX)/bin/uzbl
+       rm -rf $(PREFIX)/bin/uzblctrl
+       rm -rf $(PREFIX)/share/uzbl