[Gtk2hs-commit] gtk2hs ChangeLog,1.233,1.234 Makefile.am,1.5,1.6 configure.ac,1.4,1.5

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

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
Make the build run through.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac	21 Nov 2004 15:06:12 -0000	1.4
+++ configure.ac	21 Nov 2004 20:54:58 -0000	1.5
@@ -537,8 +537,6 @@
 dnl write the results...
 AC_CONFIG_FILES([
   Makefile
-  tools/Makefile
-  tools/c2hs/Makefile
 ])
 
 AC_OUTPUT([

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	21 Nov 2004 15:06:12 -0000	1.5
+++ Makefile.am	21 Nov 2004 20:54:58 -0000	1.6
@@ -174,9 +174,9 @@
 # Fix automake - the subdir-objects option doesn't work here.
 am_tools_c2hs_c2hsLocal_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(tools_c2hs_c2hsLocal_SOURCES)))
-MOSTLYCLEANFILES+= $(tools_c2hs_c2hsLocal_HSFILES:.hs=.$(OBJEXT))
+MOSTLYCLEANFILES+= $(am_tools_c2hs_c2hsLocal_OBJECTS)
+MOSTLYCLEANFILES+= $(tools_c2hs_c2hsLocal_HSFILES:.hs=.hi)
 CLEANFILES+= $(tools_c2hs_c2hsLocal_BUILDSOURCES)
-CLEANFILES+=$(am_tools_c2hs_c2hsLocal_OBJECTS)
 DISTCLEANFILES+= tools_c2hs_c2hsLocal.deps
 -include tools_c2hs_c2hsLocal.deps
 
@@ -328,22 +328,26 @@
 	compat/LocalData.hs
 
 am_gtk_libgtk2hs_a_OBJECTS = \
-  $(addsuffix .$(OBJEXT),$(basename $(gtk_libgtk2hs_a_SOURCES)))
+  $(addsuffix .$(OBJEXT),$(basename $(basename $(gtk_libgtk2hs_a_SOURCES))))
 
-gtk_libgtk2hs_a_CHSFILES = $(filter %.chs %.chs.pp, $(gtk_libgtk2hs_a_SOURCES))
-gtk_libgtk2hs_a_CHSFILES_HS = $(patsubst %.chs,%.hs,\
-	$(patsubst %.chs.pp,%.hs,$(gtk_libgtk2hs_a_CHSFILES)))
+gtk_libgtk2hs_a_CHSPPFILES = $(filter %.chs.pp,$(gtk_libgtk2hs_a_SOURCES))
+gtk_libgtk2hs_a_CHSFILES = \
+  $(filter %.chs,$(gtk_libgtk2hs_a_SOURCES:.chs.pp=.chs))
+gtk_libgtk2hs_a_CHSFILES_HS = $(gtk_libgtk2hs_a_CHSFILES:.chs=.hs)
 gtk_libgtk2hs_a_HSCFILES = $(filter %.hsc, $(gtk_libgtk2hs_a_SOURCES))
 gtk_libgtk2hs_a_HSCFILES_HS = $(gtk_libgtk2hs_a_HSCFILES:.hsc=.hs)
 gtk_libgtk2hs_a_BUILDSOURCES = \
+	$(gtk_libgtk2hs_a_CHSPPFILES:.chs.pp=.chs) \
 	$(gtk_libgtk2hs_a_CHSFILES_HS) \
 	$(gtk_libgtk2hs_a_HSCFILES_HS)
 gtk_libgtk2hs_a_HSFILES  = \
-	$(gtk_libgtk2hs_a_BUILDSOURCES) \
+	$(filter %.hs,$(gtk_libgtk2hs_a_BUILDSOURCES)) \
 	$(filter %.hs,$(gtk_libgtk2hs_a_SOURCES))
+.PRECIOUS: $(gtk_libgtk2hs_a_HSFILES:.hs=hi)
 
 MOSTLYCLEANFILES+ = $(am_gtk_libgtk2hs_a_OBJECTS)
-CLEANFILES+= $(gtk_libgtk2hs_a_BUILDSOURCES) $(gtk_libgtk2hs_a_HSFILES:.hs=.hi)
+MOSTLYCLEANFILES+ = $(gtk_libgtk2hs_a_HSFILES:.hs=.hi)
+CLEANFILES+= $(gtk_libgtk2hs_a_BUILDSOURCES)
 
 DISTCLEANFILES+= gtk_libgtk2hs_a.deps $(gtk_libgtk2hs_a_CHSFILES_HS:.hs=.dep)
 -include gtk_libgtk2hs_a.deps $(gtk_libgtk2hs_a_CHSFILES_HS:.hs=.dep)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- ChangeLog	21 Nov 2004 15:06:12 -0000	1.233
+++ ChangeLog	21 Nov 2004 20:54:58 -0000	1.234
@@ -1,5 +1,12 @@
 2004-11-21 Axel Simon <A....@ke...> 
 
+	* Makefile.am, tools/c2hs/gen/GenBind.hs,
+	tools/c2hs/gen/GBMonad.hs: Incorporate the patch so that Ptr,
+	ForeignPtr and StablePtr are expanded correctlyl independently of
+	whether they are wrapped in a newtype or just synonyms. Fixed
+	(hopefully) a bug in c2hs' get hook that didn't cope with
+	pointers.
+
 	* Makefile.am, configure.ac: Generating dependencies now involves
 	building c2hs on the fly. This is bad for saying make clean on a
 	clean tree, but so far I this is the cleanest solution.