diff options
| -rw-r--r-- | calendar/ChangeLog | 3 | ||||
| -rw-r--r-- | calendar/cal-util/Makefile.am | 14 |
2 files changed, 5 insertions, 12 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 231d41c508..cbccfe2539 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -35,6 +35,9 @@ 2003-07-23 Dan Winship <danw@ximian.com> + * cal-util/Makefile.am: Use EVO_MARSHAL_RULE, and add + MARSHAL_GENERATED to CLEANFILES + * gui/alarm-notify/alarm-queue.c (on_dialog_obj_updated_cb): Fix an unused variable diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index 3047d2b010..57dbd91664 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -36,21 +36,11 @@ libcal_utilinclude_HEADERS = \ cal-util.h \ timeutil.h -# GLib marshalling cruft - -cal-util-marshal.h: cal-util-marshal.list - ( @GLIB_GENMARSHAL@ --prefix=cal_util_marshal cal-util-marshal.list --header > cal-util-marshal.tmp \ - && mv cal-util-marshal.tmp cal-util-marshal.h ) \ - || ( rm -f cal-util-marshal.tmp && exit 1 ) - -cal-util-marshal.c: cal-util-marshal.h - ( @GLIB_GENMARSHAL@ --prefix=cal_util_marshal cal-util-marshal.list --body > cal-util-marshal.tmp \ - && mv cal-util-marshal.tmp cal-util-marshal.c ) \ - || ( rm -f cal-util-marshal.tmp && exit 1 ) - MARSHAL_GENERATED = cal-util-marshal.c cal-util-marshal.h +@EVO_MARSHAL_RULE@ BUILT_SOURCES = $(MARSHAL_GENERATED) +CLEANFILES = $(BUILT_SOURCES) # # static library for use in conduits' shared libraries |