Rev 2922: (Andrew Bennetts) Allow overriding the PYTHON executable for 'make extensions', and remove *.so files in 'make clean'. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Oct 22 02:47:14 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2922
revision-id: pqm at pqm.ubuntu.com-20071022014712-mpln8namgmsywr75
parent: pqm at pqm.ubuntu.com-20071019201226-6z006xotgfe7zmu8
parent: andrew.bennetts at canonical.com-20071020032712-9k1ysf8r38tp1siu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-10-22 02:47:12 +0100
message:
  (Andrew Bennetts) Allow overriding the PYTHON executable for 'make extensions', and remove *.so files in 'make clean'.
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
    ------------------------------------------------------------
    revno: 2916.1.1
    merged: andrew.bennetts at canonical.com-20071020032712-9k1ysf8r38tp1siu
    parent: pqm at pqm.ubuntu.com-20071018040514-3hc1k2nj1umg3tig
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: make-extensions-version
    timestamp: Sat 2007-10-20 13:27:12 +1000
    message:
      Allow overriding the PYTHON executable for 'make extensions', and remove *.so files in 'make clean'.
=== modified file 'Makefile'
--- a/Makefile	2007-09-14 06:31:28 +0000
+++ b/Makefile	2007-10-20 03:27:12 +0000
@@ -20,13 +20,15 @@
 
 ### Core Stuff ###
 
+PYTHON=python
+
 .PHONY: all clean extensions pyflakes api-docs
 
 all: extensions
 
 extensions:
 	@echo "building extension modules."
-	python setup.py build_ext -i
+	$(PYTHON) setup.py build_ext -i
 
 check: docs extensions
 	python -Werror -O ./bzr selftest -1v $(tests)
@@ -47,8 +49,7 @@
 
 clean:
 	python setup.py clean
-	-find . -name "*.pyc" -o -name "*.pyo" | xargs rm -f
-	rm -rf test????.tmp
+	-find . -name "*.pyc" -o -name "*.pyo" -o -name "*.so" | xargs rm -f
 
 # Build API documentation
 docfiles = bzr bzrlib




More information about the bazaar-commits mailing list