[Gtk2hs-commit] gtk2hs ChangeLog,1.375,1.376 Makefile.am,1.54,1.55

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Fix one of the GHC 6.4 build failures by changing the root path that
c2hs_config.h gets #include'ed from. Previously it was ok to #include relative
to the build root whereas GHC 6.4 only allows it to be relative to the source
file being compiled.
Move tools/c2hs/toplevel/C2HSConfig.hs from tools_c2hs_c2hsLocal_SOURCES
to nodist_tools_c2hs_c2hsLocal_SOURCES so that the file does not end up in the
.tar.gz distribution. It is generated from C2HSConfig.hs.in so C2HSConfig.hs
should not be present in a clean tree.
Also change MOSTLYCLEANFILES to reflect the changed location of the .deps
files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.am	26 Feb 2005 02:54:34 -0000	1.54
+++ Makefile.am	4 Mar 2005 22:04:59 -0000	1.55
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 SUFFIXES = .hs.uncpp .chs.pp .chs .hsc .deps .dep
-MOSTLYCLEANFILES = *.deps.bak
+MOSTLYCLEANFILES = */*.deps.bak tools/*/*.deps.bak
 CLEANFILES =
 DISTCLEANFILES = */*.precomp
 
@@ -181,20 +181,26 @@
 	tools/c2hs/state/Switches.hs		\
 	tools/c2hs/toplevel/Main.hs		\
 	tools/c2hs/toplevel/Version.hs		\
-	tools/c2hs/toplevel/C2HSConfig.hs	\
 	tools/c2hs/toplevel/c2hs_config.c
 
+nodist_tools_c2hs_c2hsLocal_SOURCES =		\
+	tools/c2hs/toplevel/C2HSConfig.hs
+
+tools_c2hs_c2hsLocal_ALLSOURCES =		\
+	$(tools_c2hs_c2hsLocal_SOURCES)		\
+	$(nodist_tools_c2hs_c2hsLocal_SOURCES)
+
 tools_c2hs_base_general_Binary_hs_HCFLAGS = -O -funbox-strict-fields
 tools_c2hs_base_general_FastMutInt_hs_HCFLAGS = -O
 tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts
 tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi -fvia-C \
-	'-\#include<tools/c2hs/toplevel/c2hs_config.h>'
+	'-\#include<c2hs_config.h>'
 
 tools_c2hs_c2hsLocal_HSFILES		= \
-	$(filter %.hs,$(tools_c2hs_c2hsLocal_SOURCES))
+	$(filter %.hs,$(tools_c2hs_c2hsLocal_ALLSOURCES))
 # Fix automake - the subdir-objects option doesn't work here.
 am_tools_c2hs_c2hsLocal_OBJECTS = \
-	$(addsuffix .$(OBJEXT),$(basename $(tools_c2hs_c2hsLocal_SOURCES)))
+	$(addsuffix .$(OBJEXT),$(basename $(tools_c2hs_c2hsLocal_ALLSOURCES)))
 MOSTLYCLEANFILES+= $(am_tools_c2hs_c2hsLocal_OBJECTS)
 MOSTLYCLEANFILES+= $(tools_c2hs_c2hsLocal_HSFILES:.hs=.hi)
 CLEANFILES+= $(tools_c2hs_c2hsLocal_BUILDSOURCES)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- ChangeLog	1 Mar 2005 21:20:44 -0000	1.375
+++ ChangeLog	4 Mar 2005 22:04:59 -0000	1.376
@@ -1,3 +1,16 @@
+2005-03-04 Duncan Coutts <du...@co...>
+
+	* Makefile.am: Fix one of the GHC 6.4 build failures by changing the
+	root path that c2hs_config.h gets #include'ed from. Previously it was
+	ok to #include relative to the build root whereas GHC 6.4 only allows
+	it to be relative to the source file being compiled. Move
+	tools/c2hs/toplevel/C2HSConfig.hs from tools_c2hs_c2hsLocal_SOURCES
+	to nodist_tools_c2hs_c2hsLocal_SOURCES so that the file does not end
+	up in the .tar.gz distribution. It is generated from C2HSConfig.hs.in
+	so C2HSConfig.hs should not be present in a clean tree. Also change
+	the MOSTLYCLEANFILES to reflect the changed location of the .deps
+	files.
+
 2005-03-01 Duncan Coutts <du...@co...>
 
 	* tools/apiGen/CodeGen.hs: do deprecated and version ifdefs a bit
@@ -10,7 +23,7 @@
 
 	* tools/apiGen/ApiGen.hs: trivial follow on change.
 
-	* tools/apiGen/FormatDocs.hs: for deprecated module, instead of
+	* tools/apiGen/FormatDocs.hs: for deprecated modules, instead of
 	anotating every function with a deprecation warning, just add a note
 	to the module summary. Also put version notes in the module summary
 	rather than at the end of the detail section.