X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=a20e532ee9075d8e96a11ac37318c5a367d7aaba;hb=00fbb3b2a6301e9694386480e44eaad4f59ee83c;hp=09e0ee534079dc54e3a20a999212e4ef00b18ce7;hpb=8dd9c3e21395c846c1401175f605a834f7161c2f;p=uzbl-mobile

diff --git a/Makefile b/Makefile
index 09e0ee5..a20e532 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,63 @@
-CPPFLAGS:=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -ggdb -Wall -W -std=gnu99 -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) $(LDFLAGS)
+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)
 all: uzbl uzblctrl
 
 PREFIX?=$(DESTDIR)/usr
 
-test: uzbl
-	./uzbl --uri http://www.uzbl.org
+# When compiling unit tests, compile uzbl as a library first
+test: uzbl.o
+	$(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so
+	cd ./tests/; $(MAKE)
 
-test-config: uzbl
-	./uzbl --uri http://www.uzbl.org < examples/configs/sampleconfig-dev
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+#test-report perf-report full-report:    ${TEST_PROGS}
+#	@test -z "${TEST_PROGS}" || { \
+#          case $@ in \
+#          test-report) test_options="-k";; \
+#          perf-report) test_options="-k -m=perf";; \
+#          full-report) test_options="-k -m=perf -m=slow";; \
+#          esac ; \
+#          if test -z "$$GTESTER_LOGDIR" ; then  \
+#            ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+#          elif test -n "${TEST_PROGS}" ; then \
+#            ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+#          fi ; \
+#        }
+#	@ ignore_logdir=true ; \
+#          if test -z "$$GTESTER_LOGDIR" ; then \
+#            GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+#            ignore_logdir=false ; \
+#          fi ; \
+#          for subdir in $(SUBDIRS) . ; do \
+#            test "$$subdir" = "." -o "$$subdir" = "po" || \
+#            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+#          done ; \
+#          $$ignore_logdir || { \
+#            echo '<?xml version="1.0"?>' > $@.xml ; \
+#            echo '<report-collection>'  >> $@.xml ; \
+#            for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+#              sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+#            done ; \
+#            echo >> $@.xml ; \
+#            echo '</report-collection>' >> $@.xml ; \
+#            rm -rf "$$GTESTER_LOGDIR"/ ; \
+#            ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
+#          }
 
-test-config-real: uzbl
-	./uzbl --uri http://www.uzbl.org < /usr/share/uzbl/examples/configs/sampleconfig
+test-dev: uzbl
+	XDG_DATA_HOME=./examples/data               XDG_CONFIG_HOME=./examples/config               ./uzbl --uri http://www.uzbl.org --verbose
 
+test-share: uzbl
+	XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose
+
+	
 clean:
 	rm -f uzbl
 	rm -f uzblctrl
+	rm -f uzbl.o
+	cd ./tests/; $(MAKE) clean
 
 install:
 	install -d $(PREFIX)/bin
@@ -26,7 +68,6 @@ install:
 	cp -ax docs     $(PREFIX)/share/uzbl/
 	cp -ax config.h $(PREFIX)/share/uzbl/docs/
 	cp -ax examples $(PREFIX)/share/uzbl/
-	cp -ax uzbl.png $(PREFIX)/share/uzbl/
 	install -D -m644 AUTHORS $(PREFIX)/share/uzbl/docs
 	install -D -m644 README  $(PREFIX)/share/uzbl/docs