use stdlib atof() instead of gnu99 strtof() + more sense making example binds for...

[uzbl-mobile] / Makefile

diff --git a/Makefile b/Makefile
index e03fab7..fa20b6c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,8 @@
-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
-
+CPPFLAGS:=$(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)
 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
@@ -27,25 +11,26 @@ test-config: uzbl
        ./uzbl --uri http://www.uzbl.org < examples/configs/sampleconfig-dev
 
 test-config-real: uzbl
-       ./uzbl --uri http://www.uzbl.org < $(UZBLDATA)/examples/configs/sampleconfig
+       ./uzbl --uri http://www.uzbl.org < /usr/share/uzbl/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