build: create poni/version.py by default + some cleanups

Makefile

@@ -1,9 +1,12 @@
 rst2html=rst2html
 
-all: dist doc readme example-doc
+all: poni/version.py dist doc readme example-doc
 
 include package.mk
 
+poni/version.py: version.py
+	python $< $@
+
 dist: doc readme
 	python setup.py sdist
 
@@ -27,11 +30,12 @@ examples/db-cluster/README.html: examples/db-cluster/README.rst
 	$(rst2html) $< $@
 
 clean: deb-clean
-	rm -rf dist/ build/ poni.egg-info/ poni/*.pyc cover/ examples/puppet/README.html examples/db-cluster/README.html README.html README.txt *.pyc
-	(cd doc && make clean)
-	rm -f /tmp/poni_$(shell git describe).diff.*
-	rm -f ../poni?$(shell git describe)*
-	rm -f ../poni?$(shell git describe --abbrev=0)-*.tar.gz
+	$(RM) -r dist/ build/ poni.egg-info/ cover/
+	$(RM) poni/version.py poni/*.pyc tests/*.pyc *.pyc README.html README.txt \
+		examples/puppet/README.html examples/db-cluster/README.html
+	$(RM) ../poni?$(shell git describe)* \
+		../poni?$(shell git describe --abbrev=0)-*.tar.gz
+	$(MAKE) -C doc clean
 
 build-dep:
 	apt-get --yes install python-setuptools python-docutils lynx

doc/Makefile

@@ -34,7 +34,7 @@ help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 clean:
-	-rm -rf $(BUILDDIR)/*
+	-$(RM) -r $(BUILDDIR)/
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

package.mk

@@ -9,10 +9,8 @@ base = $(shell basename $(path))
 export DEBFULLNAME := Mika Eloranta
 export DEBEMAIL := mika.eloranta@gmail.com
 
-rpm:
-	echo "__version__ = '$(version)'" > poni/version.py
+rpm: poni/version.py
 	cd .. ; tar -zcv --exclude=*~ --exclude=.git -f $(base)-$(version).tar.gz $(base)
-	$(RM) poni/version.py
 	rpmbuild -ta ../$(base)-$(version).tar.gz \
 		--define 'full_version $(version)' \
 		--define 'major_version $(major_version)' \
@@ -30,10 +28,9 @@ deb-debuild: debian
 	debuild -us -uc
 
 deb-clean:
-	rm -rf debian/
+	$(RM) -r debian/
 
 deb: debian
 	dpkg-buildpackage -A -us -uc
 
 .PHONY: debian
-

version.py

@@ -30,3 +30,7 @@ def get_project_version(version_file):
                         % version_file)
 
     return file_ver
+
+if __name__ == "__main__":
+    import sys
+    get_project_version(sys.argv[1])