]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
setup: remove specific checks for twisted dependency in makefile
authorZooko O'Whielacronx <zooko@zooko.com>
Tue, 6 May 2008 19:09:00 +0000 (12:09 -0700)
committerZooko O'Whielacronx <zooko@zooko.com>
Tue, 6 May 2008 19:09:00 +0000 (12:09 -0700)
Now that the twisted dependency is handled by the automatic dependency mechanism.

Makefile

index 0541aa64a6ae16405f777cdf57fbf8771253b4e1..98ba5c5b7d848e434facb5adc59a5722e09dd746 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ endif
 
 # TESTING
 
-.PHONY: check-all-deps check-twisted-dep $(CHECK_PYWIN32_DEP) signal-error-deps, signal-error-twisted-dep, signal-error-pywin32-dep, test test-figleaf figleaf-output
+.PHONY: check-all-deps $(CHECK_PYWIN32_DEP) signal-error-deps, signal-error-pywin32-dep, test test-figleaf figleaf-output
 
 
 signal-error-deps:
@@ -124,14 +124,6 @@ signal-error-deps:
        @echo
        exit 1
 
-signal-error-twisted-dep:
-       @echo
-       @echo
-       @echo "ERROR: Twisted is not installed.  Please see docs/install.html for details."
-       @echo
-       @echo
-       exit 1
-
 signal-error-pywin32-dep:
        @echo
        @echo
@@ -153,16 +145,13 @@ check-auto-deps:
 
 check-all-deps: check-deps check-auto-deps
 
-check-twisted-dep:
-       @$(PP) $(PYTHON) -c 'import twisted, zope.interface' || $(MAKE) signal-error-twisted-dep
-
 check-pywin32-dep:
        @$(PP) $(PYTHON) -c 'import win32process' || $(MAKE) signal-error-pywin32-dep
 
 check-pyopenssl-dep:
        @$(PP) $(PYTHON) -c 'import OpenSSL' || $(MAKE) signal-error-pyopenssl-dep
 
-check-deps: check-twisted-dep $(CHECK_PYWIN32_DEP) check-pyopenssl-dep
+check-deps: $(CHECK_PYWIN32_DEP) check-pyopenssl-dep
 
 .checked-deps:
        $(MAKE) check-all-deps