[Gtk2hs-commit] gtk2hs ChangeLog,1.237,1.238 Makefile.am,1.8,1.9

[Axel S. <as...@us...>]

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Link in _stub.o files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	28 Nov 2004 20:51:43 -0000	1.8
+++ Makefile.am	28 Nov 2004 21:42:34 -0000	1.9
@@ -17,8 +17,7 @@
 	tools/c2hs/base/general tools/c2hs/base/graphs			     \
 	tools/c2hs/base/state tools/c2hs/base/syms			     \
 	tools/c2hs/base/syntax tools/c2hs/base/sysdep tools/c2hs/c	     \
-	tools/c2hs/chs tools/c2hs/gen tools/c2hs/lib tools/c2hs/state	     \
-	tools/c2hs/toplevel
+	tools/c2hs/chs tools/c2hs/gen tools/c2hs/state tools/c2hs/toplevel
 
 EXTRA_DIST = VERSION \
 	tools/callbackGen/Signal.chs-boot1	\
@@ -319,6 +318,15 @@
 	compat/LocalControl.hs			  \
 	compat/LocalData.hs
 
+libgtk2hs_a_LIBADD =						       \
+	gtk/abstract/Container_stub.o				       \
+	gtk/multiline/TextIter_stub.o gtk/entry/EntryCompletion_stub.o \
+        gtk/multiline/TextTagTable_stub.o gtk/general/General_stub.o   \
+        gtk/treeList/TreeModel_stub.o gtk/general/Signal_stub.o	       \
+        gtk/treeList/TreeSelection_stub.o gtk/glib/GObject_stub.o      \
+        gtk/treeList/TreeView_stub.o
+
+
 am_libgtk2hs_a_OBJECTS = \
   $(addsuffix .$(OBJEXT),$(basename $(basename $(libgtk2hs_a_SOURCES))))
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- ChangeLog	28 Nov 2004 20:56:16 -0000	1.237
+++ ChangeLog	28 Nov 2004 21:42:34 -0000	1.238
@@ -1,4 +1,10 @@
 2004-11-28 Axel Simon <A....@ke...> 
+
+	* Makefile.am: Add all _stub.o files as library dependencies. This
+	seems to be enough to link the stub files into the archive.
+	
+	* tools/c2hs/base/sysdep/SysDep([GN]HC?|Posix{UN}AVAIL).hs: Tie
+	SysDep.hs and SysDepPosix.hs directly to the GHC 6 versions.
 	
 	* gtk/gtk2hs.pkg: Package file for gtk2hs.