Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags.
The only thing lost is ./ghci Speed: make fast used to take 20 seconds here, when rebuilding from touching Command/Unused.hs. With cabal, it's 29 seconds.
This commit is contained in:
parent
32aee1bb3e
commit
cbd53b4a8c
18 changed files with 56 additions and 141 deletions
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -22,6 +22,8 @@ git-annex (4.20130217) UNRELEASED; urgency=low
|
|||
the Glob library.
|
||||
* copy: Update location log when no copy was performed, if the location
|
||||
log was out of date.
|
||||
* Makefile now builds using cabal, taking advantage of cabal's automatic
|
||||
detection of appropriate build flags.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Sun, 17 Feb 2013 16:42:16 -0400
|
||||
|
||||
|
|
13
debian/rules
vendored
13
debian/rules
vendored
|
@ -1,21 +1,8 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-yesod-dev 2>/dev/null))
|
||||
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_HOST -DWITH_PAIRING -DWITH_XMPP -DWITH_OLD_HTTP_CONDUIT -DWITH_WEBAPP -DWITH_OLD_YESOD
|
||||
else
|
||||
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_HOST -DWITH_PAIRING -DWITH_XMPP -DWITH_OLD_HTTP_CONDUIT
|
||||
endif
|
||||
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-dav-dev 2>/dev/null))
|
||||
export FEATURES:=${FEATURES} -DWITH_WEBDAV
|
||||
endif
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
# Builds standalone tarball with the same FEATURES as debian package.
|
||||
standalone:
|
||||
$(MAKE) linuxstandalone
|
||||
|
||||
# Not intended for use by anyone except the author.
|
||||
announcedir:
|
||||
@echo ${HOME}/src/git-annex/doc/news
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue