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

avoid pulling in unneeded dependencies when the assistant is disabled

Browse source
This commit is contained in:
Joey Hess 2013-07-12 15:36:59 -04:00
parent 08385e8552
commit 4b9fa37b72
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -6,6 +6,8 @@ git-annex (4.20130710) UNRELEASED; urgency=low
* Rsync.net have committed to support git-annex and offer a special * Rsync.net have committed to support git-annex and offer a special
discounted rate for git-annex users. Updated the webapp to reflect this. discounted rate for git-annex users. Updated the webapp to reflect this.
http://www.rsync.net/products/git-annex-pricing.html http://www.rsync.net/products/git-annex-pricing.html
* Improve cabal file to avoid unncessary dependencies when building with
the assistant disabled.
-- Joey Hess <joeyh@debian.org> Tue, 09 Jul 2013 19:17:13 -0400 -- Joey Hess <joeyh@debian.org> Tue, 09 Jul 2013 19:17:13 -0400

13
git-annex.cabal
View file

@ -103,7 +103,7 @@ Executable git-annex
Build-Depends: hS3 Build-Depends: hS3
CPP-Options: -DWITH_S3 CPP-Options: -DWITH_S3
if flag(WebDAV) if flag(WebDAV) && flag(Assistant)
Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
CPP-Options: -DWITH_WEBDAV CPP-Options: -DWITH_WEBDAV
@ -115,6 +115,7 @@ Executable git-annex
Build-Depends: data-endian Build-Depends: data-endian
CPP-Options: -D__ANDROID__ CPP-Options: -D__ANDROID__
if flag(Assistant)
if os(linux) && flag(Inotify) if os(linux) && flag(Inotify)
Build-Depends: hinotify Build-Depends: hinotify
CPP-Options: -DWITH_INOTIFY CPP-Options: -DWITH_INOTIFY
@ -127,11 +128,11 @@ Executable git-annex
CPP-Options: -DWITH_KQUEUE CPP-Options: -DWITH_KQUEUE
C-Sources: Utility/libkqueue.c C-Sources: Utility/libkqueue.c
if os(linux) && flag(Dbus) if os(linux) && flag(Dbus) && flag(Assistant)
Build-Depends: dbus (>= 0.10.3) Build-Depends: dbus (>= 0.10.3)
CPP-Options: -DWITH_DBUS CPP-Options: -DWITH_DBUS
if flag(Webapp) if flag(Webapp) && flag(Assistant)
Build-Depends: Build-Depends:
yesod, yesod-default, yesod-static, yesod-form, yesod-core, yesod, yesod-default, yesod-static, yesod-form, yesod-core,
case-insensitive, http-types, transformers, wai, wai-logger, warp, case-insensitive, http-types, transformers, wai, wai-logger, warp,
@ -140,15 +141,15 @@ Executable git-annex
CPP-Options: -DWITH_WEBAPP CPP-Options: -DWITH_WEBAPP
GHC-Options: -threaded GHC-Options: -threaded
if flag(Pairing) if flag(Pairing) && flag(WebApp)
Build-Depends: network-multicast, network-info Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_PAIRING CPP-Options: -DWITH_PAIRING
if flag(XMPP) if flag(XMPP) && flag(Assistant)
Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types
CPP-Options: -DWITH_XMPP CPP-Options: -DWITH_XMPP
if flag(DNS) if flag(DNS) && flag(WebApp)
Build-Depends: dns Build-Depends: dns
CPP-Options: -DWITH_DNS CPP-Options: -DWITH_DNS