diff options
| -rw-r--r-- | Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -14,15 +14,11 @@ endif build: $(all) -Build/SysConfig.hs: Build/TestConfig.hs Build/Configure.hs +git-annex: if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi - if [ "$(BUILDER)" = stack ]; then \ - $(BUILDER) build $(BUILDEROPTIONS); \ - else \ + if [ "$(BUILDER)" != stack ]; then \ $(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \ fi - -git-annex: Build/SysConfig.hs $(BUILDER) build $(BUILDEROPTIONS) if [ "$(BUILDER)" = stack ]; then \ ln -sf $$(find .stack-work/ -name git-annex -type f | grep build/git-annex/git-annex | tail -n 1) git-annex; \ @@ -112,7 +108,7 @@ Build/InstallDesktopFile: Build/InstallDesktopFile.hs $(GHC) --make $@ -Wall -fno-warn-tabs Build/EvilSplicer: Build/EvilSplicer.hs $(GHC) --make $@ -Wall -fno-warn-tabs -Build/Standalone: Build/Standalone.hs Build/SysConfig.hs +Build/Standalone: Build/Standalone.hs git-annex $(GHC) --make $@ -Wall -fno-warn-tabs Build/OSXMkLibs: Build/OSXMkLibs.hs $(GHC) --make $@ -Wall -fno-warn-tabs @@ -123,8 +119,8 @@ Build/MakeMans: Build/MakeMans.hs LINUXSTANDALONE_DEST=tmp/git-annex.linux linuxstandalone: - $(MAKE) git-annex linuxstandalone-nobuild -linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs + $(MAKE) git-annex linuxstandalone-image +linuxstandalone-image: Build/Standalone Build/LinuxMkLibs rm -rf "$(LINUXSTANDALONE_DEST)" mkdir -p tmp cp -R standalone/linux/skel "$(LINUXSTANDALONE_DEST)" |