X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=01a1d3bf021f4b6a30d49eb34e1e176b3839aeb3;hb=8a418b10221bb90700829e7f89ddedf2e30ad84e;hp=cc56b5efa139745e6e4039b42fb0a328a40c47e1;hpb=4f7387b9c2f8e427bff72a05dc547730937a242a;p=nepi.git

diff --git a/Makefile b/Makefile
index cc56b5ef..01a1d3bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
+TESTLIB  = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
-# stupid distutils, it's broken in so many ways
 SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
 	      print "lib.%s-%s" % (distutils.util.get_platform(), \
 	      sys.version[0:3])')
@@ -16,15 +16,15 @@ else
 BUILDDIR := $(BUILDDIR)/lib
 endif
 
-PYPATH = $(BUILDDIR):$(PYTHONPATH)
+PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
-all:
-	./setup.py build
+all: clean
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
 
 install: all
-	./setup.py install
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
 
 test: all
 	retval=0; \
@@ -33,6 +33,10 @@ test: all
 	       PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
 	       done; exit $$retval
 
+test-one: all
+	echo $(file) $(case)
+	PYTHONPATH="$(PYPATH)" $(file) $(case)
+
 coverage: all
 	rm -f .coverage
 	for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
@@ -44,8 +48,8 @@ coverage: all
 	rm -f .coverage
 
 clean:
-	./setup.py clean
 	rm -f `find -name \*.pyc` .coverage *.pcap
+	rm -rf "$(BUILDDIR)"
 
 distclean: clean
 	rm -rf "$(DISTDIR)"