From 8290ca88493ab6265389b17a75e13cbbeaeb20f9 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 23 Jul 2003 16:43:24 +0000 Subject: use EVO_MARSHAL_RULE * Makefile.am: use EVO_MARSHAL_RULE svn path=/trunk/; revision=21916 --- widgets/misc/ChangeLog | 2 ++ widgets/misc/Makefile.am | 13 +------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 8da5f79e05..6f7aa62527 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,5 +1,7 @@ 2003-07-23 Dan Winship + * Makefile.am: use EVO_MARSHAL_RULE + * e-combo-button.c (create_empty_pixmap_widget): Create the pixbuf from empty.xpm rather than just calling gdk_pixbuf_new(), which doesn't actually initialize the pixel data. diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 4da01c8c24..ece1cbc880 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -50,19 +50,8 @@ libemiscwidgets_la_SOURCES = \ e-url-entry.c \ e-util-marshal.c -# GLib marshalling cruft - -e-util-marshal.h: e-util-marshal.list - ( @GLIB_GENMARSHAL@ --prefix=e_util_marshal e-util-marshal.list --header > e-util-marshal.tmp \ - && mv e-util-marshal.tmp e-util-marshal.h ) \ - || ( rm -f e-util-marshal.tmp && exit 1 ) - -e-util-marshal.c: e-util-marshal.h - ( @GLIB_GENMARSHAL@ --prefix=e_util_marshal e-util-marshal.list --body > e-util-marshal.tmp \ - && mv e-util-marshal.tmp e-util-marshal.c ) \ - || ( rm -f e-util-marshal.tmp && exit 1 ) - MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h +@EVO_MARSHAL_RULE@ libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la -- cgit v1.2.3