aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar uranther <jwheaton@purdue.edu>2009-06-29 12:06:39 -0400
committerGravatar uranther <jwheaton@purdue.edu>2009-06-29 12:06:39 -0400
commitf679c8c008361962a330e062789ba6c77683e510 (patch)
treee4675fb2541de31bd9a4807f9928a37a2d37342b /Makefile
parent6bb3be0480e029879b0f430416140ccfb446e4a1 (diff)
parent439824504f60d37f39d9b7bda8479dd1f18f17b9 (diff)
Merge from Dieterbe/experimental
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index a20e532..960ea20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-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)
+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)
+LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
all: uzbl uzblctrl
PREFIX?=$(DESTDIR)/usr
@@ -63,13 +63,13 @@ install:
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
+ install -m755 uzbl $(PREFIX)/bin/uzbl
+ install -m755 uzblctrl $(PREFIX)/bin/uzblctrl
+ cp -rp docs $(PREFIX)/share/uzbl/
+ cp -rp config.h $(PREFIX)/share/uzbl/docs/
+ cp -rp examples $(PREFIX)/share/uzbl/
+ install -m644 AUTHORS $(PREFIX)/share/uzbl/docs
+ install -m644 README $(PREFIX)/share/uzbl/docs
uninstall: