From: Duncan C. <dun...@us...> - 2005-01-12 00:01:33
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5562 Modified Files: ChangeLog Makefile.am Log Message: Correct the 'import_dirs' in the <module>.pkg files. Each module has its own directory under the hi difrectory. Correct the install location for glib package's .hi files. Correct a linker error caused by a missing _stub.o file. Everything should install correctly now and the demos should build ok. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- Makefile.am 8 Jan 2005 17:52:36 -0000 1.30 +++ Makefile.am 12 Jan 2005 00:00:46 -0000 1.31 @@ -244,6 +244,9 @@ glib_System_Glib_Types_hs_HCFLAGS = -fglasgow-exts glib_System_Glib_GError_hs_HCFLAGS = -fglasgow-exts +libHSglib_a_LIBADD = \ + glib/System/Glib/GObject_stub.o + am_libHSglib_a_OBJECTS = $(libHSglib_a_HSFILES:.hs=.$(OBJEXT)) libHSglib_a_CHSPPFILES = $(filter %.chs.pp,$(libHSglib_a_SOURCES)) @@ -260,7 +263,7 @@ $(filter %.hs,$(libHSglib_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSglib_a_SOURCES)) -nobase_pkglib_SCRIPTS = $(libHSglib_a_HSFILES:.hs=.hi) +nobase_hi_SCRIPTS = $(libHSglib_a_HSFILES:.hs=.hi) MOSTLYCLEANFILES += $(am_libHSglib_a_OBJECTS) MOSTLYCLEANFILES += $(libHSglib_a_HSFILES:.hs=.hi) @@ -473,7 +476,7 @@ $(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSgtk_a_SOURCES)) -nobase_hi_SCRIPTS = $(libHSgtk_a_HSFILES:.hs=.hi) +nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi) MOSTLYCLEANFILES += $(am_libHSgtk_a_OBJECTS) MOSTLYCLEANFILES += $(libHSgtk_a_HSFILES:.hs=.hi) Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.280 retrieving revision 1.281 diff -u -d -r1.280 -r1.281 --- ChangeLog 10 Jan 2005 17:25:27 -0000 1.280 +++ ChangeLog 12 Jan 2005 00:00:46 -0000 1.281 @@ -1,4 +1,18 @@ -2005-01-09 Duncan Coutts <du...@co...> +2005-01-11 Duncan Coutts <du...@co...> + + * glib/glib.pkg.in, gtk/gtk.pkg.in, mogul/mogul.pkg.in, + glade/glade.pkg.in, gconf/gconf.pkg.in, sourceview/sourceview.pkg.in, + mozembed/mozembed.pkg.in: correct import_dirs. Each module has its own + directory under the hi difrectory. Also, since all packages now use + the hierachrical module namespace we can install all packages as 'Auto' + packages which means that users do not have to specify -package to ghc + most of the time. + + * Makefile.am: correct the install location for glib package's .hi + files. Correct a linker error caused by a missing _stub.o file. + Everything should install correctly now and the demos should build ok. + +2005-01-10 Duncan Coutts <du...@co...> * tools/apiGen/format-docs.xsl: nicer code and more comprehensively deal with various sorts of paragrahps, lists, sections and examples. |