From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 6 May 2008 19:09:00 +0000 (-0700)
Subject: setup: remove specific checks for twisted dependency in makefile
X-Git-Tag: allmydata-tahoe-1.1.0~165
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/flags/-?a=commitdiff_plain;h=a097f45243c876763a404a618cf56e24a2e83acf;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove specific checks for twisted dependency in makefile
Now that the twisted dependency is handled by the automatic dependency mechanism.
---

diff --git a/Makefile b/Makefile
index 0541aa64..98ba5c5b 100644
--- 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