summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-05 23:14:10 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-05 23:14:10 -0400
commitf534fcc7b1a01f30e4ee41a0a364fe2cbf25d5a8 (patch)
tree0be416a3e911b29f5c59182840e224e2ee23b754 /Makefile
parentc371c40a889c73b79f7f8918b2918e2fbb75f212 (diff)
remove S3stub stuff
Let's keep that in a no-s3 branch, which can be merged into eg, debian-stable.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 2 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 6805f93d2..93d4567ec 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ GHCMAKE=ghc $(GHCFLAGS) --make
bins=git-annex git-annex-shell git-union-merge
mans=git-annex.1 git-annex-shell.1 git-union-merge.1
-sources=Build/SysConfig.hs Utility/StatFS.hs Utility/Touch.hs Remote/S3.hs
+sources=Build/SysConfig.hs Utility/StatFS.hs Utility/Touch.hs
all=$(bins) $(mans) docs
@@ -33,18 +33,7 @@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs
hsc2hs $<
perl -i -pe 's/^{-# INCLUDE.*//' $@
-Remote/S3.hs:
- @ln -sf S3real.hs Remote/S3.hs
-
-Remote/S3.o: Remote/S3.hs
- @if ! $(GHCMAKE) Remote/S3.hs; then \
- ln -sf S3stub.hs Remote/S3.hs; \
- echo "** building without S3 support"; \
- fi
-
-sources: $(sources)
-
-$(bins): sources Remote/S3.o
+$(bins): $(sources)
$(GHCMAKE) $@
git-annex.1: doc/git-annex.mdwn