embed debian stuff in main Makefile

diff --git a/Makefile b/Makefile
index df1d311..e093660 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,35 @@ wsdl-clean:
 
 .PHONY: wsdl wsdl-install wsdl-clean
 
-##########
-debian: version
-       $(MAKE) -f Makefile.debian debian
-debian.clean: 
-       $(MAKE) -f Makefile.debian clean
+######################################## debian packaging
+# The 'debian' target is called from the build with the following variables set 
+# (see build/Makefile and target_debian)
+# (.) RPMTARBALL
+# (.) RPMVERSION
+# (.) RPMRELEASE
+# (.) RPMNAME
+#
+PROJECT=$(RPMNAME)
+DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
+DEBTARBALL=../$(PROJECT)_$(DEBVERSION).orig.tar.bz2
+
+DATE=$(shell date -u +"%a, %d %b %Y %T")
+
+debian: debian/changelog debian.source debian.package
+
+debian/changelog: debian/changelog.in
+       sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
+
+debian.source: force 
+       rsync -a $(RPMTARBALL) $(DEBTARBALL)
+
+debian.package:
+       debuild -uc -us -b 
+
+debian.clean:
+       $(MAKE) -f debian/rules clean
+       rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
+       find . -name '*.pyc' -delete
 
 ##########
 tests-install:

diff --git a/Makefile.debian b/Makefile.debian
deleted file mode 100644 (file)
index c4afb77..0000000
--- a/Makefile.debian
+++ /dev/null
@@ -1,33 +0,0 @@
-# This is called from the build with the following variables set 
-# (see build/Makefile and target_debian)
-# (.) RPMTARBALL
-# (.) RPMVERSION
-# (.) RPMRELEASE
-# (.) RPMNAME
-#
-PROJECT=$(RPMNAME)
-#PYVERSION=$(shell python -c "from sfa.util.version import version_tag; print version_tag" | sed -e s,-,.,)
-DEBVERSION=$(RPMVERSION).$(RPMRELEASE)
-DEBTARBALL=../$(PROJECT)_$(DEBVERSION).orig.tar.bz2
-
-DATE=$(shell date -u +"%a, %d %b %Y %T")
-
-debian: debian/changelog debian.source debian.package
-
-force:
-
-debian/changelog: debian/changelog.in
-       sed -e "s|@VERSION@|$(DEBVERSION)|" -e "s|@DATE@|$(DATE)|" debian/changelog.in > debian/changelog
-
-# TARBALL is passed from the main build (/build/Makefile) to the 'make debian' call
-debian.source: force 
-       rsync -a $(RPMTARBALL) $(DEBTARBALL)
-
-debian.package:
-       debuild -uc -us -b 
-
-debian.clean:
-       $(MAKE) -f debian/rules clean
-       rm -rf build/ MANIFEST ../*.tar.gz ../*.dsc ../*.build
-       find . -name '*.pyc' -delete
-