Makefile: convert check-auto-deps target into 'setup.py check_auto_deps'

diff --git a/Makefile b/Makefile
index 1cce5538e7d7b939bfed4756722b60072d3c9fc2..b740374b41819b9a47f590e50cd71a8baabe4610 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ signal-error-deps:
        exit 1
 
 check-auto-deps:
-       @$(PP) $(PYTHON) -c 'import _auto_deps ; _auto_deps.require_auto_deps()' || $(MAKE) signal-error-deps
+       $(PYTHON) setup.py -q check_auto_deps || $(MAKE) signal-error-deps
 
 .checked-deps:
        $(MAKE) check-auto-deps

diff --git a/setup.py b/setup.py
index 7f8c897498b710729f7d6bcd13998bc33b9d67c3..723252b9e4b64102d33118c8b9cfacb90d6509a1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -238,6 +238,17 @@ class ShowPythonPath(Command):
         # Find a way to do this all the time.
         print "PYTHONPATH=%s" % os.environ["PYTHONPATH"]
 
+class CheckAutoDeps(Command):
+    user_options = []
+    def initialize_options(self):
+        pass
+    def finalize_options(self):
+        pass
+    def run(self):
+        import _auto_deps
+        _auto_deps.require_auto_deps()
+
+
 class BuildTahoe(Command):
     user_options = []
     def initialize_options(self):
@@ -374,6 +385,7 @@ setup(name='allmydata-tahoe',
       license='GNU GPL',
       cmdclass={"show_supportlib": ShowSupportLib,
                 "show_pythonpath": ShowPythonPath,
+                "check_auto_deps": CheckAutoDeps,
                 "build_tahoe": BuildTahoe,
                 "trial": Trial,
                 "sdist": MySdist,