X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=01a1d3bf021f4b6a30d49eb34e1e176b3839aeb3;hb=76ec8fbc6c987d4208dd6d987de55a2ca543962f;hp=1a3420c2fe4a13f2430539d8279f4dfcf03668ef;hpb=5d80869516dfcecb8e7fe6f117e2fb658b57b25b;p=nepi.git

diff --git a/Makefile b/Makefile
index 1a3420c2..01a1d3bf 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ 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])')
@@ -21,7 +20,7 @@ PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
-all:
+all: clean
 	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
 
 install: all
@@ -30,13 +29,13 @@ install: all
 test: all
 	retval=0; \
 	       for i in `find "$(TESTDIR)" -iname '*.py' -perm -u+x -type f`; do \
-	       @echo $$i; \
+	       echo $$i; \
 	       PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
 	       done; exit $$retval
 
 test-one: all
-	@echo $(file) $(case)
-	PYTHONPATH="$(PYPATH)" python $(file) $(case)
+	echo $(file) $(case)
+	PYTHONPATH="$(PYPATH)" $(file) $(case)
 
 coverage: all
 	rm -f .coverage
@@ -49,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)"