doh, this was broken beyond believe.

Tue Dec 12 23:46:44 2000  Tim Janik  <timj@gtk.org>

	* gtk/stock-icons/Makefile.am: doh, this was broken beyond believe.

	* gtk/gtkbox.c: change property types from (u)long to (u)int for
	::position and ::padding.

	* gtk/gtkcontainer.c: make ::border_width an INT property.

	* gtk/gtkpacker.c: make ::position an INT property.

	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_adjustment_changed):
	guard against NULL h/v scrollbars, since this is used at construction
	time.

	* gtk/gtkclist.[hc]: nuked gtk_clist_construct(), implemented
	internal gtk_clist_constructor().

	* gtk/gtkctree.[hc]: nuked gtk_ctree_construct(), implemented
	gtk_ctree_constructor().

	* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): property
	::pulse_step should use ARG_PULSE_STEP, not ARG_FRACTION.

	* docs/reference/Makefile.am: fun stuff, disabled docs generation
	again, gtk-scan.c needs to introspec paramspecs, not GtkAgs.

	* gtk/gtkwidget.[hc]:
	removed gtk_widget_setv(), gtk_widget_getv(), gtk_widget_newv()
	and gtk_widget_get().
	(gtk_widget_new): use g_object_new_valist().
	(gtk_widget_set): use g_object_set_valist().

	* gtk/gtkobject.[hc]:
	removed gtk_object_arg_get_info(), gtk_object_getv(),
	gtk_object_query_args(), gtk_object_newv(),
	gtk_object_class_add_signals(),
	gtk_object_class_user_signal_new(),
	gtk_object_class_user_signal_newv(),
	gtk_object_arg_set(), gtk_object_arg_get(),
	gtk_object_args_collect(),
	gtk_object_default_construct(),
	gtk_object_constructed(),
	GTK_CONSTRUCTED and GTK_OBJECT_CONSTRUCTED().
	removed nsignals, signals and n_args members from GtkObjectClass.
	(gtk_object_new): use g_object_new_valist().
	(gtk_object_set): use g_object_set_valist().
	(gtk_object_get): use g_object_get_valist().

	* gtk/gtkcompat.h: define gtk_object_default_construct().

	* gtk/gtktypeutils.c (gtk_type_new): create constructed objects via
	g_object_new().

	* gtk/*.c: removed gtk_object_class_add_signals() from class_init()
	fucntions, cleaned up method assignments (make sure your structures
	are setup properly before calling out). removed all GTK_CONSTRUCTED
	hacks ;)

1 files changed, 30 insertions, 11 deletions

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index c11abfca2..6ea383e8c 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -1,8 +1,25 @@
-BUILT_SOURCES=gtkstockpixbufs.h
 
-IMAGES= dialog_error.png  dialog_info.png  dialog_question.png  dialog_warning.png  stock_button_apply.png  stock_button_cancel.png  stock_button_close.png  stock_button_no.png  stock_button_ok.png  stock_button_yes.png  stock_close.png  stock_exit.png  stock_help.png  stock_new.png  stock_open.png  stock_save.png
+IMAGES = @STRIP_BEGIN@ \
+	dialog_error.png	\
+	dialog_info.png		\
+	dialog_question.png	\
+	dialog_warning.png	\
+	stock_button_apply.png	\
+	stock_button_cancel.png	\
+	stock_button_close.png	\
+	stock_button_no.png	\
+	stock_button_ok.png	\
+	stock_button_yes.png	\
+	stock_close.png		\
+	stock_exit.png		\
+	stock_help.png		\
+	stock_new.png		\
+	stock_open.png		\
+	stock_save.png		\
+@STRIP_END@
 
-VARIABLES=	dialog_error     	dialog_error.png    	\
+VARIABLES = @STRIP_BEGIN@ \
+		dialog_error     	dialog_error.png    	\
 	        dialog_info      	dialog_info.png     	\
 		dialog_question  	dialog_question.png 	\
 	 	dialog_warning   	dialog_warning.png  	\
@@ -17,15 +34,17 @@ VARIABLES=	dialog_error     	dialog_error.png    	\
 		stock_help		stock_help.png  	\
 		stock_new		stock_new.png		\
 		stock_open		stock_open.png  	\
-		stock_save		stock_save.png
+		stock_save		stock_save.png		\
+@STRIP_END@
 
-gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/make-inline-pixbuf $(IMAGES)
-	(topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \
-         cd $(top_srcdir)/gtk/stock-icons &&                 \
-            GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/make-inline-pixbuf $$curdir/gtkstockpixbufs.h $(VARIABLES))
+noinst_DATA = gtkstockpixbufs.h
+CLEANFILES += $(noinst_DATA)
 
-EXTRA_DIST = $(IMAGES)
+pixbuf_dir = $(top_builddir)/gdk-pixbuf
 
-# For some reason, rebuilding of this file doesn't happen in the make dist'ed version, so force it.
+gtkstockpixbufs.h: $(pixbuf_dir)/make-inline-pixbuf $(IMAGES)
+	cd $(srcdir) \
+	&& GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \
+	   $(pixbuf_dir)/make-inline-pixbuf gtkstockpixbufs.h $(VARIABLES)
 
-all-am: gtkstockpixbufs.h
+EXTRA_DIST = $(IMAGES)