Patch from James Henstridge to update to automake-1.7 (#109542)

Tue May  6 16:50:52 2003  Owen Taylor  <otaylor@redhat.com>

        Patch from James Henstridge to update to automake-1.7
        (#109542)

        * autogen.sh: update to call newer tools.

        * configure.in: various updates, to use M4 macros to put
        variables that change each release at the top.
        Use AC_HELP_STRING to format help strings.
        Use AC_CONFIG_COMMANDS to generate gdkconfig.h.

        * Makefile.am: require Automake 1.7.  Remove gdk-2.0.pc and
        gtk+-2.0.pc on uninstall.  Pass --enable-gtk-doc to configure
        during distcheck.

        * docs/reference/*/Makefile.am: simplify to use the gtk-doc.make
        makefile fragment.

        * */Makefile.am: don't use STRIP_BEGIN/STRIP_END.
        Use BUILT_SOURCES where appropriate.
        Build generated files in builddir rather than srcdir.
        Fix uninstall and distclean targets to satisfy distcheck.

        ===

        * gdk/*/Makefile.am: Remove the hacks to get gdkenumtypes.h
        built first, since we are now using BUILT_SOURCES.

        * gdk/Makefile.am: Remove an outdated comment about gdk_headers.

        * demos/gtk-demo/Makefile.am: Fix srcdir != buildd problem
        with geninclude.pl.

        * configure.in: Update versions to 2.3.0.

1 files changed, 149 insertions, 156 deletions

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 26eaae1f89..7c6e713d3d 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -1,5 +1,5 @@
 
-IMAGES = @STRIP_BEGIN@ 			\
+IMAGES = \
 	stock_add_16.png		\
 	stock_add_24.png		\
 	stock_align_center_16.png	\
@@ -121,144 +121,137 @@ IMAGES = @STRIP_BEGIN@ 			\
 	stock_zoom_1_24.png 		\
 	stock_zoom_fit_24.png 		\
 	stock_zoom_in_24.png 		\
-	stock_zoom_out_24.png 		\
-@STRIP_END@
+	stock_zoom_out_24.png
 
-VARIABLES1 = @STRIP_BEGIN@ 									\
-		stock_add_16          		$(srcdir)/stock_add_16.png 			\
-		stock_add_24          		$(srcdir)/stock_add_24.png 			\
-	       	stock_align_center_16		$(srcdir)/stock_align_center_16.png             \
-	       	stock_align_center_24		$(srcdir)/stock_align_center_24.png             \
-		stock_align_justify_16		$(srcdir)/stock_align_justify_16.png            \
-		stock_align_justify_24		$(srcdir)/stock_align_justify_24.png            \
-		stock_align_left_16		$(srcdir)/stock_align_left_16.png             	\
-		stock_align_left_24		$(srcdir)/stock_align_left_24.png             	\
-	        stock_align_right_16		$(srcdir)/stock_align_right_16.png             	\
-	        stock_align_right_24		$(srcdir)/stock_align_right_24.png             	\
-		stock_apply_20	 		$(srcdir)/stock_apply_20.png  			\
-		stock_cancel_20     	        $(srcdir)/stock_cancel_20.png 			\
-		stock_dnd_multiple_32           $(srcdir)/stock_dnd_multiple_32.png 		\
-                stock_bottom_16			$(srcdir)/stock_bottom_16.png             	\
-                stock_bottom_24			$(srcdir)/stock_bottom_24.png             	\
-		stock_cdrom_16			$(srcdir)/stock_cdrom_16.png			\
-                stock_cdrom_24			$(srcdir)/stock_cdrom_24.png             	\
-                stock_clear_24			$(srcdir)/stock_clear_24.png             	\
-		stock_close_20		      	$(srcdir)/stock_close_20.png  			\
-                stock_close_24			$(srcdir)/stock_close_24.png             	\
-                stock_colorselector_24		$(srcdir)/stock_colorselector_24.png            \
-                stock_color_picker_25		$(srcdir)/stock_color_picker_25.png            \
-@STRIP_END@
-VARIABLES2 = @STRIP_BEGIN@ 									\
-		stock_convert_16		$(srcdir)/stock_convert_16.png			\
-                stock_convert_24		$(srcdir)/stock_convert_24.png             	\
-		stock_copy_16			$(srcdir)/stock_copy_16.png			\
-                stock_copy_24			$(srcdir)/stock_copy_24.png             	\
-		stock_cut_16			$(srcdir)/stock_cut_16.png			\
-                stock_cut_24			$(srcdir)/stock_cut_24.png             		\
-		stock_dialog_error_48  		$(srcdir)/stock_dialog_error_48.png    		\
-	        stock_dialog_info_48   		$(srcdir)/stock_dialog_info_48.png     		\
-		stock_dialog_question_48  	$(srcdir)/stock_dialog_question_48.png 		\
-	 	stock_dialog_warning_48   	$(srcdir)/stock_dialog_warning_48.png  		\
-		stock_dnd_32                    $(srcdir)/stock_dnd_32.png			\
-		stock_down_arrow_16		$(srcdir)/stock_down_arrow_16.png		\
-                stock_down_arrow_24		$(srcdir)/stock_down_arrow_24.png             	\
-		stock_exec_16			$(srcdir)/stock_exec_16.png			\
-                stock_exec_24			$(srcdir)/stock_exec_24.png             	\
-		stock_exit_16			$(srcdir)/stock_exit_16.png			\
-		stock_exit_24			$(srcdir)/stock_exit_24.png 			\
-		stock_first_16			$(srcdir)/stock_first_16.png			\
-                stock_first_24			$(srcdir)/stock_first_24.png             	\
-                stock_font_16			$(srcdir)/stock_font_16.png             	\
-@STRIP_END@
-VARIABLES3 = @STRIP_BEGIN@ 									\
-                stock_font_24			$(srcdir)/stock_font_24.png             	\
-		stock_help_16			$(srcdir)/stock_help_16.png			\
-                stock_help_24			$(srcdir)/stock_help_24.png             	\
-		stock_home_16			$(srcdir)/stock_home_16.png			\
-                stock_home_24			$(srcdir)/stock_home_24.png             	\
-                stock_index_24			$(srcdir)/stock_index_24.png             	\
-		stock_jump_to_16		$(srcdir)/stock_jump_to_16.png			\
-                stock_jump_to_24		$(srcdir)/stock_jump_to_24.png             	\
-		stock_jump_to_rtl_16		$(srcdir)/stock_jump_to_rtl_16.png			\
-                stock_jump_to_rtl_24		$(srcdir)/stock_jump_to_rtl_24.png             	\
-		stock_last_16			$(srcdir)/stock_last_16.png			\
-                stock_last_24			$(srcdir)/stock_last_24.png             	\
-		stock_left_arrow_16		$(srcdir)/stock_left_arrow_16.png		\
-                stock_left_arrow_24		$(srcdir)/stock_left_arrow_24.png             	\
-		stock_missing_image_16		$(srcdir)/stock_broken_image_16.png             \
-		stock_missing_image_24		$(srcdir)/stock_broken_image_24.png             \
-		stock_new_16			$(srcdir)/stock_new_16.png			\
-		stock_new_24			$(srcdir)/stock_new_24.png			\
-		stock_no_20         		$(srcdir)/stock_no_20.png  			\
-		stock_ok_20     		$(srcdir)/stock_ok_20.png  			\
-		stock_open_16			$(srcdir)/stock_open_16.png			\
-		stock_open_24			$(srcdir)/stock_open_24.png  			\
-@STRIP_END@
-VARIABLES4 = @STRIP_BEGIN@ 									\
-		stock_paste_16			$(srcdir)/stock_paste_16.png			\
-                stock_paste_24			$(srcdir)/stock_paste_24.png             	\
-		stock_preferences_16		$(srcdir)/stock_preferences_16.png		\
-                stock_preferences_24		$(srcdir)/stock_preferences_24.png             	\
-		stock_print_16			$(srcdir)/stock_print_16.png			\
-                stock_print_24			$(srcdir)/stock_print_24.png             	\
-                stock_print_preview_16		$(srcdir)/stock_print_preview_16.png    	\
-                stock_print_preview_24		$(srcdir)/stock_print_preview_24.png            \
-		stock_properties_16		$(srcdir)/stock_properties_16.png		\
-                stock_properties_24		$(srcdir)/stock_properties_24.png             	\
-		stock_redo_16			$(srcdir)/stock_redo_16.png			\
-                stock_redo_24			$(srcdir)/stock_redo_24.png             	\
-		stock_refresh_16		$(srcdir)/stock_refresh_16.png			\
-                stock_refresh_24		$(srcdir)/stock_refresh_24.png             	\
-		stock_remove_16			$(srcdir)/stock_remove_16.png			\
-                stock_remove_24			$(srcdir)/stock_remove_24.png             	\
-		stock_revert_16			$(srcdir)/stock_revert_16.png			\
-                stock_revert_24			$(srcdir)/stock_revert_24.png             	\
-		stock_right_arrow_16		$(srcdir)/stock_right_arrow_16.png		\
-                stock_right_arrow_24		$(srcdir)/stock_right_arrow_24.png             	\
-		stock_save_16			$(srcdir)/stock_save_16.png			\
-@STRIP_END@
-VARIABLES5 = @STRIP_BEGIN@ 									\
-		stock_save_24			$(srcdir)/stock_save_24.png			\
-		stock_save_as_16		$(srcdir)/stock_save_as_16.png			\
-                stock_save_as_24		$(srcdir)/stock_save_as_24.png             	\
-		stock_search_16			$(srcdir)/stock_search_16.png			\
-                stock_search_24			$(srcdir)/stock_search_24.png             	\
-		stock_search_replace_16		$(srcdir)/stock_search_replace_16.png		\
-                stock_search_replace_24		$(srcdir)/stock_search_replace_24.png           \
-                stock_sort_ascending_16 	$(srcdir)/stock_sort_ascending_16.png           \
-                stock_sort_ascending_24		$(srcdir)/stock_sort_ascending_24.png           \
-                stock_sort_descending_16	$(srcdir)/stock_sort_descending_16.png          \
-                stock_sort_descending_24	$(srcdir)/stock_sort_descending_24.png          \
-		stock_spellcheck_16		$(srcdir)/stock_spellcheck_16.png		\
-                stock_spellcheck_24		$(srcdir)/stock_spellcheck_24.png             	\
-		stock_stop_16			$(srcdir)/stock_stop_16.png			\
-                stock_stop_24			$(srcdir)/stock_stop_24.png             	\
-		stock_text_bold_16		$(srcdir)/stock_text_bold_16.png		\
-                stock_text_bold_24		$(srcdir)/stock_text_bold_24.png             	\
-		stock_text_italic_16		$(srcdir)/stock_text_italic_16.png		\
-                stock_text_italic_24		$(srcdir)/stock_text_italic_24.png             	\
-		stock_text_strikethrough_16	$(srcdir)/stock_text_strikethrough_16.png	\
-@STRIP_END@
-VARIABLES6 = @STRIP_BEGIN@ 									\
-                stock_text_strikethrough_24	$(srcdir)/stock_text_strikethrough_24.png       \
-		stock_text_underline_16		$(srcdir)/stock_text_underline_16.png		\
-                stock_text_underline_24		$(srcdir)/stock_text_underline_24.png           \
-                stock_top_16			$(srcdir)/stock_top_16.png             		\
-                stock_top_24			$(srcdir)/stock_top_24.png             		\
-		stock_trash_16			$(srcdir)/stock_trash_16.png			\
-                stock_trash_24			$(srcdir)/stock_trash_24.png             	\
-		stock_undelete_16		$(srcdir)/stock_undelete_16.png			\
-                stock_undelete_24		$(srcdir)/stock_undelete_24.png             	\
-		stock_undo_16			$(srcdir)/stock_undo_16.png			\
-                stock_undo_24			$(srcdir)/stock_undo_24.png             	\
-		stock_up_arrow_16		$(srcdir)/stock_up_arrow_16.png			\
-                stock_up_arrow_24		$(srcdir)/stock_up_arrow_24.png             	\
-		stock_yes_20			$(srcdir)/stock_yes_20.png  			\
-                stock_zoom_1_24			$(srcdir)/stock_zoom_1_24.png             	\
-                stock_zoom_fit_24		$(srcdir)/stock_zoom_fit_24.png             	\
-                stock_zoom_in_24		$(srcdir)/stock_zoom_in_24.png           	\
-                stock_zoom_out_24		$(srcdir)/stock_zoom_out_24.png             	\
-@STRIP_END@
+VARIABLES1 = \
+	stock_add_16          	$(srcdir)/stock_add_16.png 		\
+	stock_add_24          	$(srcdir)/stock_add_24.png 		\
+	stock_align_center_16	$(srcdir)/stock_align_center_16.png	\
+	stock_align_center_24	$(srcdir)/stock_align_center_24.png	\
+	stock_align_justify_16	$(srcdir)/stock_align_justify_16.png	\
+	stock_align_justify_24	$(srcdir)/stock_align_justify_24.png	\
+	stock_align_left_16	$(srcdir)/stock_align_left_16.png	\
+	stock_align_left_24	$(srcdir)/stock_align_left_24.png	\
+        stock_align_right_16	$(srcdir)/stock_align_right_16.png	\
+        stock_align_right_24	$(srcdir)/stock_align_right_24.png	\
+	stock_apply_20	 	$(srcdir)/stock_apply_20.png  		\
+	stock_cancel_20		$(srcdir)/stock_cancel_20.png 		\
+	stock_dnd_multiple_32	$(srcdir)/stock_dnd_multiple_32.png 	\
+	stock_bottom_16		$(srcdir)/stock_bottom_16.png		\
+	stock_bottom_24		$(srcdir)/stock_bottom_24.png          	\
+	stock_cdrom_16		$(srcdir)/stock_cdrom_16.png		\
+	stock_cdrom_24		$(srcdir)/stock_cdrom_24.png           	\
+	stock_clear_24		$(srcdir)/stock_clear_24.png           	\
+	stock_close_20		$(srcdir)/stock_close_20.png  		\
+	stock_close_24		$(srcdir)/stock_close_24.png           	\
+	stock_colorselector_24	$(srcdir)/stock_colorselector_24.png	\
+	stock_color_picker_25	$(srcdir)/stock_color_picker_25.png
+VARIABLES2 = \
+	stock_convert_16	$(srcdir)/stock_convert_16.png		\
+	stock_convert_24	$(srcdir)/stock_convert_24.png		\
+	stock_copy_16		$(srcdir)/stock_copy_16.png		\
+	stock_copy_24		$(srcdir)/stock_copy_24.png            	\
+	stock_cut_16		$(srcdir)/stock_cut_16.png		\
+	stock_cut_24		$(srcdir)/stock_cut_24.png		\
+	stock_dialog_error_48  	$(srcdir)/stock_dialog_error_48.png	\
+	stock_dialog_info_48   	$(srcdir)/stock_dialog_info_48.png	\
+	stock_dialog_question_48  $(srcdir)/stock_dialog_question_48.png  \
+	stock_dialog_warning_48	$(srcdir)/stock_dialog_warning_48.png	\
+	stock_dnd_32		$(srcdir)/stock_dnd_32.png		\
+	stock_down_arrow_16	$(srcdir)/stock_down_arrow_16.png	\
+        stock_down_arrow_24	$(srcdir)/stock_down_arrow_24.png	\
+	stock_exec_16		$(srcdir)/stock_exec_16.png		\
+        stock_exec_24		$(srcdir)/stock_exec_24.png            	\
+	stock_exit_16		$(srcdir)/stock_exit_16.png		\
+	stock_exit_24		$(srcdir)/stock_exit_24.png 		\
+	stock_first_16		$(srcdir)/stock_first_16.png		\
+        stock_first_24		$(srcdir)/stock_first_24.png		\
+        stock_font_16		$(srcdir)/stock_font_16.png
+VARIABLES3 = \
+	stock_font_24		$(srcdir)/stock_font_24.png            	\
+	stock_help_16		$(srcdir)/stock_help_16.png		\
+	stock_help_24		$(srcdir)/stock_help_24.png            	\
+	stock_home_16		$(srcdir)/stock_home_16.png		\
+	stock_home_24		$(srcdir)/stock_home_24.png		\
+	stock_index_24		$(srcdir)/stock_index_24.png		\
+	stock_jump_to_16	$(srcdir)/stock_jump_to_16.png		\
+	stock_jump_to_24	$(srcdir)/stock_jump_to_24.png		\
+	stock_jump_to_rtl_16	$(srcdir)/stock_jump_to_rtl_16.png	\
+	stock_jump_to_rtl_24	$(srcdir)/stock_jump_to_rtl_24.png	\
+	stock_last_16		$(srcdir)/stock_last_16.png		\
+	stock_last_24		$(srcdir)/stock_last_24.png            	\
+	stock_left_arrow_16	$(srcdir)/stock_left_arrow_16.png	\
+	stock_left_arrow_24	$(srcdir)/stock_left_arrow_24.png	\
+	stock_missing_image_16	$(srcdir)/stock_broken_image_16.png	\
+	stock_missing_image_24	$(srcdir)/stock_broken_image_24.png	\
+	stock_new_16		$(srcdir)/stock_new_16.png		\
+	stock_new_24		$(srcdir)/stock_new_24.png		\
+	stock_no_20         	$(srcdir)/stock_no_20.png  		\
+	stock_ok_20     	$(srcdir)/stock_ok_20.png  		\
+	stock_open_16		$(srcdir)/stock_open_16.png		\
+	stock_open_24		$(srcdir)/stock_open_24.png
+VARIABLES4 = \
+	stock_paste_16		$(srcdir)/stock_paste_16.png		\
+	stock_paste_24		$(srcdir)/stock_paste_24.png		\
+	stock_preferences_16	$(srcdir)/stock_preferences_16.png	\
+	stock_preferences_24	$(srcdir)/stock_preferences_24.png	\
+	stock_print_16		$(srcdir)/stock_print_16.png		\
+	stock_print_24		$(srcdir)/stock_print_24.png		\
+	stock_print_preview_16	$(srcdir)/stock_print_preview_16.png	\
+	stock_print_preview_24	$(srcdir)/stock_print_preview_24.png	\
+	stock_properties_16	$(srcdir)/stock_properties_16.png	\
+	stock_properties_24	$(srcdir)/stock_properties_24.png	\
+	stock_redo_16		$(srcdir)/stock_redo_16.png		\
+	stock_redo_24		$(srcdir)/stock_redo_24.png             \
+	stock_refresh_16	$(srcdir)/stock_refresh_16.png		\
+	stock_refresh_24	$(srcdir)/stock_refresh_24.png		\
+	stock_remove_16		$(srcdir)/stock_remove_16.png		\
+	stock_remove_24		$(srcdir)/stock_remove_24.png		\
+	stock_revert_16		$(srcdir)/stock_revert_16.png		\
+	stock_revert_24		$(srcdir)/stock_revert_24.png		\
+	stock_right_arrow_16	$(srcdir)/stock_right_arrow_16.png	\
+	stock_right_arrow_24	$(srcdir)/stock_right_arrow_24.png	\
+	stock_save_16		$(srcdir)/stock_save_16.png
+VARIABLES5 = \
+	stock_save_24		$(srcdir)/stock_save_24.png		\
+	stock_save_as_16	$(srcdir)/stock_save_as_16.png		\
+	stock_save_as_24	$(srcdir)/stock_save_as_24.png		\
+	stock_search_16		$(srcdir)/stock_search_16.png		\
+	stock_search_24		$(srcdir)/stock_search_24.png		\
+	stock_search_replace_16	$(srcdir)/stock_search_replace_16.png	\
+	stock_search_replace_24	$(srcdir)/stock_search_replace_24.png	\
+	stock_sort_ascending_16	$(srcdir)/stock_sort_ascending_16.png	\
+	stock_sort_ascending_24	$(srcdir)/stock_sort_ascending_24.png	\
+	stock_sort_descending_16  $(srcdir)/stock_sort_descending_16.png  \
+	stock_sort_descending_24  $(srcdir)/stock_sort_descending_24.png  \
+	stock_spellcheck_16	$(srcdir)/stock_spellcheck_16.png	\
+	stock_spellcheck_24	$(srcdir)/stock_spellcheck_24.png	\
+	stock_stop_16		$(srcdir)/stock_stop_16.png		\
+	stock_stop_24		$(srcdir)/stock_stop_24.png             \
+	stock_text_bold_16	$(srcdir)/stock_text_bold_16.png	\
+	stock_text_bold_24	$(srcdir)/stock_text_bold_24.png	\
+	stock_text_italic_16	$(srcdir)/stock_text_italic_16.png	\
+	stock_text_italic_24	$(srcdir)/stock_text_italic_24.png	\
+	stock_text_strikethrough_16 $(srcdir)/stock_text_strikethrough_16.png
+VARIABLES6 = \
+	stock_text_strikethrough_24 $(srcdir)/stock_text_strikethrough_24.png \
+	stock_text_underline_16	$(srcdir)/stock_text_underline_16.png	\
+	stock_text_underline_24	$(srcdir)/stock_text_underline_24.png	\
+	stock_top_16		$(srcdir)/stock_top_16.png		\
+	stock_top_24		$(srcdir)/stock_top_24.png		\
+	stock_trash_16		$(srcdir)/stock_trash_16.png		\
+	stock_trash_24		$(srcdir)/stock_trash_24.png		\
+	stock_undelete_16	$(srcdir)/stock_undelete_16.png		\
+	stock_undelete_24	$(srcdir)/stock_undelete_24.png		\
+	stock_undo_16		$(srcdir)/stock_undo_16.png		\
+	stock_undo_24		$(srcdir)/stock_undo_24.png             \
+	stock_up_arrow_16	$(srcdir)/stock_up_arrow_16.png		\
+	stock_up_arrow_24	$(srcdir)/stock_up_arrow_24.png		\
+	stock_yes_20		$(srcdir)/stock_yes_20.png  		\
+	stock_zoom_1_24		$(srcdir)/stock_zoom_1_24.png		\
+	stock_zoom_fit_24	$(srcdir)/stock_zoom_fit_24.png		\
+	stock_zoom_in_24	$(srcdir)/stock_zoom_in_24.png		\
+	stock_zoom_out_24	$(srcdir)/stock_zoom_out_24.png
 
 noinst_DATA = gtkstockpixbufs.h
 CLEANFILES = $(noinst_DATA)
@@ -270,23 +263,23 @@ pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.load
 endif
 
 gtkstockpixbufs.h: @REBUILD_PNGS@ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES)
-	$(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 )
+	$(pixbuf_csource)						\
+	   --raw --build-list $(VARIABLES1) > gtkstockpixbufs.h ||	\
+           ( rm -f gtkstockpixbufs.h && false )
+	$(pixbuf_csource)						\
+	   --raw --build-list $(VARIABLES2) >> gtkstockpixbufs.h ||	\
+           ( rm -f gtkstockpixbufs.h && false )
+	$(pixbuf_csource)						\
+	   --raw --build-list $(VARIABLES3) >> gtkstockpixbufs.h ||	\
+           ( rm -f gtkstockpixbufs.h && false )
+	$(pixbuf_csource)						\
+	   --raw --build-list $(VARIABLES4) >> gtkstockpixbufs.h ||	\
+           ( rm -f gtkstockpixbufs.h && false )
+	$(pixbuf_csource)						\
+	   --raw --build-list $(VARIABLES5) >> gtkstockpixbufs.h ||	\
+           ( rm -f gtkstockpixbufs.h && false )
+	$(pixbuf_csource)						\
+	   --raw --build-list $(VARIABLES6) >> gtkstockpixbufs.h ||	\
+           ( rm -f gtkstockpixbufs.h && false )
 
 EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h