diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-26 09:16:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-26 09:16:08 -0400 |
| commit | 75e8690ccae90dec358f701dadb60d18aa473105 (patch) | |
| tree | 3b9fa6e314bd6e3531f0f0b84b1e967e56993178 /GitAnnex.hs | |
| parent | 05c4dfb9411e54c21aa4c0d49e3662117ac2f549 (diff) | |
| parent | 41fcb3d852d756ed218f3458af1ff9c7ae6d0e1d (diff) | |
Merge branch 'master' into assistant
Conflicts:
GitAnnex.hs
Diffstat (limited to 'GitAnnex.hs')
| -rw-r--r-- | GitAnnex.hs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs index ee451352f..748a9b23e 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -5,6 +5,8 @@ - Licensed under the GNU GPL version 3 or higher. -} +{-# LANGUAGE CPP #-} + module GitAnnex where import System.Console.GetOpt @@ -58,8 +60,10 @@ import qualified Command.Import import qualified Command.Map import qualified Command.Upgrade import qualified Command.Version +#ifdef WITH_ASSISTANT import qualified Command.Watch import qualified Command.Assistant +#endif cmds :: [Command] cmds = concat @@ -101,8 +105,10 @@ cmds = concat , Command.Map.def , Command.Upgrade.def , Command.Version.def +#ifdef WITH_ASSISTANT , Command.Watch.def , Command.Assistant.def +#endif ] options :: [Option] |