diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-07-24 00:43:05 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-07-24 00:43:05 +0800 |
| commit | ce4fd1f3fb60778f9ab73660a30b05f45510daa4 (patch) | |
| tree | d2ec044d45bd4f6ed526c353c3473ab66ff4d5c6 | |
| parent | 4cda78f4480f24113856edc4bdcde0101e7506ff (diff) | |
| download | gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.tar gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.tar.gz gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.tar.bz2 gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.tar.lz gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.tar.xz gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.tar.zst gsoc2013-evolution-ce4fd1f3fb60778f9ab73660a30b05f45510daa4.zip | |
Use EVO_MARSHAL_RULE
* Makefile.am: Use EVO_MARSHAL_RULE
svn path=/trunk/; revision=21915
| -rw-r--r-- | e-util/ChangeLog | 2 | ||||
| -rw-r--r-- | e-util/Makefile.am | 18 | ||||
| -rw-r--r-- | shell/ChangeLog | 2 | ||||
| -rw-r--r-- | shell/Makefile.am | 13 |
4 files changed, 6 insertions, 29 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 338519c8a2..3c042689d3 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,5 +1,7 @@ 2003-07-23 Dan Winship <danw@ximian.com> + * Makefile.am: Use EVO_MARSHAL_RULE + * e-component-listener.c (connection_listen_cb): Fix a non-ANSI switch label. diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 29cd5e58e5..37da4375f1 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -86,24 +86,8 @@ libeutil_la_SOURCES = \ e-xml-hash-utils.c \ md5-utils.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.h.tmp \ - && mv e-util-marshal.h.tmp e-util-marshal.h ) \ - || ( rm -f e-util-marshal.h.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.c.tmp \ - && mv e-util-marshal.c.tmp e-util-marshal.c ) \ - || ( rm -f e-util-marshal.c.tmp && exit 1 ) - MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h - - -# FIXME TODO -# e-passwords.c -# bonobo-factory-util.[ch] +@EVO_MARSHAL_RULE@ libeutil_la_LIBADD = $(E_UTIL_LIBS) diff --git a/shell/ChangeLog b/shell/ChangeLog index 3c7756b543..1836661ca9 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,7 @@ 2003-07-23 Dan Winship <danw@ximian.com> + * Makefile.am: Use EVO_MARSHAL_RULE + * e-shell-importer.c (prepare_intelligent_page): Fix a warning 2003-07-22 Antonio Xu <antonio.xu@sun.com> diff --git a/shell/Makefile.am b/shell/Makefile.am index 10fe9d962e..1631ccdef0 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -336,19 +336,8 @@ install-exec-local: install-evolution endif -# GLib marshalling cruft - -e-shell-marshal.h: e-shell-marshal.list - ( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal e-shell-marshal.list --header > e-shell-marshal.h.tmp \ - && mv e-shell-marshal.h.tmp e-shell-marshal.h ) \ - || ( rm -f e-shell-marshal.h.tmp && exit 1 ) - -e-shell-marshal.c: e-shell-marshal.h - ( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal e-shell-marshal.list --body > e-shell-marshal.c.tmp \ - && mv e-shell-marshal.c.tmp e-shell-marshal.c ) \ - || ( rm -f e-shell-marshal.c.tmp && exit 1 ) - MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h +@EVO_MARSHAL_RULE@ # Extra dist stuff |