From: Duncan C. <dun...@us...> - 2005-02-26 02:03:18
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1449 Modified Files: ChangeLog Makefile.am Log Message: Signal.chs-boot1: add #hide Haddock annotation so the Signal module will not appear in the generated docs. Makefile.am: It is useful to have a seperate variable holding the files that are generated from nothing using code generators so define a GENERATEDSOURCES variable for each package and re-define some other variables in terms of that. We use it to define nodist_*_SOURCES and html_HSFILES_HIDDEN for each package (since all the generated files are hidden). Instead of having each packages .dep files depending on all of the packages .chs file (which causes lots of unnecessary invocations of chsDepend) make them just depend on the .chs files that might not exist which are the ones produced by code generators. So make them depend on the GENERATEDSOURCES files. chsDepend.in: since we no longer make the .dep files depend on every .chs file in sight, the .chs file (produced from the .chs.pp file) might not exist when the .dep file is generated so look for .chs.pp files as well as .chs file when calculating the deps. This is possibly a bit of a hack. Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- Makefile.am 25 Feb 2005 01:20:17 -0000 1.52 +++ Makefile.am 26 Feb 2005 02:03:03 -0000 1.53 @@ -271,7 +271,6 @@ DISTCLEANFILES+= glib/libHSglib_a.deps $(libHSglib_a_CHSFILES_HS:.hs=.dep) -$(libHSglib_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) -include $(libHSglib_a_CHSFILES:.chs=.dep) glib/libHSglib_a.deps # @@ -293,10 +292,12 @@ libHSgtk_a_SOURCESDIRS = $(libHSglib_a_SOURCESDIRS) gtk gtk/libHSgtk_a.deps : glib/libHSglib_a.deps -nodist_libHSgtk_a_SOURCES = \ +libHSgtk_a_GENERATEDSOURCES = \ gtk/Graphics/UI/Gtk/Types.chs \ gtk/Graphics/UI/Gtk/Signals.chs +nodist_libHSgtk_a_SOURCES = $(libHSgtk_a_GENERATEDSOURCES) + libHSgtk_a_SOURCES = \ gtk/Graphics/UI/Gtk.hs \ gtk/Graphics/UI/Gtk/Pango/Types.chs.pp \ @@ -430,7 +431,7 @@ gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc html_HSFILES_PREPROC = gtk/Graphics/UI/Gtk.hs -html_HSFILES_HIDDEN = gtk/Graphics/UI/Gtk/Types.hs +html_HSFILES_HIDDEN = $(libHSgtk_a_GENERATEDSOURCES:.chs=.hs) gtk_Graphics_UI_Gtk_hs_HCFLAGS = -fno-warn-duplicate-exports #FIXME gtk_Graphics_UI_Gtk_Gdk_Enums_hs_HCFLAGS = -fglasgow-exts @@ -488,8 +489,7 @@ $(libHSgtk_a_CHSPPFILES:.chs.pp=.chs) \ $(libHSgtk_a_CHSFILES_HS) \ $(libHSgtk_a_HSCFILES_HS) \ - gtk/Graphics/UI/Gtk/Types.chs \ - gtk/Graphics/UI/Gtk/Signals.chs + $(libHSgtk_a_GENERATEDSOURCES) libHSgtk_a_HSFILES = \ $(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSgtk_a_ALLSOURCES)) @@ -507,7 +507,7 @@ DISTCLEANFILES+= gtk/libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep) -$(libHSgtk_a_CHSFILES:.chs=.dep) : $(libHSglib_a_CHSFILES) $(libHSgtk_a_CHSFILES) +$(libHSgtk_a_CHSFILES:.chs=.dep) : $(libHSgtk_a_GENERATEDSOURCES) -include $(libHSgtk_a_CHSFILES_HS:.hs=.dep) gtk/libHSgtk_a.deps # @@ -575,13 +575,15 @@ libHSglade_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) glade glade/libHSglade_a.deps : gtk/libHSgtk_a.deps -nodist_libHSglade_a_SOURCES = \ +libHSglade_a_GENERATEDSOURCES = \ glade/Graphics/UI/Gtk/Glade/Types.chs +nodist_libHSglade_a_SOURCES = $(libHSglade_a_GENERATEDSOURCES) + libHSglade_a_SOURCES = \ glade/Graphics/UI/Gtk/Glade.chs -html_HSFILES_HIDDEN += glade/Graphics/UI/Gtk/Glade/Types.hs +html_HSFILES_HIDDEN += $(libHSglade_a_GENERATEDSOURCES:.chs=.hs) glade_Graphics_UI_Gtk_Glade_Types_hs_HCFLAGS = -fglasgow-exts @@ -610,7 +612,7 @@ $(libHSglade_a_CHSPPFILES:.chs.pp=.chs) \ $(libHSglade_a_CHSFILES_HS) \ $(libHSglade_a_HSCFILES_HS) \ - glade/Graphics/UI/Gtk/Glade/Types.chs + $(libHSglade_a_GENERATEDSOURCES) libHSglade_a_HSFILES = \ $(filter %.hs,$(libHSglade_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSglade_a_ALLSOURCES)) @@ -624,7 +626,9 @@ 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) +$(libHSglade_a_CHSFILES:.chs=.dep) : \ + $(libHSgtk_a_GENERATEDSOURCES) \ + $(libHSglade_a_GENERATEDSOURCES) -include $(libHSglade_a_CHSFILES:.chs=.dep) glade/libHSglade_a.deps endif #ENABLE_LIBGLADE @@ -650,15 +654,17 @@ libHSgconf_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) gconf gconf/libHSgconf_a.deps : gtk/libHSgtk_a.deps -nodist_libHSgconf_a_SOURCES = \ +libHSgconf_a_GENERATEDSOURCES = \ gconf/System/Gnome/GConf/Types.chs +nodist_libHSgconf_a_SOURCES = $(libHSgconf_a_GENERATEDSOURCES) + libHSgconf_a_SOURCES = \ gconf/System/Gnome/GConf/GConfValue.chs \ gconf/System/Gnome/GConf/GConfClient.chs \ gconf/System/Gnome/GConf.hs -html_HSFILES_HIDDEN += gconf/System/Gnome/GConf/Types.hs +html_HSFILES_HIDDEN += $(libHSgconf_a_GENERATEDSOURCES:.chs=.hs) libHSgconf_a_LIBADD = \ gconf/System/Gnome/GConf/GConfClient_stub.o @@ -688,7 +694,7 @@ $(libHSgconf_a_CHSPPFILES:.chs.pp=.chs) \ $(libHSgconf_a_CHSFILES_HS) \ $(libHSgconf_a_HSCFILES_HS) \ - gconf/System/Gnome/GConf/Types.chs + $(libHSgconf_a_GENERATEDSOURCES) libHSgconf_a_HSFILES = \ $(filter %.hs,$(libHSgconf_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSgconf_a_ALLSOURCES)) @@ -706,7 +712,9 @@ 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) +$(libHSgconf_a_CHSFILES:.chs=.dep) : \ + $(libHSgtk_a_GENERATEDSOURCES) \ + $(libHSgconf_a_GENERATEDSOURCES) -include $(libHSgconf_a_CHSFILES:.chs=.dep) gconf/libHSgconf_a.deps endif #ENABLE_GNOME @@ -732,9 +740,11 @@ libHSsourceview_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) sourceview sourceview/libHSsourceview_a.deps : gtk/libHSgtk_a.deps -nodist_libHSsourceview_a_SOURCES = \ +libHSsourceview_a_GENERATEDSOURCES = \ sourceview/Graphics/UI/Gtk/SourceView/Types.chs +nodist_libHSsourceview_a_SOURCES = $(libHSsourceview_a_GENERATEDSOURCES) + libHSsourceview_a_SOURCES = \ sourceview/Graphics/UI/Gtk/SourceView.hs \ sourceview/Graphics/UI/Gtk/SourceView/SourceBuffer.chs \ @@ -748,7 +758,7 @@ sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.chs \ sourceview/Graphics/UI/Gtk/SourceView/SourceView.chs -html_HSFILES_HIDDEN += sourceview/Graphics/UI/Gtk/SourceView/Types.hs +html_HSFILES_HIDDEN += $(libHSsourceview_a_GENERATEDSOURCES:.chs=.hs) sourceview_Graphics_UI_Gtk_SourceView_Types_hs_HCFLAGS = -fglasgow-exts sourceview_Graphics_UI_Gtk_SourceView_SourceTagStyle_hs_HCFLAGS = -fglasgow-exts @@ -778,7 +788,7 @@ $(libHSsourceview_a_CHSPPFILES:.chs.pp=.chs) \ $(libHSsourceview_a_CHSFILES_HS) \ $(libHSsourceview_a_HSCFILES_HS) \ - sourceview/Graphics/UI/Gtk/SourceView/Types.chs + $(libHSsourceview_a_GENERATEDSOURCES) libHSsourceview_a_HSFILES = \ $(filter %.hs,$(libHSsourceview_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSsourceview_a_ALLSOURCES)) @@ -792,7 +802,9 @@ 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) +$(libHSsourceview_a_CHSFILES:.chs=.dep) : \ + $(libHSgtk_a_GENERATEDSOURCES) \ + $(libHSsourceview_a_GENERATEDSOURCES) -include $(libHSsourceview_a_CHSFILES:.chs=.dep) sourceview/libHSsourceview_a.deps endif #ENABLE_GNOME @@ -818,13 +830,15 @@ libHSmozembed_a_SOURCESDIRS = $(libHSgtk_a_SOURCESDIRS) mozembed mozembed/libHSmozembed_a.deps : gtk/libHSgtk_a.deps -nodist_libHSmozembed_a_SOURCES = \ +libHSmozembed_a_GENERATEDSOURCES = \ mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs +nodist_libHSmozembed_a_SOURCES = $(libHSmozembed_a_GENERATEDSOURCES) + libHSmozembed_a_SOURCES = \ mozembed/Graphics/UI/Gtk/MozEmbed.chs -html_HSFILES_HIDDEN += mozembed/Graphics/UI/Gtk/MozEmbed/Types.hs +html_HSFILES_HIDDEN += $(libHSmozembed_a_GENERATEDSOURCES:.chs=.hs) mozembed_Graphics_UI_Gtk_MozEmbed_Types_hs_HCFLAGS = -fglasgow-exts @@ -852,7 +866,7 @@ $(libHSmozembed_a_CHSPPFILES:.chs.pp=.chs) \ $(libHSmozembed_a_CHSFILES_HS) \ $(libHSmozembed_a_HSCFILES_HS) \ - mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs + $(libHSmozembed_a_GENERATEDSOURCES) libHSmozembed_a_HSFILES = \ $(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSmozembed_a_ALLSOURCES)) @@ -866,7 +880,9 @@ 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) +$(libHSmozembed_a_CHSFILES:.chs=.dep) : \ + $(libHSgtk_a_GENERATEDSOURCES) \ + $(libHSmozembed_a_GENERATEDSOURCES) -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.369 retrieving revision 1.370 diff -u -d -r1.369 -r1.370 --- ChangeLog 25 Feb 2005 22:53:40 -0000 1.369 +++ ChangeLog 26 Feb 2005 02:02:54 -0000 1.370 @@ -1,3 +1,26 @@ +2005-02-26 Duncan Coutts <du...@co...> + + * tools/callbackGen/Signal.chs-boot1: add #hide Haddock annotation so + the Signal module will not appear in the generated docs. + + * Makefile.am: It is useful to have a seperate variable holding the + files that are generated from nothing using code generators so define + a GENERATEDSOURCES variable for each package and re-define some other + variables in terms of that. We use it to define + nodist_*_SOURCES and html_HSFILES_HIDDEN for each package (since all + the generated files are hidden). + Instead of having each packages .dep files depending on all of the + packages .chs file (which causes lots of unnecessary invocations of + chsDepend) make them just depend on the .chs files that might not + exist which are the ones produced by code generators. So make them + depend on the GENERATEDSOURCES files. + + * mk/chsDepend.in: since we no longer make the .dep files depend on + every .chs file in sight, the .chs file (produced from the .chs.pp + file) might not exist when the .dep file is generated so look for + .chs.pp files as well as .chs file when calculating the deps. This is + possibly a bit of a hack. + 2005-02-25 Duncan Coutts <du...@co...> * gtk/Graphics/UI/Gtk/Abstract/Bin.chs, |