diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-05-14 22:44:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-05-14 22:44:51 +0000 |
| commit | b61156d4b76d2be3dd91678f31f3237f5b1f35c1 (patch) | |
| tree | 1e024cf44ce82ae4005eccb39c442d504b20164a /gtk/stock-icons | |
| parent | 390ad328373bca924d1b9fe77e4cd31dfc7afd8a (diff) | |
| download | gtk+-b61156d4b76d2be3dd91678f31f3237f5b1f35c1.tar.gz | |
Remove the result file on error. (#79929, David Highley)
Tue May 14 18:41:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (gtkstockpixbufs.h):
Remove the result file on error. (#79929, David
Highley)
* gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu):
If the menu is currently active, cancel it before
setting the new menu. (#79162, Jonathan Blandford.)
Diffstat (limited to 'gtk/stock-icons')
| -rw-r--r-- | gtk/stock-icons/Makefile.am | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 9fa7c2f677..73ba213f49 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -264,17 +264,23 @@ pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/g endif gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES) - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES1) > $(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h |