mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add back a configure target

Browse source 
Otherwise, make reconfigures every time and then rebuilds all files.

I went too far in 3af9f5ed1a. All that's
needed is to make the configure target not use Build/SysConfig.hs as the
target name, so make won't delete that file after a failed build.

This commit was supported by the NSF-funded DataLad project
This commit is contained in:
Joey Hess 2017-02-24 11:27:00 -04:00
parent 35739a74c2
commit 02d3fbbd8b
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

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