Revert "Simplify Cabal file"

This reverts commit ba56a44aac4585071e4ac09a66401939c3032424.

    $ cabal new-build --dry-run --disable-tests --disable-benchmarks
    Resolving dependencies...
    Error:
        Internal libraries only supported with per-component builds.
        Per-component builds were disabled because build-type is Custom
        In the inplace package 'bustle-0.7.5.1'

2 files changed, 85 insertions, 33 deletions

diff --git a/main/Bustle.hs b/Bustle.hs
index 0236569..0236569 100644
--- a/main/Bustle.hs
+++ b/Bustle.hs
diff --git a/bustle.cabal b/bustle.cabal
index b1d43ee..32cd1bf 100644
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -76,25 +76,9 @@ Flag threaded
   Description:    Build with the multi-threaded runtime
   Default:        True
 
-common shared-properties
-  default-language: Haskell2010
-  Ghc-options: -Wall
-               -fno-warn-unused-do-bind
-
-
 Executable bustle
-  import: shared-properties
   Main-is:       Bustle.hs
-  hs-source-dirs: main
-  Build-Depends: bustle-internal
-  if flag(threaded)
-    ghc-options: -threaded
-  Build-Depends: base
-               , glib
-
-Library bustle-internal
-  import: shared-properties
-  Exposed-modules: Bustle.Application.Monad
+  Other-modules: Bustle.Application.Monad
                , Bustle.Diagram
                , Bustle.GDBusMessage
                , Bustle.GVariant
@@ -122,6 +106,11 @@ Library bustle-internal
                , Bustle.Util
                , Paths_bustle
   autogen-modules: Paths_bustle
+  default-language: Haskell2010
+  Ghc-options: -Wall
+               -fno-warn-unused-do-bind
+  if flag(threaded)
+    ghc-options: -threaded
   C-sources: c-sources/pcap-reader.c
            , c-sources/pcap-monitor.c
   cc-options: -fPIC -g
@@ -155,43 +144,106 @@ Library bustle-internal
                   , src-no-hgettext
 
 Executable dump-messages
-  import: shared-properties
   if flag(InteractiveTests)
     buildable: True
   else
     buildable: False
 
-  hs-source-dirs: Test
-  main-is: DumpMessages.hs
-  Build-Depends: bustle-internal
+  main-is: Test/DumpMessages.hs
+  default-language: Haskell2010
+  Build-Depends: base
+               , bytestring
+               , containers
+               , mtl
+               , text
+               , transformers
+
+  if flag(hgettext)
+      Build-Depends: hgettext >= 0.1.5
+                   , setlocale
+      other-modules: GetText_bustle
+      autogen-modules: GetText_bustle
+      hs-source-dirs: .
+                    , src-hgettext
+  else
+      hs-source-dirs: .
+                    , src-no-hgettext
 
 Test-suite test-pcap-crash
-    import: shared-properties
     type: exitcode-stdio-1.0
-    hs-source-dirs: Test
-    main-is: PcapCrash.hs
+    main-is: Test/PcapCrash.hs
+    other-modules: Bustle.GDBusMessage
+                 , Bustle.GVariant
+                 , Bustle.Loader.Pcap
+                 , Bustle.Reader
+                 , Bustle.Translation
+                 , Bustle.Types
+    default-language: Haskell2010
     Build-Depends: base
-                 , bustle-internal
+                 , bytestring
+                 , containers
+                 , glib
+                 , mtl
+                 , text
+                 , transformers
+    C-sources: c-sources/pcap-reader.c
+    pkgconfig-depends: glib-2.0 >= 2.54,
+                       gio-unix-2.0
+    extra-libraries: pcap
+    if flag(hgettext)
+        Build-Depends: hgettext >= 0.1.5
+                     , setlocale
+        other-modules: GetText_bustle
+        autogen-modules: GetText_bustle
+        hs-source-dirs: .
+                      , src-hgettext
+    else
+        hs-source-dirs: .
+                      , src-no-hgettext
 
 Test-suite test-regions
-    import: shared-properties
     type: exitcode-stdio-1.0
-    hs-source-dirs: Test
-    main-is: Regions.hs
+    main-is: Test/Regions.hs
+    other-modules: Bustle.Regions
+    default-language: Haskell2010
     Build-Depends: base
-                 , bustle-internal
                  , QuickCheck
 
 Test-suite test-renderer
-    import: shared-properties
     type: exitcode-stdio-1.0
-    hs-source-dirs: Test
-    main-is: Renderer.hs
+    main-is: Test/Renderer.hs
+    other-modules: Bustle.Diagram
+                 , Bustle.GDBusMessage
+                 , Bustle.GVariant
+                 , Bustle.Marquee
+                 , Bustle.Regions
+                 , Bustle.Renderer
+                 , Bustle.Translation
+                 , Bustle.Types
+                 , Bustle.Util
+
+    default-language: Haskell2010
     Build-Depends: base
-                 , bustle-internal
+                 , cairo
                  , containers
+                 , directory
+                 , filepath
+                 , glib
+                 , gtk3
                  , mtl
+                 , text
+                 , pango
                  , test-framework
                  , test-framework-hunit
                  , transformers
                  , HUnit
+    if flag(hgettext)
+        Build-Depends: hgettext >= 0.1.5
+                     , setlocale
+        other-modules: GetText_bustle
+        autogen-modules: GetText_bustle
+        hs-source-dirs: .
+                      , src-hgettext
+    else
+        hs-source-dirs: .
+                      , src-no-hgettext