diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2009-07-16 18:01:24 -0600 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2009-07-16 18:01:24 -0600 |
| commit | 87319b49b48fc54cbca58f830b5e7f61b79e6ff7 (patch) | |
| tree | 0be3b4ac50af732d25cc8aec08e0949e6d401e7c /tests/Makefile | |
| parent | 1c079d2ab38b87f2abb3d980ec9b43200d2711e0 (diff) | |
| parent | 771d31746357df349308cb4094f2873837e90a24 (diff) | |
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
Conflicts:
Makefile
tests/Makefile
uzbl.c
uzbl.h
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 7901b7d..9db398a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,8 @@ CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl $(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) +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) + 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) GTESTER:=gtester GTESTER_REPORT:=gtester-report |