From: reid <unknown>
Date: Wed, 27 Jun 2001 19:42:19 +0000 (+0000)
Subject: [project @ 2001-06-27 19:42:19 by reid]
X-Git-Tag: Approximately_9120_patches~1681
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1928f698124fd006958377585ffb37817de1ab76;p=ghc-hetmet.git

[project @ 2001-06-27 19:42:19 by reid]
Inching closer to making the HGL part of the standard build.

This commit is mostly to remove bits of xlib and greencard whch had
crept into the source tree.

ToDo:

- make greencard part of standard build (waiting for response from
  simonM)
- make greencard install libHSgreencard when it builds
- find a autoconf-respecting way of installing the package
- only build xlib and HGL if you have X11 installed
- merge all these changes into HEAD
- should the demos/ tests be built as part of the standard build?
  what's the convention here?
  (Note that the tests can't be used in batch more - you gotta click
  on the window.)
- a little debugging - the tests aren't quite working.
---

diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs
index df14746..c9bb864 100644
--- a/ghc/driver/PackageSrc.hs
+++ b/ghc/driver/PackageSrc.hs
@@ -429,6 +429,23 @@ package_details installing
          extra_ld_opts  = []
         }
 
+         ,Package {
+         name           = "HGL",
+         import_dirs    = if installing
+                             then [ "$libdir/imports/HGL" ]
+                             else [ "$libdir/hslibs/graphics/lib/x11" ],
+         source_dirs    = [],
+         library_dirs   = [],
+         hs_libraries   = [ "HSHGL" ],
+	 extra_libraries= [],
+         include_dirs   = [],
+         c_includes     = [],
+         package_deps   = [ "xlib", "concurrent" ],
+         extra_ghc_opts = [],
+         extra_cc_opts  = [],
+         extra_ld_opts  = []
+        }
+
    ]
   where
 	ghc_src_dir :: String -> String