diff options
| -rw-r--r-- | shell/ChangeLog | 13 | ||||
| -rw-r--r-- | shell/Makefile.am | 18 |
2 files changed, 21 insertions, 10 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 560b25da74..b4ea2c6e87 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,18 @@ 2003-01-28 Ettore Perazzoli <ettore@ximian.com> + * Makefile.am ($(SELECT_NAMES_IDL_GENERATED_C)): No need for the + @true command. + ($(IDL_GENERATED_C)): Likewise. + (e-shell-marshal.h, e-shell-marshal.c): Use different names for + the .tmp files so these can be generated in parallel. + + * importer/Makefile.am (GNOME_Evolution_Importer-impl.o): Remove + unused rule. + ($(IDL_GENERATED_C)): Remove useless @true command. + (BUILT_SOURCES): Put the .h generated files in here as well. + +2003-01-28 Ettore Perazzoli <ettore@ximian.com> + * Makefile.am (Evolution-impl.o): Removed unused rule. 2003-01-28 Ettore Perazzoli <ettore@ximian.com> diff --git a/shell/Makefile.am b/shell/Makefile.am index aa0838f1bf..882737f569 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -55,7 +55,6 @@ $(IDL_GENERATED_H): $(IDLS) $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/Evolution.idl $(IDL_GENERATED_C): $(IDL_GENERATED_H) - @true # SelectNames CORBA stuff @@ -77,7 +76,6 @@ $(SELECT_NAMES_IDL_GENERATED_H): $(SELECT_NAMES_IDL) $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(SELECT_NAMES_IDL) $(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H) - @true # IDL install @@ -300,14 +298,14 @@ install-exec-local: # 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.tmp \ - && mv e-shell-marshal.tmp e-shell-marshal.h ) \ - || ( rm -f e-shell-marshal.tmp && exit 1 ) + ( @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.tmp \ - && mv e-shell-marshal.tmp e-shell-marshal.c ) \ - || ( rm -f e-shell-marshal.tmp && exit 1 ) + ( @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 @@ -338,8 +336,8 @@ evolution.pure: evolution endif -CLEANFILES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) -BUILT_SOURCES = $(IDL_GENERATED_H) $(SELECT_NAMES_IDL_GENERATED_H) $(MARSHAL_GENERATED) +BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) +CLEANFILES = $(BUILT_SOURCES) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) |