[Gtk2hs-commit] (main branch): gio: fix some build problems

[Peter g. <pg...@co...>]

Sun Nov  9 17:34:06 EST 2008  Peter Gavin <pg...@gm...>
  * gio: fix some build problems

    hunk ./Makefile.am 411
    -libHSgio_a_LIBS			= $(GIO_LIBS)
    +libHSgio_a_LIBS			= $(GLIB_LIBS) $(GIO_LIBS)
    hunk ./Makefile.am 413
    -libHSgio_a_CFLAGS		= $(filter-out -I% -D%,$(GIO_CFLAGS))
    -libHSgio_a_CPPFLAGS		= $(filter -I% -D%,$(GIO_CFLAGS))
    +libHSgio_a_CFLAGS		= $(filter-out -I% -D%,$(GLIB_CFLAGS) $(GIO_CFLAGS))
    +libHSgio_a_CPPFLAGS		= $(filter -I% -D%,$(GLIB_CFLAGS) $(GIO_CFLAGS))
    hunk ./Makefile.am 434
    +htmldoc_HSFILES_HIDDEN +=			\
    +	$(libHSgio_a_GENERATEDSOURCES:.chs=.hs)
    +
    hunk ./Makefile.am 440
    -htmldoc_HSFILES_HIDDEN +=			\
    -	$(libHSgio_a_GENERATEDSOURCES:.chs=.hs)
    +if !USE_GCLOSUE_SIGNALS_IMPL
    +libHSgio_a_LIBADD +=	\
    +	gio/System/GIO/Signals_stub.o
    +endif
    hunk ./Makefile.am 502
    +$(libHSgio_a_CHSFILES:.chs=.dep) :	\
    +	$(libHSgio_a_GENERATEDSOURCES)
    +
    hunk ./configure.ac 545
    +GTKHS_PACKAGE_FILTER_CFLAGS([GIO_CFLAGS], [], [$GIO_CFLAGS])
    +GTKHS_PACKAGE_FILTER_LIBS([GIO_LIBS], [], [$GIO_LIBS])
    +
    hunk ./configure.ac 590
    +GTKHS_REFORMAT_PACKAGE_CFLAGS(GIO_CFLAGS, GIO_CFLAGS_CQ)
    +GTKHS_REFORMAT_PACKAGE_LIBS(GIO_LIBS, GIO_LIBS_CQ, GIO_LIBDIR_CQ, GIO_LIBEXTRA_CQ)
    +AC_SUBST(GIO_CFLAGS_CQ)
    +AC_SUBST(GIO_LIBS_CQ)
    +AC_SUBST(GIO_LIBDIR_CQ)
    +AC_SUBST(GIO_LIBEXTRA_CQ)
    +
    hunk ./gio/gio.cabal.in 1
    -name: gIO
    +name: gio