Clean up the configurator code in the CLI app.

[dead/harbl.git] / harbl.cabal

diff --git a/harbl.cabal b/harbl.cabal
index 8f4401fd7e0c823baba01f34fd49ba472e2110fd..e59c437936ea25da43fbea516370c33731563479 100644 (file)
--- a/harbl.cabal
+++ b/harbl.cabal
@@ -17,6 +17,7 @@ library
   build-depends:
     base                        >= 4.6 && < 5,
     bytestring                  >= 0.9,
+    cmdargs                     >= 0.10.6,
     dns                         >= 2,
     iproute                     >= 1.4,
     parsec                      >= 3,
@@ -25,16 +26,27 @@ library
 
   exposed-modules:
     Network.DNS.RBL
+    Network.DNS.RBL.Tests
+    Network.DNS.RBL.Weight
 
   other-modules:
-    Network.DNS.RBL.Domain
+    Network.DNS.RBL.Domain.Digit
+    Network.DNS.RBL.Domain.Domain
+    Network.DNS.RBL.Domain.Hyphen
+    Network.DNS.RBL.Domain.Label
+    Network.DNS.RBL.Domain.LdhStr
+    Network.DNS.RBL.Domain.LdhStrLetDig
+    Network.DNS.RBL.Domain.LetDig
+    Network.DNS.RBL.Domain.LetDigHyp
+    Network.DNS.RBL.Domain.Letter
+    Network.DNS.RBL.Domain.Subdomain
     Network.DNS.RBL.Host
     Network.DNS.RBL.IPv4Pattern
     Network.DNS.RBL.Pretty
+    Network.DNS.RBL.Reversible
     Network.DNS.RBL.Site
 
-  hs-source-dirs:
-    harbl/src/
+  hs-source-dirs: harbl/src
 
   ghc-options:
     -Wall
@@ -65,11 +77,11 @@ executable harbl
     harbl,
     parsec                      >= 3
 
-  main-is:
-    Main.hs
+  main-is: Main.hs
+
+  hs-source-dirs: harbl-cli/src
 
-  hs-source-dirs:
-    harbl-cli/src/
+  -- Other modules needed...
 
   ghc-options:
     -Wall
@@ -92,14 +104,11 @@ executable harbl
 
 test-suite testsuite
   type: exitcode-stdio-1.0
-  hs-source-dirs: src test
+  hs-source-dirs: test
   main-is: TestSuite.hs
   build-depends:
     base                        >= 4.6 && < 5,
-    bytestring                  >= 0.9,
-    dns                         >= 2,
-    iproute                     >= 1.4,
-    parsec                      >= 3,
+    harbl,
     tasty                       >= 0.8,
     tasty-hunit                 >= 0.8