diff options
author | Joey Hess <joey@kitenet.net> | 2012-06-04 12:07:59 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-06-04 12:07:59 -0400 |
commit | eab3872d9145e7733cf69d4e8c696ff075081081 (patch) | |
tree | 57734bec5d1d3aa59c2fc4e07813298af44789db /Makefile | |
parent | d5ffd2d99d0da587e55b31994dae658c2bb6d9d9 (diff) | |
parent | 619d765646a23d7f22ac8c0dd256be10a5a278f7 (diff) |
Merge branch 'master' into watch
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ PREFIX=/usr IGNORE=-ignore-package monads-fd -BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility +BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 GHCFLAGS=-O2 $(BASEFLAGS) ifdef PROFILE @@ -12,7 +12,7 @@ GHCMAKE=ghc $(GHCFLAGS) --make bins=git-annex mans=git-annex.1 git-annex-shell.1 sources=Build/SysConfig.hs Utility/Touch.hs -clibs=Utility/diskfree.o +clibs=Utility/libdiskfree.o all=$(bins) $(mans) docs |