[Gtk2hs-commit] (0.9.12 branch): Be more careful about cleaning split-objs and stub files

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

Sat Jul 28 10:33:05 PDT 2007  Duncan Coutts <du...@ha...>
  * Be more careful about cleaning split-objs and stub files
  And build the code gen tools without using split-objs at all.

    hunk ./Makefile.am 89
    +tools_hierarchyGen_TypeGenerator_NOSPLITOBJS = yes
    hunk ./Makefile.am 109
    +tools_callbackGen_HookGenerator_NOSPLITOBJS = yes
    hunk ./Makefile.am 128
    -tools_c2hs_c2hsLocal_HEADER		= [_$_]
    -tools_c2hs_c2hsLocal_HCFLAGS		= [_$_]
    +tools_c2hs_c2hsLocal_NOSPLITOBJS	= yes
    hunk ./Makefile.am 323
    +glib_CLEANFILES_SPLIT = $(libHSglib_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 691
    -	$(libHSgtk_a_LIBADD)	\
    -	$(libHSgtk_a_LIBADD:.o=_.c)	\
    -	$(libHSgtk_a_LIBADD:.o=_.h)
    +	$(libHSgtk_a_CHSFILES:.chs=_stub.h)	\
    +	$(libHSgtk_a_CHSFILES:.chs=_stub.o)	\
    +	$(libHSgtk_a_CHSFILES:.chs=_stub.c)
    hunk ./Makefile.am 705
    +gtk_CLEANFILES_SPLIT = $(libHSgtk_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 819
    +glade_CLEANFILES_SPLIT = $(libHSglade_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 940
    -	$(libHSgconf_a_LIBADD)	\
    -	$(libHSgconf_a_LIBADD:.o=_.c)	\
    -	$(libHSgconf_a_LIBADD:.o=_.h)
    +	$(libHSgconf_a_CHSFILES:.chs=_stub.h)	\
    +	$(libHSgconf_a_CHSFILES:.chs=_stub.h)	\
    +	$(libHSgconf_a_CHSFILES:.chs=_stub.c)
    hunk ./Makefile.am 955
    +gconf_CLEANFILES_SPLIT = $(libHSgconf_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1081
    +sourceview_CLEANFILES_SPLIT = $(libHSsourceview_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1195
    +mozembed_CLEANFILES_SPLIT = $(libHSmozembed_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1329
    +cairo_CLEANFILES_SPLIT = $(libHScairo_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1428
    +svgcairo_CLEANFILES_SPLIT = $(libHSsvgcairo_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1550
    +gtkglext_CLEANFILES_SPLIT = $(libHSgtkglext_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1625
    +soegtk_MOSTLYCLEANFILES += $(libHSsoegtk_a_BUILDSOURCES)
    hunk ./Makefile.am 1633
    +soegtk_CLEANFILES_SPLIT = $(libHSsoegtk_a_HSFILES:.hs=_split/)
    hunk ./Makefile.am 1983
    -	rm -f $(c2hs_CLEANFILES)
    -	rm -f $(glib_CLEANFILES)
    -	rm -f $(gtk_CLEANFILES)
    -	rm -f $(glade_CLEANFILES)
    -	rm -f $(gconf_CLEANFILES)
    -	rm -f $(sourceview_CLEANFILES)
    -	rm -f $(mozembed_CLEANFILES)
    -	rm -f $(cairo_CLEANFILES)
    -	rm -f $(svgcairo_CLEANFILES)
    -	rm -f $(gtkglext_CLEANFILES)
    -	rm -f $(soegtk_CLEANFILES)
    -	rm -f $(doc_CLEANFILES)
    +	rm -f  $(c2hs_CLEANFILES)
    +	rm -rf $(c2hs_CLEANFILES_SPLIT)
    +	rm -f  $(glib_CLEANFILES)
    +	rm -rf $(glib_CLEANFILES_SPLIT)
    +	rm -f  $(gtk_CLEANFILES)
    +	rm -rf $(gtk_CLEANFILES_SPLIT)
    +	rm -f  $(glade_CLEANFILES)
    +	rm -rf $(glade_CLEANFILES_SPLIT)
    +	rm -f  $(gconf_CLEANFILES)
    +	rm -rf $(gconf_CLEANFILES_SPLIT)
    +	rm -f  $(sourceview_CLEANFILES)
    +	rm -rf $(sourceview_CLEANFILES_SPLIT)
    +	rm -f  $(mozembed_CLEANFILES)
    +	rm -rf $(mozembed_CLEANFILES_SPLIT)
    +	rm -f  $(cairo_CLEANFILES)
    +	rm -rf $(cairo_CLEANFILES_SPLIT)
    +	rm -f  $(svgcairo_CLEANFILES)
    +	rm -rf $(svgcairo_CLEANFILES_SPLIT)
    +	rm -f  $(gtkglext_CLEANFILES)
    +	rm -rf $(gtkglext_CLEANFILES_SPLIT)
    +	rm -f  $(soegtk_CLEANFILES)
    +	rm -rf $(soegtk_CLEANFILES_SPLIT)
    +	rm -f  $(doc_CLEANFILES)
    hunk ./mk/common.mk 62
    -	rm -rf $@ $*_split/
    -	mkdir -p $*_split
    +	$(if $($(PKG)_NOSPLITOBJS),,rm -rf $@ $*_split/; mkdir -p $*_split)
    hunk ./mk/common.mk 64
    -	-c $< -o $@ -split-objs $(HCFLAGS) $($(PKG)_HCFLAGS) \
    +	$(if $($(PKG)_NOSPLITOBJS),,-split-objs) \
    +	-c $< -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \