aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2009-07-16 18:01:24 -0600
committerGravatar Brendan Taylor <whateley@gmail.com>2009-07-16 18:01:24 -0600
commit87319b49b48fc54cbca58f830b5e7f61b79e6ff7 (patch)
tree0be3b4ac50af732d25cc8aec08e0949e6d401e7c /Makefile
parent1c079d2ab38b87f2abb3d980ec9b43200d2711e0 (diff)
parent771d31746357df349308cb4094f2873837e90a24 (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 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fd4c791..0b1de70 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,13 @@ all: uzbl uzblctrl
PREFIX?=$(DESTDIR)/usr
# When compiling unit tests, compile uzbl as a library first
-test: uzbl.o
+tests: uzbl.o
$(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
cd ./tests/; $(MAKE)
+test: uzbl
+ ./uzbl --uri http://www.uzbl.org --verbose
+
test-dev: uzbl
XDG_DATA_HOME=./examples/data XDG_CONFIG_HOME=./examples/config ./uzbl --uri http://www.uzbl.org --verbose