Add conditional support for Gtk+ 2.10 add new api.

    * codegen/createdefs.py:
    * configure.in:
    * gtk/Makefile.am:
    * gtk/gdk-2.10.defs:
    * gtk/gdk-base-types.defs:
    * gtk/gdk-base.defs:
    * gtk/gdk-types.defs:
    * gtk/gdk.defs:
    * gtk/gdk.override:
    * gtk/gtk-2.10-types.defs:
    * gtk/gtk-2.10.defs:
    * gtk/gtk-base-types.defs:
    * gtk/gtk-base.defs:
    * gtk/gtk-types.defs:
    * gtk/gtk.defs:

    Add conditional support for Gtk+ 2.10 add new api.

1 files changed, 47 insertions, 9 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 81b68cc5..39c6cc41 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -33,8 +33,19 @@ common_ldflags += -no-undefined
 endif
 
 # gtk module
-GDK_DEFS = gdk.defs gdk-types.defs
-GTK_DEFS = gtk.defs gtk-types.defs gtk-extrafuncs.defs
+GTK_DEFS = gtk-base.defs
+GDK_DEFS = gdk-base.defs
+GTK_TYPES_DEFS = gtk-base-types.defs
+GDK_TYPES_DEFS = gdk-base-types.defs
+
+if HAVE_GTK_2_10
+GDK_DEFS += gdk-2.10.defs 
+GTK_DEFS += gtk-2.10.defs 
+GTK_TYPES_DEFS += gtk-2.10-types.defs
+endif
+
+CREATEDEFS = $(PYTHON) ../codegen/createdefs.py
+
 GDK_OVERRIDES = \
 	gdk.override 		\
 	gdkcairo.override	\
@@ -59,10 +70,37 @@ GTK_OVERRIDES = 		\
 	gtkwidget.override 	\
 	gtkwindow.override
 
-CLEANFILES += gtk.c gdk.c
-EXTRA_DIST += $(GDK_DEFS) $(GDK_OVERRIDES) $(GTK_DEFS) $(GTK_OVERRIDES)
-gdk.c: $(GDK_DEFS) $(GDK_OVERRIDES)
-gtk.c: $(GTK_DEFS) $(GTK_OVERRIDES)
+CLEANFILES += 			\
+	gtk.c 			\
+	gdk.c			\
+	gtk.defs		\
+	gtk-types.defs		\
+	gdk.defs		\
+	gdk-types.defs
+
+EXTRA_DIST += 			\
+	$(GDK_DEFS) 		\
+	$(GDK_TYPES_DEFS) 	\
+	$(GDK_OVERRIDES) 	\
+	$(GTK_DEFS) 		\
+	$(GTK_TYPES_DEFS)	\
+	$(GTK_OVERRIDES)
+
+
+gdk.defs: $(GDK_DEFS)
+	$(CREATEDEFS) gdk.defs $(GDK_DEFS)
+
+gtk.defs: $(GTK_DEFS)
+	$(CREATEDEFS) gtk.defs $(GTK_DEFS)
+
+gdk-types.defs: $(GDK_TYPES_DEFS)
+	$(CREATEDEFS) gdk-types.defs $(GDK_TYPES_DEFS)
+
+gtk-types.defs: $(GTK_TYPES_DEFS)
+	$(CREATEDEFS) gtk-types.defs $(GTK_TYPES_DEFS)
+
+gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)
+gtk.c: gtk-types.defs gtk.defs $(GTK_OVERRIDES)
 _gtk_la_CFLAGS = $(GTK_CFLAGS)
 _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
 _gtk_la_LIBADD = $(GTK_LIBS)
@@ -79,7 +117,7 @@ _gtk_la_SOURCES = 		\
 nodist__gtk_la_SOURCES = gtk.c gdk.c
 if BUILD_GTK
 pygtkexec_LTLIBRARIES += _gtk.la
-defs_DATA += $(GTK_DEFS) $(GDK_DEFS)
+defs_DATA += $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS)
 endif
 if PLATFORM_WIN32
 _gtk_la_CFLAGS  += -DPLATFORM_WIN32
@@ -100,7 +138,8 @@ pygtkexec_LTLIBRARIES += glade.la
 defs_DATA += $(LIBGLADE_DEFS)
 endif
 
-.defs.c:
+.defs.c: 
+	@make -s gtk.defs gtk-types.defs gdk.defs gdk-types.defs
 	(cd $(srcdir) \
 	 && $(PYTHON) ../codegen/codegen.py \
 	   $(PYGTK_CODEGEN_DEFINES) \
@@ -118,4 +157,3 @@ endif
 # could use pattern rules.  Perhaps we should rename gtk-types.c.
 gtk-types.c:
 	@:
-