Menu
▾
▴
[Gtk2hs-commit] gtk2hs Makefile.am,1.27,1.28 ChangeLog,1.260,1.261
|
From: Duncan C. <dun...@us...> - 2004-12-18 20:48:21
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21570 Modified Files: Makefile.am ChangeLog Log Message: Make the various 'clean' targets more thorough. Also get the .hi files to be installed for the other packages (mogul, glade, sourceview, gconf, mozembed). Index: Makefile.am =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Makefile.am 17 Dec 2004 21:21:38 -0000 1.27 +++ Makefile.am 18 Dec 2004 20:48:01 -0000 1.28 @@ -1,11 +1,12 @@ AUTOMAKE_OPTIONS = foreign subdir-objects SUFFIXES = .chs.pp .chs .hsc .deps .dep -MOSTLYCLEANFILES = +MOSTLYCLEANFILES = *.deps.bak CLEANFILES = -DISTCLEANFILES = *.precomp +DISTCLEANFILES = */*.precomp CPPFLAGS += $(filter -I% -D%, \ $(GTK_CFLAGS) $(SOURCEVIEW_CFLAGS) \ - $(LIBGLADE_CFLAGS) $(GCONF_CFLAGS)) + $(LIBGLADE_CFLAGS) $(GCONF_CFLAGS) \ + $(MOZEMBED_CFLAGS)) # Build c2hs before anything else. @@ -19,8 +20,7 @@ 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/state tools/c2hs/toplevel \ - mogul glade gconf gconf/System/Gnome gconf/System/Gnome/GConf \ - sourceview mozembed + mogul glade gconf sourceview mozembed EXTRA_DIST = \ tools/callbackGen/Signal.chs-boot1 \ @@ -28,7 +28,8 @@ tools/callbackGen/gtkmarshal.list \ tools/checkDirs.sh \ tools/c2hs/toplevel/c2hs_config.h \ - tools/hierarchyGen/hierarchy.list + tools/hierarchyGen/hierarchy.list \ + tools/hierarchyGen/Hierarchy.chs.template # fixme: this should be in configure.ac: HSCPP = $(CPP) -x c -traditional-cpp -P @@ -73,13 +74,7 @@ am_tools_hierarchyGen_TypeGenerator_OBJECTS = $(addsuffix .$(OBJEXT),\ $(basename $(tools_hierarchyGen_TypeGenerator_SOURCES))) MOSTLYCLEANFILES+= $(am_tools_hierarchyGen_TypeGenerator_OBJECTS) - -gtk/general/Hierarchy.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator - $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ - $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ - $@ $(addprefix --tag=,$(CREATE_TYPES))) +MOSTLYCLEANFILES+= $(tools_hierarchyGen_TypeGenerator_SOURCES:.hs=.hi) # # HookGenerator Tool @@ -97,6 +92,7 @@ am_tools_callbackGen_HookGenerator_OBJECTS = $(addsuffix .$(OBJEXT),\ $(basename $(tools_callbackGen_HookGenerator_SOURCES))) MOSTLYCLEANFILES+= $(am_tools_callbackGen_HookGenerator_OBJECTS) +MOSTLYCLEANFILES+= $(tools_callbackGen_HookGenerator_SOURCES:.hs=.hi) gtk/general/Signal.chs : $(srcdir)/tools/callbackGen/Signal.chs-boot1 \ @@ -123,6 +119,7 @@ am_tools_apicoverage_Exclude_OBJECTS = $(addsuffix .$(OBJEXT),\ $(basename $(tools_apicoverage_Exclude_SOURCES))) MOSTLYCLEANFILES+= $(am_tools_apicoverage_Exclude_OBJECTS) +MOSTLYCLEANFILES+= $(tools_apicoverage_Exclude_SOURCES:.hs=.hi) # # c2hs interface generator @@ -134,7 +131,7 @@ tools_c2hs_c2hsLocal_MAIN = c2hs/toplevel/Main.hs tools_c2hs_c2hsLocal_PACKAGEDEPS = -tools_c2hs_c2hsLocal_HEADER = tools/c2hs/toplevel/c2hs_config.h +tools_c2hs_c2hsLocal_HEADER = tools_c2hs_c2hsLocal_HCFLAGS = tools_c2hs_c2hsLocal_SOURCES = \ @@ -188,7 +185,8 @@ tools/c2hs/toplevel/c2hs_config.c tools_c2hs_base_syntax_Parsers_hs_HCFLAGS = -fglasgow-exts -tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi +tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = -fffi -fvia-C \ + '-\#include<tools/c2hs/toplevel/c2hs_config.h>' tools_c2hs_c2hsLocal_HSFILES = \ $(filter %.hs,$(tools_c2hs_c2hsLocal_SOURCES)) @@ -199,7 +197,7 @@ MOSTLYCLEANFILES+= $(tools_c2hs_c2hsLocal_HSFILES:.hs=.hi) CLEANFILES+= $(tools_c2hs_c2hsLocal_BUILDSOURCES) DISTCLEANFILES+= tools_c2hs_c2hsLocal.deps -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean,$(MAKECMDGOALS))) -include tools_c2hs_c2hsLocal.deps endif @@ -372,6 +370,13 @@ touch $(@:.o=.c) $(CC) -c -o $@ $(@:.o=.c) +gtk/general/Hierarchy.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template + $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/hierarchy.list \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ + $@ $(addprefix --tag=,$(CREATE_TYPES))) am_libHSgtk_a_OBJECTS = \ $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgtk_a_SOURCES)))) @@ -393,12 +398,17 @@ # add prefix nobase_ when changing to hierarchical module namespace hi_SCRIPTS = $(libHSgtk_a_HSFILES:.hs=.hi) -MOSTLYCLEANFILES+ = $(am_libHSgtk_a_OBJECTS) -MOSTLYCLEANFILES+ = $(libHSgtk_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES += $(am_libHSgtk_a_OBJECTS) +MOSTLYCLEANFILES += $(libHSgtk_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES += \ + $(libHSgtk_a_CHSFILES:.chs=.chi) \ + $(libHSgtk_a_CHSFILES:.chs=_stub.h) \ + $(libHSgtk_a_CHSFILES:.chs=_stub.o) \ + $(libHSgtk_a_CHSFILES:.chs=_stub.c) CLEANFILES+= $(libHSgtk_a_BUILDSOURCES) DISTCLEANFILES+= libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep) -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean, $(MAKECMDGOALS))) -include libHSgtk_a.deps $(libHSgtk_a_CHSFILES_HS:.hs=.dep) endif @@ -433,11 +443,13 @@ libHSmogul_a_HSFILES = $(libHSmogul_a_SOURCES) .PRECIOUS: $(libHSmogul_a_HSFILES:.hs=hi) -MOSTLYCLEANFILES+ = $(am_libHSmogul_a_OBJECTS) -MOSTLYCLEANFILES+ = $(libHSmogul_a_HSFILES:.hs=.hi) +hi_SCRIPTS += $(libHSmogul_a_HSFILES:.hs=.hi) + +MOSTLYCLEANFILES += $(am_libHSmogul_a_OBJECTS) +MOSTLYCLEANFILES += $(libHSmogul_a_HSFILES:.hs=.hi) DISTCLEANFILES+= libHSmogul_a.deps -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean, $(MAKECMDGOALS))) -include libHSmogul_a.deps endif @@ -467,7 +479,8 @@ libHSglade_a_DEPENDENCIES = libHSgtk.a glade/GladeType.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator + $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ @@ -491,12 +504,15 @@ $(filter %.hs,$(libHSglade_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSglade_a_SOURCES)) +hi_SCRIPTS += $(libHSglade_a_HSFILES:.hs=.hi) + MOSTLYCLEANFILES += $(am_libHSglade_a_OBJECTS) MOSTLYCLEANFILES += $(libHSglade_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES += $(libHSglade_a_CHSFILES:.chs=.chi) CLEANFILES += $(libHSglade_a_BUILDSOURCES) DISTCLEANFILES+= libHSglade_a.deps $(libHSglade_a_CHSFILES_HS:.hs=.dep) -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean, $(MAKECMDGOALS))) -include libHSglade_a.deps $(libHSglade_a_CHSFILES:.chs=.dep) endif @@ -527,7 +543,8 @@ gconf/System/Gnome/GConf/GConfType.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator + $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ @@ -551,13 +568,20 @@ $(filter %.hs,$(libHSgconf_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSgconf_a_SOURCES)) +nobase_hi_SCRIPTS = $(libHSgconf_a_HSFILES:.hs=.hi) + MOSTLYCLEANFILES += $(am_libHSgconf_a_OBJECTS) MOSTLYCLEANFILES += $(libHSgconf_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES += \ + $(libHSgconf_a_CHSFILES:.chs=.chi) \ + $(libHSgconf_a_CHSFILES:.chs=_stub.h) \ + $(libHSgconf_a_CHSFILES:.chs=_stub.o) \ + $(libHSgconf_a_CHSFILES:.chs=_stub.c) CLEANFILES += $(libHSgconf_a_BUILDSOURCES) DISTCLEANFILES+= libHSgconf_a.deps $(libHSgconf_a_CHSFILES_HS:.hs=.dep) -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean, $(MAKECMDGOALS))) -include libHSgconf_a.deps $(libHSgconf_a_CHSFILES:.chs=.dep) endif @@ -598,7 +622,8 @@ sourceview/SourceViewType.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator + $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ @@ -622,13 +647,16 @@ $(filter %.hs,$(libHSsourceview_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSsourceview_a_SOURCES)) +hi_SCRIPTS += $(libHSsourceview_a_HSFILES:.hs=.hi) + MOSTLYCLEANFILES += $(am_libHSsourceview_a_OBJECTS) MOSTLYCLEANFILES += $(libHSsourceview_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES += $(libHSsourceview_a_CHSFILES:.chs=.chi) CLEANFILES += $(libHSsourceview_a_BUILDSOURCES) DISTCLEANFILES+= libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES_HS:.hs=.dep) -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean, $(MAKECMDGOALS))) -include libHSsourceview_a.deps $(libHSsourceview_a_CHSFILES:.chs=.dep) endif @@ -659,7 +687,8 @@ mozembed/Graphics/UI/Gtk/MozEmbedType.chs : \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ - $(srcdir)/tools/hierarchyGen/TypeGenerator + $(srcdir)/tools/hierarchyGen/TypeGenerator \ + $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \ $(srcdir)/tools/hierarchyGen/hierarchy.list \ $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \ @@ -684,13 +713,16 @@ $(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \ $(filter %.hs,$(libHSmozembed_a_SOURCES)) +nobase_hi_SCRIPTS += $(libHSmozembed_a_HSFILES:.hs=.hi) + MOSTLYCLEANFILES += $(am_libHSmozembed_a_OBJECTS) MOSTLYCLEANFILES += $(libHSmozembed_a_HSFILES:.hs=.hi) +MOSTLYCLEANFILES += $(libHSmozembed_a_CHSFILES:.chs=.chi) CLEANFILES += $(libHSmozembed_a_BUILDSOURCES) DISTCLEANFILES+= libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES_HS:.hs=.dep) -ifneq ($(MAKECMDGOALS),clean) +ifeq (,$(findstring clean, $(MAKECMDGOALS))) -include libHSmozembed_a.deps $(libHSmozembed_a_CHSFILES:.chs=.dep) endif Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.260 retrieving revision 1.261 diff -u -d -r1.260 -r1.261 --- ChangeLog 17 Dec 2004 22:02:54 -0000 1.260 +++ ChangeLog 18 Dec 2004 20:48:07 -0000 1.261 @@ -1,3 +1,19 @@ +2004-12-18 Duncan Coutts <du...@co...> + + * tools/c2hs/toplevel/Main.hs: remove performance debuging output when + processing .chs files. Keep debugging output for generating .precomp + files to remind us how slow it is and to bug me to fix it! + + * mozembed/Graphics/UI/Gtk/MozEmbed.chs: tidy up module header. + + * mk/chsDepend.in: make chsDepend understand hierarchical modules names + and change the dependency of .hs files to be on the .chi files rather + than the .chs files. This is how it is done for .o and .hs files, that + is, the .o file depends on the .hi files. + + * Makefile.am: make the various 'clean' targets more thorough. Also + get the .hi files to be installed for the other packages. + 2004-12-17 Duncan Coutts <du...@co...> * mozembed/Graphics/UI/Gtk/MozEmbed.chs: new bindings to GtkMozEmbed |
