aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Robert Manea <gotmor@gmail.com>2009-10-24 10:38:36 +0200
committerGravatar Robert Manea <gotmor@gmail.com>2009-10-24 10:38:36 +0200
commitddf66ef50c46eb50466282e4c0700c0baff8344c (patch)
treef17f9b239d388b3738d3dce2e829d595ad632b9f /Makefile
parent9eae868af1fc7c73d9776166d1135d13f472f858 (diff)
parent2ff6b2e51b1431f9698ceb46f5f3310541dce120 (diff)
Merge branch 'master' of git://github.com/bct/uzbl into experimental
Conflicts: uzbl-core.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 65a2760..71bd0f5 100644
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,13 @@ uzbl-browser: uzbl-core
PREFIX?=$(DESTDIR)/usr/local
+# the 'tests' target can never be up to date
+.PHONY: tests
+force:
+
# When compiling unit tests, compile uzbl as a library first
-tests: uzbl-core.o uzbl-events.o
- $(CC) -DUZBL_LIBRARY -shared -Wl uzbl-core.o uzbl-events.o -o ./tests/libuzbl-core.so
+tests: ${OBJ} force
+ $(CC) -shared -Wl ${OBJ} -o ./tests/libuzbl-core.so
cd ./tests/; $(MAKE)
test: uzbl-core