diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | git-annex.cabal | 35 |
2 files changed, 20 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 9cbe2d692..68737eda1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ git-annex (4.20130710) UNRELEASED; urgency=low * Rsync.net have committed to support git-annex and offer a special discounted rate for git-annex users. Updated the webapp to reflect this. 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 diff --git a/git-annex.cabal b/git-annex.cabal index 82aa21671..831aada96 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -103,7 +103,7 @@ Executable git-annex Build-Depends: hS3 CPP-Options: -DWITH_S3 - if flag(WebDAV) + if flag(WebDAV) && flag(Assistant) Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV @@ -115,23 +115,24 @@ Executable git-annex Build-Depends: data-endian CPP-Options: -D__ANDROID__ - if os(linux) && flag(Inotify) - Build-Depends: hinotify - CPP-Options: -DWITH_INOTIFY - else - if os(darwin) - Build-Depends: hfsevents - CPP-Options: -DWITH_FSEVENTS + if flag(Assistant) + if os(linux) && flag(Inotify) + Build-Depends: hinotify + CPP-Options: -DWITH_INOTIFY else - if (! os(windows) && ! os(solaris) && ! os(linux)) - CPP-Options: -DWITH_KQUEUE - C-Sources: Utility/libkqueue.c - - if os(linux) && flag(Dbus) + if os(darwin) + Build-Depends: hfsevents + CPP-Options: -DWITH_FSEVENTS + else + if (! os(windows) && ! os(solaris) && ! os(linux)) + CPP-Options: -DWITH_KQUEUE + C-Sources: Utility/libkqueue.c + + if os(linux) && flag(Dbus) && flag(Assistant) Build-Depends: dbus (>= 0.10.3) CPP-Options: -DWITH_DBUS - if flag(Webapp) + if flag(Webapp) && flag(Assistant) Build-Depends: yesod, yesod-default, yesod-static, yesod-form, yesod-core, case-insensitive, http-types, transformers, wai, wai-logger, warp, @@ -140,15 +141,15 @@ Executable git-annex CPP-Options: -DWITH_WEBAPP GHC-Options: -threaded - if flag(Pairing) + if flag(Pairing) && flag(WebApp) Build-Depends: network-multicast, network-info CPP-Options: -DWITH_PAIRING - if flag(XMPP) + if flag(XMPP) && flag(Assistant) Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types CPP-Options: -DWITH_XMPP - if flag(DNS) + if flag(DNS) && flag(WebApp) Build-Depends: dns CPP-Options: -DWITH_DNS |