Merge remote branch 'upstream/master'

[cython.git] / Makefile

diff --git a/Makefile b/Makefile
index d6aa5601c9ed254c799d003cf5e4312dc0b1cb77..7a95311b3052258fc06f55b18e95a072f26e09d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,37 @@
 PYTHON?=python
+REPO = git://github.com/cython/cython.git
 
 all:    local 
 
 local:
        ${PYTHON} setup.py build_ext --inplace
 
+.git: REV := $(shell cat .gitrev)
+.git: TMPDIR := $(shell mktemp -d tmprepo.XXXXXX)
+.git: 
+       rm -rf $(TMPDIR)
+       git clone $(REPO) $(TMPDIR)
+       cd $(TMPDIR); git checkout -b working $(REV)
+       mv $(TMPDIR)/.hgtags .
+       mv $(TMPDIR)/.hgignore .
+       mv $(TMPDIR)/.git .
+       mv $(TMPDIR)/Doc/s5 Doc/s5
+       rm -rf $(TMPDIR)
+
+repo: .git
+
+
 clean:
        @echo Cleaning Source
        @rm -fr build
-       @rm -f *.pyc */*.pyc */*/*.pyc 
+       @rm -f *.py[co] */*.py[co] */*/*.py[co] */*/*/*.py[co]
+       @rm -f *.so */*.so */*/*.so 
+       @rm -f *.pyd */*.pyd */*/*.pyd 
        @rm -f *~ */*~ */*/*~
        @rm -f core */core
-       @rm -f Cython/Compiler/Parsing.{c,so,pyd}
-       @rm -f Cython/Compiler/Scanning.{c,so,pyd}
-       @rm -f Cython/Compiler/Visitor.{c,so,pyd}
-       @rm -f Cython/Plex/Scanners.{c,so,pyd}
+       @rm -f Cython/Compiler/*.c
+       @rm -f Cython/Plex/*.c
+       @rm -f Cython/Runtime/refnanny.c
        @(cd Demos; $(MAKE) clean)
 
 testclean:
@@ -23,9 +40,5 @@ testclean:
 test:  testclean
        ${PYTHON} runtests.py -vv
 
-test3: testclean
-       ${PYTHON} runtests.py --no-cleanup
-       python3.0 runtests.py -vv --no-cython
-
 s5:
        $(MAKE) -C Doc/s5 slides