From d28242c03e368690ba8557564be321bc341f39f8 Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Wed, 22 Dec 2010 12:32:13 +0000
Subject: tweak gf-server.cabal

---
 src/server/gf-server.cabal | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'src/server/gf-server.cabal')

diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal
index fe7ad17c8..b993294d3 100644
--- a/src/server/gf-server.cabal
+++ b/src/server/gf-server.cabal
@@ -3,24 +3,19 @@ version: 1.0
 cabal-version: >= 1.2
 build-type: Custom
 license: GPL
-license-file: LICENSE
+license-file: ../../LICENSE
 synopsis: FastCGI Server for Grammatical Framework
 
 flag fastcgi
-  Description: Build pgf-fcgi (requires the fastcgi package)
+  Description: Build the fcgi services (requires the fastcgi package)
   Default:     True
 
-executable pgf-fcgi
-  main-is: pgf-fcgi.hs
+executable pgf-http
+  main-is: pgf-http.hs
   other-modules: PGFService FastCGIUtils Cache URLEncoding
+                 RunHTTP ServeStaticFile
   ghc-options: -threaded
 
-  if flag(fastcgi)
-    build-depends: fastcgi >= 3001.0.2.2
-    buildable: True
-  else
-    buildable: False
-
   build-depends: base >=4.2 && <5,
                  old-time,
                  directory,
@@ -29,6 +24,7 @@ executable pgf-fcgi
                  process,
                  gf >= 3.1,
                  cgi >= 3001.1.8.0,
+                 httpd-shed,
                  network,
                  json >= 0.3.3,
                  utf8-string >= 0.3.1.1,
@@ -40,13 +36,17 @@ executable pgf-fcgi
   else
     build-depends: unix
 
-
-executable pgf-http
-  main-is: pgf-http.hs
+executable pgf-service
+  main-is: pgf-fcgi.hs
   other-modules: PGFService FastCGIUtils Cache URLEncoding
-                 RunHTTP ServeStaticFile
   ghc-options: -threaded
 
+  if flag(fastcgi)
+    build-depends: fastcgi >= 3001.0.2.2
+    buildable: True
+  else
+    buildable: False
+
   build-depends: base >=4.2 && <5,
                  old-time,
                  directory,
@@ -55,7 +55,6 @@ executable pgf-http
                  process,
                  gf >= 3.1,
                  cgi >= 3001.1.8.0,
-                 httpd-shed,
                  network,
                  json >= 0.3.3,
                  utf8-string >= 0.3.1.1,
@@ -67,7 +66,13 @@ executable pgf-http
   else
     build-depends: unix
 
-executable content-server
-  buildable: False
-  build-depends: base >=4.2 && <5
+executable content-service
+  if flag(fastcgi)
+    build-depends: fastcgi >= 3001.0.2.2
+    buildable: True
+  else
+    buildable: False
+
+  build-depends: base >=4.2 && <5,
+                 hsql, hsql-mysql, old-locale
   main-is: ContentService.hs
-- 
cgit v1.2.3