From c6d2b30c6b2a88247a84e82215fcaf7182ec6f3a Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Tue, 17 Dec 2013 15:55:14 +0000
Subject: [PATCH] src/server/gf-server.cabal: compile it as a common library +
 executables

---
 src/server/{ => exec}/ContentService.hs |  0
 src/server/{ => exec}/MorphoService.hs  |  0
 src/server/{ => exec}/pgf-fcgi.hs       |  0
 src/server/{ => exec}/pgf-http.hs       |  0
 src/server/gf-server.cabal              | 62 +++++++++++--------------
 5 files changed, 27 insertions(+), 35 deletions(-)
 rename src/server/{ => exec}/ContentService.hs (100%)
 rename src/server/{ => exec}/MorphoService.hs (100%)
 rename src/server/{ => exec}/pgf-fcgi.hs (100%)
 rename src/server/{ => exec}/pgf-http.hs (100%)

diff --git a/src/server/ContentService.hs b/src/server/exec/ContentService.hs
similarity index 100%
rename from src/server/ContentService.hs
rename to src/server/exec/ContentService.hs
diff --git a/src/server/MorphoService.hs b/src/server/exec/MorphoService.hs
similarity index 100%
rename from src/server/MorphoService.hs
rename to src/server/exec/MorphoService.hs
diff --git a/src/server/pgf-fcgi.hs b/src/server/exec/pgf-fcgi.hs
similarity index 100%
rename from src/server/pgf-fcgi.hs
rename to src/server/exec/pgf-fcgi.hs
diff --git a/src/server/pgf-http.hs b/src/server/exec/pgf-http.hs
similarity index 100%
rename from src/server/pgf-http.hs
rename to src/server/exec/pgf-http.hs
diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal
index 49b2b8f6f..50a778aec 100644
--- a/src/server/gf-server.cabal
+++ b/src/server/gf-server.cabal
@@ -1,6 +1,6 @@
 name: gf-server
 version: 1.0
-cabal-version: >= 1.2
+cabal-version: >= 1.8
 build-type: Custom
 license: GPL
 license-file: ../../LICENSE
@@ -16,19 +16,13 @@ flag http
   Description: Build pgf-http (deprecated, replaced by gf -server)
   Default: False
 
-executable pgf-http
-  main-is: pgf-http.hs
-  Hs-source-dirs: . transfer
-  ghc-options: -threaded
-  if impl(ghc>=7.0)
-    ghc-options: -rtsopts
+Library
+  exposed-modules: PGFService FastCGIUtils ServeStaticFile RunHTTP
+  other-modules: Cache URLEncoding Fold
+  hs-source-dirs: . transfer
 
-  if flag(http)
-    buildable: True
-    other-modules: PGFService FastCGIUtils Cache URLEncoding
-                   RunHTTP ServeStaticFile Fold
-    build-depends: base >=4.2 && <5,
-                   old-time,
+  build-depends:   base >=4.2 && <5,
+                   time, time-compat,
                    directory,
                    filepath,
                    containers,
@@ -36,23 +30,34 @@ executable pgf-http
                    gf >= 3.1,
                    cgi >= 3001.1.7.3,
                    httpd-shed,
+                   mtl,
                    network,
                    json >= 0.3.3,
                    utf8-string >= 0.3.1.1,
                    bytestring,
                    pretty,
                    random
-    if os(windows)
-      ghc-options: -optl-mwindows
-    else
-      build-depends: unix
+  if os(windows)
+    ghc-options: -optl-mwindows
+  else
+    build-depends: unix
+
+executable pgf-http
+  main-is: pgf-http.hs
+  Hs-source-dirs: exec
+  ghc-options: -threaded
+  if impl(ghc>=7.0)
+    ghc-options: -rtsopts
+
+  if flag(http)
+    buildable: True
+    build-depends: base >=4.2 && <5, gf-server, filepath, directory, cgi
   else
     buildable: False
 
 executable pgf-service
   main-is: pgf-fcgi.hs
-  Hs-source-dirs: . transfer
-  other-modules: PGFService FastCGIUtils Cache URLEncoding Fold
+  Hs-source-dirs: exec
   ghc-options: -threaded
   if impl(ghc>=7.0)
     ghc-options: -rtsopts
@@ -60,22 +65,8 @@ executable pgf-service
   build-depends: fastcgi >= 3001.0.2.2
        -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev
 
-  build-depends: base >=4.2 && <5,
-                 mtl,
-                 time,
-                 time-compat,
-                 directory,
-                 filepath,
-                 containers,
-                 process,
-                 gf >= 3.1,
-                 cgi >= 3001.1.7.3,
-                 network,
-                 json >= 0.3.3,
-                 utf8-string >= 0.3.1.1,
-                 bytestring,
-                 pretty,
-                 random
+  build-depends: base >=4.2 && <5, gf-server
+
   if os(windows)
     ghc-options: -optl-mwindows
   else
@@ -93,3 +84,4 @@ executable content-service
     buildable: False
 
   main-is: ContentService.hs
+  Hs-source-dirs: exec