From f534fcc7b1a01f30e4ee41a0a364fe2cbf25d5a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Jan 2012 23:14:10 -0400 Subject: remove S3stub stuff Let's keep that in a no-s3 branch, which can be merged into eg, debian-stable. --- Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3