[Gtk2hs-commit] gtk2hs ChangeLog,1.252,1.253 Makefile.am,1.21,1.22

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24125

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Fix linker bug (use haskell98 rather than base as a gtk package dependency)
When registering packages during installation use update rather than add so
that reinstalls do not fail.
Resture use of $(HCFLAGS) provided by ./configure --with-hcflags
small notation fix in Makefile.am


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am	12 Dec 2004 14:28:12 -0000	1.21
+++ Makefile.am	12 Dec 2004 21:57:31 -0000	1.22
@@ -210,7 +210,7 @@
 libHSgtk_a_PACKAGEDEPS		= 
 libHSgtk_a_HEADER 		= gtk/gtk.h
 libHSgtk_a_PRECOMP		= gtk/gtk.precomp
-libHSgtk_a_LIBS			= @GTK_LIBS@
+libHSgtk_a_LIBS			= $(GTK_LIBS)
 libHSgtk_a_HCFLAGS		= -fglasgow-exts
 libHSgtk_a_CFLAGS 		= $(filter-out -I% -D%,$(GTK_CFLAGS))
 libHSgtk_a_CPPFLAGS 		= $(filter -I% -D%,$(GTK_CFLAGS))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- ChangeLog	12 Dec 2004 18:23:55 -0000	1.252
+++ ChangeLog	12 Dec 2004 21:57:31 -0000	1.253
@@ -1,3 +1,16 @@
+2004-12-12 Duncan Coutts <du...@co...>
+
+	* gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to
+	fix linker problem.
+
+	* Makefile.am: use $()-style make variable rather than @@-style
+	variable substitution.
+
+	* mk/common.mk: restore use of the $(HCFLAGS) in compile and link
+	commands. The variable comes from ./configure's --with-hcflags
+	parameter. Also when registering packages use update rather than add
+	so that reinstallations do not fail.
+
 2004-12-12 Axel Simon <A....@ke...> 
 
 	* gtk/menuComboToolbar/Toolbar.chs.pp: Change comments in order