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

diff --git a/Makefile b/Makefile
index e03fab7..b23b020 100644
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,37 @@
-LIBS    := gtk+-2.0 webkit-1.0
-ARCH    := $(shell uname -m)
-COMMIT  := $(shell git log | head -n1 | sed "s/.* //")
-DEBUG   := -ggdb -Wall -W -DG_ERRORCHECK_MUTEXES 
-
-CFLAGS  := $(shell --cflags $(LIBS)) $(DEBUG) -DARCH="$(ARCH)" -DCOMMIT="\"$(COMMIT)\""
-LDFLAGS := $(shell --libs $(LIBS))
-
-PREFIX  ?= /usr/local
-BINDIR  ?= $(PREFIX)/bin
-DATADIR ?= $(PREFIX)/share
-UZBLDATA?= $(DATADIR)/uzbl
-DOCSDIR ?= $(UZBLDATA)/docs
-EXMPLSDIR ?= $(UZBLDATA)/examples
-
+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
 
-uzbl: uzbl.c uzbl.h config.h
-
-%: %.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) -o $@ $<
+PREFIX?=$(DESTDIR)/usr
 
 test: uzbl
-	./uzbl --uri http://www.uzbl.org
+	./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: uzbl
-	./uzbl --uri http://www.uzbl.org < examples/configs/sampleconfig-dev
+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
 
-test-config-real: uzbl
-	./uzbl --uri http://www.uzbl.org < $(UZBLDATA)/examples/configs/sampleconfig
 	
 clean:
 	rm -f uzbl
 	rm -f uzblctrl
 
 install:
-	install -d $(DESTDIR)$(BINDIR)
-	install -d $(DESTDIR)$(DOCSDIR)
-	install -d $(DESTDIR)$(EXMPLSDIR)
-	install -D -m755 uzbl $(DESTDIR)$(BINDIR)/uzbl
-	install -D -m755 uzblctrl $(DESTDIR)$(BINDIR)/uzblctrl
-	cp -ax docs/*     $(DESTDIR)$(DOCSDIR)
-	cp -ax config.h   $(DESTDIR)$(DOCSDIR)
-	cp -ax examples/* $(DESTDIR)$(EXMPLSDIR)
-	install -D -m644 AUTHORS $(DESTDIR)$(DOCSDIR)
-	install -D -m644 README  $(DESTDIR)$(DOCSDIR)
+	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)$(BINDIR)/uzbl
-	rm -rf $(DESTDIR)$(BINDIR)/uzblctrl
-	rm -rf $(DESTDIR)$(UZBLDATA)
+	rm -rf $(PREFIX)/bin/uzbl
+	rm -rf $(PREFIX)/bin/uzblctrl
+	rm -rf $(PREFIX)/share/uzbl