From 70dac7c77fd0833f73a259e6083dceab4d974383 Mon Sep 17 00:00:00 2001 From: reid Date: Wed, 27 Jun 2001 06:52:16 +0000 Subject: [PATCH] [project @ 2001-06-27 06:52:16 by reid] [After fumbling around in the makefile forest for a while, Sigbjorn enlightened me as to where one registers new hslib packages. Golly, never thought of looking over here. I'd kinda expected that it would be in the makeforest since makefiles seem to contain all (or almost all) the information needed to install a package. (Any chance this stuff could be moved into the makeforest in the new library infrastructure?) It seems that'd be more effective since it'd be able to benefit from all that good information that autoconf spent so long figuring out about your X installation, your platform, your internationalisation library, etc.] Oh, yeah, the change... Added xlib to the package list. Result looks plausible. --- ghc/driver/PackageSrc.hs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ghc/driver/PackageSrc.hs b/ghc/driver/PackageSrc.hs index 9740260..3e93631 100644 --- a/ghc/driver/PackageSrc.hs +++ b/ghc/driver/PackageSrc.hs @@ -399,6 +399,29 @@ package_details installing extra_ld_opts = [] } #endif + + ,Package { + name = "xlib", + import_dirs = if installing + then [ "$libdir/imports/xlib" ] + else [ "$libdir/hslibs/xlib" ], + source_dirs = [], + library_dirs = if installing + then [ "$libdir" ] + else [ "$libdir/hslibs/xlib" + , "$libdir/hslibs/xlib/cbits" ], + hs_libraries = [ "HSxlib" ], + extra_libraries = [ "HSxlib_cbits", "X11" ], + include_dirs = if installing + then [] + else [ "$libdir/hslibs/xlib/cbits" ], + c_includes = [ "HsXlib.h" ], + package_deps = [ "greencard" ], + extra_ghc_opts = [], + extra_cc_opts = [], + extra_ld_opts = [] + } + ] where ghc_src_dir :: String -> String -- 1.7.10.4