Refactored build of executable and library.

15 files changed, 56 insertions, 13 deletions

diff --git a/kiki.cabal b/kiki.cabal
index 176d09c..c79f313 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -1,7 +1,7 @@
 
 Name:                kiki
 Version:             0.0.3
-cabal-version:       >= 1.6
+cabal-version:       >= 1.8
 Synopsis:            A bridge between (cryptographic) keys
 Description:         gpg operations... TODO
 License:             Undecided
@@ -23,15 +23,20 @@ Executable kiki
     Main-is: kiki.hs
     -- base >=4.6 due to use of readEither in KikiD.Message
     Build-Depends:   base >=4.6.0.0,
-                     directory -any,
-                     openpgp-util -any,
-                     asn1-types -any, asn1-encoding -any,
-                     dataenc -any, text -any, pretty -any, pretty-show -any,
-                     bytestring -any, binary -any,
-                     unix, time,
-                     containers -any, process -any, filepath -any,
-                     network -any, old-locale -any, zlib -any,
-                     tar
+                     asn1-encoding,
+                     asn1-types,
+                     binary,
+                     bytestring,
+                     containers,
+                     dataenc,
+                     directory,
+                     filepath,
+                     tar,
+                     text,
+                     time,
+                     unix,
+                     openpgp-util,
+                     kiki
     if !flag(cryptonite)
       Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
                        crypto-pubkey-types -any
@@ -41,12 +46,50 @@ Executable kiki
         Build-Depends:   x509 <1.6
     else
       Build-Depends:   cryptonite, x509 >=1.6, memory, hourglass
-    ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
-    c-sources: dotlock.c
 
 Executable hosts
     Main-is: hosts.hs
+    buildable: False
     c-sources: dotlock.c
 
 library
-    exposed-modules: KeyRing
+    hs-source-dirs:  lib
+    exposed-modules: KeyRing,
+                     ScanningParser,
+                     PEM,
+                     DotLock,
+                     Base58,
+                     CryptoCoins,
+                     ProcessUtils
+    other-modules:   Hosts,
+                     TimeUtil,
+                     Compat,
+                     FunctorToMaybe
+
+    Build-Depends:   base >=4.6.0.0,
+                     asn1-encoding,
+                     asn1-types,
+                     binary,
+                     bytestring,
+                     containers,
+                     dataenc,
+                     directory,
+                     filepath,
+                     network,
+                     pretty-show,
+                     process,
+                     text,
+                     time,
+                     unix,
+                     zlib,
+                     openpgp-util
+    if !flag(cryptonite)
+      Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
+                       crypto-pubkey-types -any
+      if flag(hourglass)
+        Build-Depends:   hourglass -any, x509 >=1.5 && <1.6
+      else
+        Build-Depends:   x509 <1.6
+    else
+      Build-Depends:   cryptonite, x509 >=1.6, memory, hourglass
+    c-sources: lib/dotlock.c
diff --git a/Base58.hs b/lib/Base58.hs
index 3c1a113..3c1a113 100644
--- a/Base58.hs
+++ b/lib/Base58.hs
diff --git a/Compat.hs b/lib/Compat.hs
index 3b77851..3b77851 100644
--- a/Compat.hs
+++ b/lib/Compat.hs
diff --git a/ControlMaybe.hs b/lib/ControlMaybe.hs
index 659dab7..659dab7 100644
--- a/ControlMaybe.hs
+++ b/lib/ControlMaybe.hs
diff --git a/CryptoCoins.hs b/lib/CryptoCoins.hs
index f417036..f417036 100644
--- a/CryptoCoins.hs
+++ b/lib/CryptoCoins.hs
diff --git a/DotLock.hs b/lib/DotLock.hs
index af05f5d..af05f5d 100644
--- a/DotLock.hs
+++ b/lib/DotLock.hs
diff --git a/FunctorToMaybe.hs b/lib/FunctorToMaybe.hs
index 658b024..658b024 100644
--- a/FunctorToMaybe.hs
+++ b/lib/FunctorToMaybe.hs
diff --git a/Hosts.hs b/lib/Hosts.hs
index 5f09de1..5f09de1 100644
--- a/Hosts.hs
+++ b/lib/Hosts.hs
diff --git a/KeyRing.hs b/lib/KeyRing.hs
index 0fbf2c2..0fbf2c2 100644
--- a/KeyRing.hs
+++ b/lib/KeyRing.hs
diff --git a/PEM.hs b/lib/PEM.hs
index e07b3d4..e07b3d4 100644
--- a/PEM.hs
+++ b/lib/PEM.hs
diff --git a/ProcessUtils.hs b/lib/ProcessUtils.hs
index 4e3ac38..4e3ac38 100644
--- a/ProcessUtils.hs
+++ b/lib/ProcessUtils.hs
diff --git a/ScanningParser.hs b/lib/ScanningParser.hs
index f99e120..f99e120 100644
--- a/ScanningParser.hs
+++ b/lib/ScanningParser.hs
diff --git a/TimeUtil.hs b/lib/TimeUtil.hs
index 879bc32..879bc32 100644
--- a/TimeUtil.hs
+++ b/lib/TimeUtil.hs
diff --git a/dotlock.c b/lib/dotlock.c
index c111159..c111159 100644
--- a/dotlock.c
+++ b/lib/dotlock.c
diff --git a/dotlock.h b/lib/dotlock.h
index 3fb9bcb..3fb9bcb 100644
--- a/dotlock.h
+++ b/lib/dotlock.h