gtk2hs-commit

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Repaired dependency generation. It is still not fully automatic (see comment
in mk/common.mk). Make it compile on Mac OS that has a funny C pre-processor.
Decrease the initial heap size to 400MB.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile.am	20 Jan 2005 13:56:55 -0000	1.43
+++ Makefile.am	23 Jan 2005 15:44:30 -0000	1.44
@@ -197,10 +197,9 @@
 MOSTLYCLEANFILES+= $(am_tools_c2hs_c2hsLocal_OBJECTS)
 MOSTLYCLEANFILES+= $(tools_c2hs_c2hsLocal_HSFILES:.hs=.hi)
 CLEANFILES+= $(tools_c2hs_c2hsLocal_BUILDSOURCES)
-DISTCLEANFILES+= tools_c2hs_c2hsLocal.deps
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
--include tools_c2hs_c2hsLocal.deps
- endif
+DISTCLEANFILES+= tools/c2hs/c2hsLocal.deps
+-include tools/c2hs/c2hsLocal.deps
+
 
 #
 #	glib package
@@ -269,12 +268,10 @@
 	$(libHSglib_a_CHSFILES:.chs=_stub.c)
 CLEANFILES += $(libHSglib_a_BUILDSOURCES)
 
-DISTCLEANFILES+= libHSglib_a.deps $(libHSglib_a_CHSFILES_HS:.hs=.dep)
+DISTCLEANFILES+= glib/libHSglib_a.deps $(libHSglib_a_CHSFILES_HS:.hs=.dep)
 
 $(libHSglib_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES)
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
--include libHSglib_a.deps $(libHSglib_a_CHSFILES:.chs=.dep)
- endif
+-include $(libHSglib_a_CHSFILES:.chs=.dep) glib/libHSglib_a.deps
 
 #
 #	gtk package
@@ -293,6 +290,7 @@
 libHSgtk_a_CPPFLAGS 		= $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS))
 
 libHSgtk_a_SOURCESDIRS = $(libHSglib_a_SOURCESDIRS) gtk
+gtk/libHSgtk_a.deps	: glib/libHSglib_a.deps
 
 nodist_libHSgtk_a_SOURCES =						\
 	gtk/Graphics/UI/Gtk/Types.chs					\
@@ -491,12 +489,10 @@
 	$(libHSgtk_a_CHSFILES:.chs=_stub.c)
 CLEANFILES+= $(libHSgtk_a_BUILDSOURCES)
 
-DISTCLEANFILES+= libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep)
+DISTCLEANFILES+= gtk/libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep)
 
 $(libHSgtk_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES)
-ifeq (,$(findstring clean, $(MAKECMDGOALS)))
--include libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep)
- endif
+-include $(libHSgtk_a_CHSFILES_HS:.hs=.dep) gtk/libHSgtk_a.deps
 
 #
 #	mogul package
@@ -513,6 +509,7 @@
 libHSmogul_a_CPPFLAGS 		= 
 
 libHSmogul_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) mogul
+mogul/libHSmogul_a.deps	: gtk/libHSgtk_a.deps
 
 libHSmogul_a_SOURCES =		\
 	mogul/Graphics/UI/Gtk/Mogul.hs			\
@@ -538,10 +535,8 @@
 MOSTLYCLEANFILES += $(am_libHSmogul_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSmogul_a_HSFILES:.hs=.hi)
 
-DISTCLEANFILES+= libHSmogul_a.deps
-ifeq (,$(findstring clean, $(MAKECMDGOALS)))
--include libHSmogul_a.deps
- endif
+DISTCLEANFILES+= mogul/libHSmogul_a.deps
+-include mogul/libHSmogul_a.deps
 
 #
 #	glade package
@@ -608,12 +603,10 @@
 MOSTLYCLEANFILES += $(libHSglade_a_CHSFILES:.chs=.chi)
 CLEANFILES += $(libHSglade_a_BUILDSOURCES) 
 
-DISTCLEANFILES+= libHSglade_a.deps $(libHSglade_a_CHSFILES_HS:.hs=.dep)
+DISTCLEANFILES+= glade/libHSglade_a.deps $(libHSglade_a_CHSFILES_HS:.hs=.dep)
 
 $(libHSglade_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSglade_a_CHSFILES)
-ifeq (,$(findstring clean, $(MAKECMDGOALS)))
--include libHSglade_a.deps $(libHSglade_a_CHSFILES:.chs=.dep)
- endif
+-include $(libHSglade_a_CHSFILES:.chs=.dep) glade/libHSglade_a.deps
 
 endif #ENABLE_LIBGLADE
 
@@ -636,6 +629,7 @@
 libHSgconf_a_CPPFLAGS		= $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS))
 
 libHSgconf_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) gconf
+gconf/libHSgconf_a.deps	: gtk/libHSgtk_a.deps
 
 nodist_libHSgconf_a_SOURCES =				\
 	gconf/System/Gnome/GConf/Types.chs
@@ -689,12 +683,10 @@
 	$(libHSgconf_a_CHSFILES:.chs=_stub.c)
 CLEANFILES += $(libHSgconf_a_BUILDSOURCES) 
 
-DISTCLEANFILES+= libHSgconf_a.deps $(libHSgconf_a_CHSFILES_HS:.hs=.dep)
+DISTCLEANFILES+= gconf/libHSgconf_a.deps $(libHSgconf_a_CHSFILES_HS:.hs=.dep)
 
 $(libHSgconf_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSgconf_a_CHSFILES)
-ifeq (,$(findstring clean, $(MAKECMDGOALS)))
--include libHSgconf_a.deps $(libHSgconf_a_CHSFILES:.chs=.dep)
- endif
+-include $(libHSgconf_a_CHSFILES:.chs=.dep) gconf/libHSgconf_a.deps
 
 endif #ENABLE_GNOME
 
@@ -717,6 +709,7 @@
 libHSsourceview_a_CPPFLAGS	= $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS)) -Isourceview
 
 libHSsourceview_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) sourceview
+sourceview/libHSsourceview_a.deps	: gtk/libHSgtk_a.deps
 
 nodist_libHSsourceview_a_SOURCES =						\
 	sourceview/Graphics/UI/Gtk/SourceView/Types.chs
@@ -774,12 +767,10 @@
 MOSTLYCLEANFILES += $(libHSsourceview_a_CHSFILES:.chs=.chi)
 CLEANFILES += $(libHSsourceview_a_BUILDSOURCES) 
 
-DISTCLEANFILES+= libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES_HS:.hs=.dep)
+DISTCLEANFILES+= sourceview/libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES_HS:.hs=.dep)
 
 $(libHSsourceview_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSsourceview_a_CHSFILES)
-ifeq (,$(findstring clean, $(MAKECMDGOALS)))
--include libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES:.chs=.dep)
- endif
+-include $(libHSsourceview_a_CHSFILES:.chs=.dep) sourceview/libHSsourceview_a.deps
 
 endif #ENABLE_GNOME
 
@@ -802,6 +793,7 @@
 libHSmozembed_a_CPPFLAGS	= $(filter -I% -D%,$(GLIB_CFLAGS) $(GTK_CFLAGS) $(MOZEMBED_CFLAGS))
 
 libHSmozembed_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) mozembed
+mozembed/libHSmozembed_a.deps	: gtk/libHSgtk_a.deps
 
 nodist_libHSmozembed_a_SOURCES =			\
 	mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs
@@ -847,12 +839,10 @@
 MOSTLYCLEANFILES += $(libHSmozembed_a_CHSFILES:.chs=.chi)
 CLEANFILES += $(libHSmozembed_a_BUILDSOURCES) 
 
-DISTCLEANFILES+= libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES_HS:.hs=.dep)
+DISTCLEANFILES+= mozembed/libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES_HS:.hs=.dep)
 
 $(libHSmozembed_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) $(libHSmozembed_a_CHSFILES)
-ifeq (,$(findstring clean, $(MAKECMDGOALS)))
--include libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES:.chs=.dep)
- endif
+-include $(libHSmozembed_a_CHSFILES:.chs=.dep) mozembed/libHSmozembed_a.deps
 
 endif #ENABLE_MOZEMBED
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- ChangeLog	20 Jan 2005 15:01:34 -0000	1.319
+++ ChangeLog	23 Jan 2005 15:44:29 -0000	1.320
@@ -1,3 +1,17 @@
+2005-01-23 Axel Simon <A....@ke...>
+
+	* Makefile.am, mk/common.mk: Resurrect dependency generation under
+	the new scheme of inferring the current package. Dependency files
+	are now always loaded but only recreated if we are not cleaning or
+	already building dependencies.
+
+	* mk/common.mk: Set the initial heap size for tools to 400m to
+	accommodate for less fortunate people.
+
+	* tools/c2hs/chs/CHS.hs: Emit a newline after a LINE directive if
+	the next verbatim text does not start with one. This fixes a
+	problem with gcc on Mac OS.
+
 2005-01-20 Duncan Coutts <du...@co...>
 
 	* Makefile.am: make each package's LIBS include the LIBS of its