diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2009-07-14 17:56:02 -0600 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2009-07-14 17:56:02 -0600 |
| commit | 25972713cd69b650feac840b85435ada9f02ed83 (patch) | |
| tree | 235409a6f0a99abeb18b676db29cfa63d7a36a96 /Makefile | |
| parent | f90cf21c5561a4ae2b282d6e095c38d06f38840e (diff) | |
| parent | 5db19767e101d78ee9201f01d063e43c6697dd85 (diff) | |
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,5 +1,11 @@ +# first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html + CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC +CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT='"\""'`git log | head -n1 | sed "s/.* //"`'"\""' $(CPPFLAGS) -fPIC + LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS) +LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS) + all: uzbl uzblctrl PREFIX?=$(DESTDIR)/usr |