Replaced disable_stdin with uzbl -c -

[uzbl-mobile] / Makefile

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