[maemo-commits] [maemo-commits] r8245 - in projects/haf/trunk/pygtk: . gtk

From: osantana at stage.maemo.org osantana at stage.maemo.org
Date: Wed Nov 22 00:25:57 EET 2006
Author: osantana
Date: 2006-11-22 00:25:43 +0200 (Wed, 22 Nov 2006)
New Revision: 8245

Added:
   projects/haf/trunk/pygtk/gtk/_gtk.py
Modified:
   projects/haf/trunk/pygtk/Makefile.am
   projects/haf/trunk/pygtk/Makefile.in
   projects/haf/trunk/pygtk/gtk/Makefile.am
   projects/haf/trunk/pygtk/gtk/Makefile.in
   projects/haf/trunk/pygtk/gtk/__init__.py
   projects/haf/trunk/pygtk/gtk/_lazyutils.py
   projects/haf/trunk/pygtk/gtk/deprecation.py
   projects/haf/trunk/pygtk/gtk/gtk.override
   projects/haf/trunk/pygtk/gtk/gtkmodule.c
   projects/haf/trunk/pygtk/gtk/libglademodule.c
Log:
- lazy update patch applied!


Modified: projects/haf/trunk/pygtk/Makefile.am
===================================================================
--- projects/haf/trunk/pygtk/Makefile.am	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/Makefile.am	2006-11-21 22:25:43 UTC (rev 8245)
@@ -102,6 +102,22 @@
 #defs_DATA += $(PANGOCAIRO_DEFS)
 #endif
 
+# libglade module
+# XXX: Move libglade to
+LIBGLADE_DEFS = gtk/libglade.defs
+CLEANFILES += gtk/libglade.c
+EXTRA_DIST += $(LIBGLADE_DEFS) gtk/libglade.override
+libglade.c: $(LIBGLADE_DEFS) gtk/libglade.override
+_glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
+_glade_la_LIBADD = $(LIBGLADE_LIBS)
+_glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_glade
+_glade_la_SOURCES = gtk/libglademodule.c
+nodist__glade_la_SOURCES = gtk/libglade.c
+if BUILD_LIBGLADE
+pkgpyexec_LTLIBRARIES += _glade.la
+defs_DATA += $(LIBGLADE_DEFS)
+endif
+
 # code generator
 .defs.c:
 	(cd $(srcdir)\

Modified: projects/haf/trunk/pygtk/Makefile.in
===================================================================
--- projects/haf/trunk/pygtk/Makefile.in	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/Makefile.in	2006-11-21 22:25:43 UTC (rev 8245)
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 
-SOURCES = $(atk_la_SOURCES) $(nodist_atk_la_SOURCES) $(pango_la_SOURCES) $(nodist_pango_la_SOURCES)
+SOURCES = $(_glade_la_SOURCES) $(nodist__glade_la_SOURCES) $(atk_la_SOURCES) $(nodist_atk_la_SOURCES) $(pango_la_SOURCES) $(nodist_pango_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -43,6 +43,8 @@
 @BUILD_ATK_TRUE at am__append_3 = $(ATK_DEFS)
 @BUILD_PANGO_TRUE at am__append_4 = pango.la
 @BUILD_PANGO_TRUE at am__append_5 = $(PANGO_DEFS)
+ at BUILD_LIBGLADE_TRUE@am__append_6 = _glade.la
+ at BUILD_LIBGLADE_TRUE@am__append_7 = $(LIBGLADE_DEFS)
 DIST_COMMON = README $(am__configure_deps) $(noinst_PYTHON) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/PKG-INFO.in $(srcdir)/config.h.in \
@@ -68,6 +70,11 @@
 pyexecLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) $(pyexec_LTLIBRARIES)
 am__DEPENDENCIES_1 =
+_glade_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__glade_la_OBJECTS = _glade_la-libglademodule.lo
+nodist__glade_la_OBJECTS = _glade_la-libglade.lo
+_glade_la_OBJECTS = $(am__glade_la_OBJECTS) \
+	$(nodist__glade_la_OBJECTS)
 atk_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_atk_la_OBJECTS = atk_la-atkmodule.lo
 nodist_atk_la_OBJECTS = atk_la-atk.lo
@@ -79,7 +86,9 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atk_la-atk.Plo \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/_glade_la-libglade.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_glade_la-libglademodule.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/atk_la-atk.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/atk_la-atkmodule.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pango_la-pango.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/pango_la-pangomodule.Plo
@@ -91,9 +100,11 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(atk_la_SOURCES) $(nodist_atk_la_SOURCES) \
-	$(pango_la_SOURCES) $(nodist_pango_la_SOURCES)
-DIST_SOURCES = $(atk_la_SOURCES) $(pango_la_SOURCES)
+SOURCES = $(_glade_la_SOURCES) $(nodist__glade_la_SOURCES) \
+	$(atk_la_SOURCES) $(nodist_atk_la_SOURCES) $(pango_la_SOURCES) \
+	$(nodist_pango_la_SOURCES)
+DIST_SOURCES = $(_glade_la_SOURCES) $(atk_la_SOURCES) \
+	$(pango_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -276,7 +287,7 @@
 @BUILD_GTK_TRUE at GTK_SUBDIR = gtk
 SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
 PLATFORM_VERSION = 2.0
-CLEANFILES = atk.c pango.c
+CLEANFILES = atk.c pango.c gtk/libglade.c
 EXTRA_DIST = \
 	ChangeLog.pre-2-0		\
 	ChangeLog.pre-2-6		\
@@ -291,7 +302,7 @@
 	PKG-INFO.in 			\
 	setup.py 			\
 	THREADS\
-$(ATK_DEFS) $(ATK_OVERRIDES) $(PANGO_DEFS) pango.override
+$(ATK_DEFS) $(ATK_OVERRIDES) $(PANGO_DEFS) pango.override $(LIBGLADE_DEFS) gtk/libglade.override
 INCLUDES = \
 	$(PYTHON_INCLUDES) \
 	$(PYGOBJECT_CFLAGS)		\
@@ -305,12 +316,12 @@
 
 # defs files
 defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
-defs_DATA = $(am__append_3) $(am__append_5)
+defs_DATA = $(am__append_3) $(am__append_5) $(am__append_7)
 
 # python
 pyexec_LTLIBRARIES = 
 noinst_PYTHON = ltihooks.py
-pkgpyexec_LTLIBRARIES = $(am__append_2) $(am__append_4)
+pkgpyexec_LTLIBRARIES = $(am__append_2) $(am__append_4) $(am__append_6)
 
 # linker flags
 common_ldflags = -module -avoid-version $(am__append_1)
@@ -331,6 +342,30 @@
 pango_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpango
 pango_la_SOURCES = pangomodule.c
 nodist_pango_la_SOURCES = pango.c
+
+# pangocairo module
+#PANGOCAIRO_DEFS = pangocairo.defs pangocairo.override
+#CLEANFILES += pangocairo.c
+#EXTRA_DIST += $(PANGOCAIRO_DEFS) pangocairo.override
+#pangocairo.c: $(PANGOCAIRO_DEFS) pangocairo.override
+#pangocairo_la_CFLAGS = $(PYCAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS)
+#pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpangocairo
+#pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS)
+#pangocairo_la_SOURCES = pangocairomodule.c
+#nodist_pangocairo_la_SOURCES = pangocairo.c
+#if BUILD_PANGOCAIRO
+#pkgpyexec_LTLIBRARIES += pangocairo.la
+#defs_DATA += $(PANGOCAIRO_DEFS)
+#endif
+
+# libglade module
+# XXX: Move libglade to
+LIBGLADE_DEFS = gtk/libglade.defs
+_glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
+_glade_la_LIBADD = $(LIBGLADE_LIBS)
+_glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_glade
+_glade_la_SOURCES = gtk/libglademodule.c
+nodist__glade_la_SOURCES = gtk/libglade.c
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -448,6 +483,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
+_glade.la: $(_glade_la_OBJECTS) $(_glade_la_DEPENDENCIES) 
+	$(LINK) -rpath $(pkgpyexecdir) $(_glade_la_LDFLAGS) $(_glade_la_OBJECTS) $(_glade_la_LIBADD) $(LIBS)
 atk.la: $(atk_la_OBJECTS) $(atk_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkgpyexecdir) $(atk_la_LDFLAGS) $(atk_la_OBJECTS) $(atk_la_LIBADD) $(LIBS)
 pango.la: $(pango_la_OBJECTS) $(pango_la_DEPENDENCIES) 
@@ -459,6 +496,8 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_glade_la-libglade.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_glade_la-libglademodule.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/atk_la-atk.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/atk_la-atkmodule.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pango_la-pango.Plo at am__quote@
@@ -488,6 +527,54 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+_glade_la-libglademodule.o: gtk/libglademodule.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -MT _glade_la-libglademodule.o -MD -MP -MF "$(DEPDIR)/_glade_la-libglademodule.Tpo" -c -o _glade_la-libglademodule.o `test -f 'gtk/libglademodule.c' || echo '$(srcdir)/'`gtk/libglademodule.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_glade_la-libglademodule.Tpo" "$(DEPDIR)/_glade_la-libglademodule.Po"; else rm -f "$(DEPDIR)/_glade_la-libglademodule.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk/libglademodule.c' object='_glade_la-libglademodule.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_glade_la-libglademodule.Po' tmpdepfile='$(DEPDIR)/_glade_la-libglademodule.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -c -o _glade_la-libglademodule.o `test -f 'gtk/libglademodule.c' || echo '$(srcdir)/'`gtk/libglademodule.c
+
+_glade_la-libglademodule.obj: gtk/libglademodule.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -MT _glade_la-libglademodule.obj -MD -MP -MF "$(DEPDIR)/_glade_la-libglademodule.Tpo" -c -o _glade_la-libglademodule.obj `if test -f 'gtk/libglademodule.c'; then $(CYGPATH_W) 'gtk/libglademodule.c'; else $(CYGPATH_W) '$(srcdir)/gtk/libglademodule.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_glade_la-libglademodule.Tpo" "$(DEPDIR)/_glade_la-libglademodule.Po"; else rm -f "$(DEPDIR)/_glade_la-libglademodule.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk/libglademodule.c' object='_glade_la-libglademodule.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_glade_la-libglademodule.Po' tmpdepfile='$(DEPDIR)/_glade_la-libglademodule.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -c -o _glade_la-libglademodule.obj `if test -f 'gtk/libglademodule.c'; then $(CYGPATH_W) 'gtk/libglademodule.c'; else $(CYGPATH_W) '$(srcdir)/gtk/libglademodule.c'; fi`
+
+_glade_la-libglademodule.lo: gtk/libglademodule.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -MT _glade_la-libglademodule.lo -MD -MP -MF "$(DEPDIR)/_glade_la-libglademodule.Tpo" -c -o _glade_la-libglademodule.lo `test -f 'gtk/libglademodule.c' || echo '$(srcdir)/'`gtk/libglademodule.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_glade_la-libglademodule.Tpo" "$(DEPDIR)/_glade_la-libglademodule.Plo"; else rm -f "$(DEPDIR)/_glade_la-libglademodule.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk/libglademodule.c' object='_glade_la-libglademodule.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_glade_la-libglademodule.Plo' tmpdepfile='$(DEPDIR)/_glade_la-libglademodule.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -c -o _glade_la-libglademodule.lo `test -f 'gtk/libglademodule.c' || echo '$(srcdir)/'`gtk/libglademodule.c
+
+_glade_la-libglade.o: gtk/libglade.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -MT _glade_la-libglade.o -MD -MP -MF "$(DEPDIR)/_glade_la-libglade.Tpo" -c -o _glade_la-libglade.o `test -f 'gtk/libglade.c' || echo '$(srcdir)/'`gtk/libglade.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_glade_la-libglade.Tpo" "$(DEPDIR)/_glade_la-libglade.Po"; else rm -f "$(DEPDIR)/_glade_la-libglade.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk/libglade.c' object='_glade_la-libglade.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_glade_la-libglade.Po' tmpdepfile='$(DEPDIR)/_glade_la-libglade.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -c -o _glade_la-libglade.o `test -f 'gtk/libglade.c' || echo '$(srcdir)/'`gtk/libglade.c
+
+_glade_la-libglade.obj: gtk/libglade.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -MT _glade_la-libglade.obj -MD -MP -MF "$(DEPDIR)/_glade_la-libglade.Tpo" -c -o _glade_la-libglade.obj `if test -f 'gtk/libglade.c'; then $(CYGPATH_W) 'gtk/libglade.c'; else $(CYGPATH_W) '$(srcdir)/gtk/libglade.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_glade_la-libglade.Tpo" "$(DEPDIR)/_glade_la-libglade.Po"; else rm -f "$(DEPDIR)/_glade_la-libglade.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk/libglade.c' object='_glade_la-libglade.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_glade_la-libglade.Po' tmpdepfile='$(DEPDIR)/_glade_la-libglade.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -c -o _glade_la-libglade.obj `if test -f 'gtk/libglade.c'; then $(CYGPATH_W) 'gtk/libglade.c'; else $(CYGPATH_W) '$(srcdir)/gtk/libglade.c'; fi`
+
+_glade_la-libglade.lo: gtk/libglade.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -MT _glade_la-libglade.lo -MD -MP -MF "$(DEPDIR)/_glade_la-libglade.Tpo" -c -o _glade_la-libglade.lo `test -f 'gtk/libglade.c' || echo '$(srcdir)/'`gtk/libglade.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_glade_la-libglade.Tpo" "$(DEPDIR)/_glade_la-libglade.Plo"; else rm -f "$(DEPDIR)/_glade_la-libglade.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk/libglade.c' object='_glade_la-libglade.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_glade_la-libglade.Plo' tmpdepfile='$(DEPDIR)/_glade_la-libglade.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_glade_la_CFLAGS) $(CFLAGS) -c -o _glade_la-libglade.lo `test -f 'gtk/libglade.c' || echo '$(srcdir)/'`gtk/libglade.c
+
 atk_la-atkmodule.o: atkmodule.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atk_la_CFLAGS) $(CFLAGS) -MT atk_la-atkmodule.o -MD -MP -MF "$(DEPDIR)/atk_la-atkmodule.Tpo" -c -o atk_la-atkmodule.o `test -f 'atkmodule.c' || echo '$(srcdir)/'`atkmodule.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/atk_la-atkmodule.Tpo" "$(DEPDIR)/atk_la-atkmodule.Po"; else rm -f "$(DEPDIR)/atk_la-atkmodule.Tpo"; exit 1; fi
@@ -751,7 +838,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/codegen $(distdir)/docs/reference $(distdir)/m4
+	$(mkdir_p) $(distdir)/. $(distdir)/codegen $(distdir)/docs/reference $(distdir)/gtk $(distdir)/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -1002,22 +1089,8 @@
 
 atk.c: $(ATK_DEFS) $(ATK_OVERRIDES)
 pango.c: $(PANGO_DEFS) pango.override
+libglade.c: $(LIBGLADE_DEFS) gtk/libglade.override
 
-# pangocairo module
-#PANGOCAIRO_DEFS = pangocairo.defs pangocairo.override
-#CLEANFILES += pangocairo.c
-#EXTRA_DIST += $(PANGOCAIRO_DEFS) pangocairo.override
-#pangocairo.c: $(PANGOCAIRO_DEFS) pangocairo.override
-#pangocairo_la_CFLAGS = $(PYCAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS)
-#pangocairo_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initpangocairo
-#pangocairo_la_LIBADD = $(PANGOCAIRO_LIBS)
-#pangocairo_la_SOURCES = pangocairomodule.c
-#nodist_pangocairo_la_SOURCES = pangocairo.c
-#if BUILD_PANGOCAIRO
-#pkgpyexec_LTLIBRARIES += pangocairo.la
-#defs_DATA += $(PANGOCAIRO_DEFS)
-#endif
-
 # code generator
 .defs.c:
 	(cd $(srcdir)\

Modified: projects/haf/trunk/pygtk/gtk/Makefile.am
===================================================================
--- projects/haf/trunk/pygtk/gtk/Makefile.am	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/Makefile.am	2006-11-21 22:25:43 UTC (rev 8245)
@@ -25,6 +25,7 @@
 pygtkdir = $(pkgpythondir)/gtk
 pygtk_PYTHON = 			\
 	__init__.py 		\
+	_gtk.py			\
 	_lazyutils.py		\
 	compat.py			\
 	deprecation.py		\
@@ -113,10 +114,10 @@
 
 gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)
 gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES)
-_gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS)
-_gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
-_gtk_la_LIBADD = $(GTK_LIBS)
-_gtk_la_SOURCES = \
+_gtkimpl_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS)
+_gtkimpl_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
+_gtkimpl_la_LIBADD = $(GTK_LIBS)
+_gtkimpl_la_SOURCES = \
 	gtk-types.c 		\
   gtkmodule.c \
   gtkobject-support.c \
@@ -126,27 +127,27 @@
 	pygtkcellrenderer.c	\
 	pygtktreemodel.h 	\
 	pygtktreemodel.c
-nodist__gtk_la_SOURCES = gtk.c gdk.c
+nodist__gtkimpl_la_SOURCES = gtk.c gdk.c
 if BUILD_GTK
-pygtkexec_LTLIBRARIES += _gtk.la
+pygtkexec_LTLIBRARIES += _gtkimpl.la
 defs_DATA += $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \
 	gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs
 endif
 
-# libglade module
-LIBGLADE_DEFS = libglade.defs
-CLEANFILES += libglade.c
-EXTRA_DIST += $(LIBGLADE_DEFS) libglade.override
-libglade.c: $(LIBGLADE_DEFS) libglade.override gdk-types.defs gtk-types.defs
-glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
-glade_la_LIBADD = $(LIBGLADE_LIBS)
-glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
-glade_la_SOURCES = libglademodule.c
-nodist_glade_la_SOURCES = libglade.c
-if BUILD_LIBGLADE
-pygtkexec_LTLIBRARIES += glade.la
-defs_DATA += $(LIBGLADE_DEFS)
-endif
+## libglade module
+#LIBGLADE_DEFS = libglade.defs
+#CLEANFILES += libglade.c
+#EXTRA_DIST += $(LIBGLADE_DEFS) libglade.override
+#libglade.c: $(LIBGLADE_DEFS) libglade.override gdk-types.defs gtk-types.defs
+#_glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
+#_glade_la_LIBADD = $(LIBGLADE_LIBS)
+#_glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
+#_glade_la_SOURCES = libglademodule.c
+#nodist__glade_la_SOURCES = libglade.c
+#if BUILD_LIBGLADE
+#pygtkexec_LTLIBRARIES += _glade.la
+#defs_DATA += $(LIBGLADE_DEFS)
+#endif
 
 # gtkunixprint module
 GTKUNIXPRINT_DEFS = gtkunixprint.defs
@@ -165,7 +166,7 @@
 endif
 
 if PLATFORM_WIN32
-_gtk_la_CFLAGS  += -DPLATFORM_WIN32
+_gtkimpl_la_CFLAGS  += -DPLATFORM_WIN32
 endif
 
 

Modified: projects/haf/trunk/pygtk/gtk/Makefile.in
===================================================================
--- projects/haf/trunk/pygtk/gtk/Makefile.in	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/Makefile.in	2006-11-21 22:25:43 UTC (rev 8245)
@@ -16,7 +16,7 @@
 
 
 
-SOURCES = $(_gtk_la_SOURCES) $(nodist__gtk_la_SOURCES) $(glade_la_SOURCES) $(nodist_glade_la_SOURCES) $(gtkunixprint_la_SOURCES) $(nodist_gtkunixprint_la_SOURCES)
+SOURCES = $(_gtkimpl_la_SOURCES) $(nodist__gtkimpl_la_SOURCES) $(gtkunixprint_la_SOURCES) $(nodist_gtkunixprint_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -42,14 +42,12 @@
 @HAVE_GTK_2_10_TRUE at am__append_2 = gdk-2.10.defs 
 @HAVE_GTK_2_10_TRUE at am__append_3 = gtk-2.10.defs 
 @HAVE_GTK_2_10_TRUE at am__append_4 = gtk-2.10-types.defs
- at BUILD_GTK_TRUE@am__append_5 = _gtk.la
+ at BUILD_GTK_TRUE@am__append_5 = _gtkimpl.la
 @BUILD_GTK_TRUE at am__append_6 = $(GDK_DEFS) $(GDK_TYPES_DEFS) $(GTK_DEFS) $(GTK_TYPES_DEFS) \
 @BUILD_GTK_TRUE@	gdk.defs gtk.defs gdk-types.defs gtk-types.defs gtk-extrafuncs.defs
 
- at BUILD_LIBGLADE_TRUE@am__append_7 = glade.la
- at BUILD_LIBGLADE_TRUE@am__append_8 = $(LIBGLADE_DEFS)
- at BUILD_GTKUNIXPRINT_TRUE@am__append_9 = $(GTKUNIXPRINT_DEFS)
- at PLATFORM_WIN32_TRUE@am__append_10 = -DPLATFORM_WIN32
+ at BUILD_GTKUNIXPRINT_TRUE@am__append_7 = $(GTKUNIXPRINT_DEFS)
+ at PLATFORM_WIN32_TRUE@am__append_8 = -DPLATFORM_WIN32
 subdir = gtk
 DIST_COMMON = $(pkginclude_HEADERS) $(pygtk_PYTHON) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -66,16 +64,13 @@
 pygtkexecLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) $(pygtkexec_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-_gtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__gtk_la_OBJECTS = _gtk_la-gtk-types.lo _gtk_la-gtkmodule.lo \
-	_gtk_la-gtkobject-support.lo _gtk_la-pygtkcellrenderer.lo \
-	_gtk_la-pygtktreemodel.lo
-nodist__gtk_la_OBJECTS = _gtk_la-gtk.lo _gtk_la-gdk.lo
-_gtk_la_OBJECTS = $(am__gtk_la_OBJECTS) $(nodist__gtk_la_OBJECTS)
-glade_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_glade_la_OBJECTS = glade_la-libglademodule.lo
-nodist_glade_la_OBJECTS = glade_la-libglade.lo
-glade_la_OBJECTS = $(am_glade_la_OBJECTS) $(nodist_glade_la_OBJECTS)
+_gtkimpl_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__gtkimpl_la_OBJECTS = _gtkimpl_la-gtk-types.lo \
+	_gtkimpl_la-gtkmodule.lo _gtkimpl_la-gtkobject-support.lo \
+	_gtkimpl_la-pygtkcellrenderer.lo _gtkimpl_la-pygtktreemodel.lo
+nodist__gtkimpl_la_OBJECTS = _gtkimpl_la-gtk.lo _gtkimpl_la-gdk.lo
+_gtkimpl_la_OBJECTS = $(am__gtkimpl_la_OBJECTS) \
+	$(nodist__gtkimpl_la_OBJECTS)
 gtkunixprint_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_gtkunixprint_la_OBJECTS = gtkunixprint_la-gtkunixprintmodule.lo
 nodist_gtkunixprint_la_OBJECTS = gtkunixprint_la-gtkunixprint.lo
@@ -84,15 +79,13 @@
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/_gtk_la-gdk.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/_gtk_la-gtk-types.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/_gtk_la-gtk.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/_gtk_la-gtkmodule.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/_gtk_la-gtkobject-support.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/_gtk_la-pygtkcellrenderer.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/_gtk_la-pygtktreemodel.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/glade_la-libglade.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/glade_la-libglademodule.Plo \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/_gtkimpl_la-gdk.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_gtkimpl_la-gtk-types.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_gtkimpl_la-gtk.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_gtkimpl_la-gtkmodule.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_gtkimpl_la-gtkobject-support.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/gtkunixprint_la-gtkunixprint.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -103,11 +96,9 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(_gtk_la_SOURCES) $(nodist__gtk_la_SOURCES) \
-	$(glade_la_SOURCES) $(nodist_glade_la_SOURCES) \
+SOURCES = $(_gtkimpl_la_SOURCES) $(nodist__gtkimpl_la_SOURCES) \
 	$(gtkunixprint_la_SOURCES) $(nodist_gtkunixprint_la_SOURCES)
-DIST_SOURCES = $(_gtk_la_SOURCES) $(glade_la_SOURCES) \
-	$(gtkunixprint_la_SOURCES)
+DIST_SOURCES = $(_gtkimpl_la_SOURCES) $(gtkunixprint_la_SOURCES)
 pygtkPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
 defsDATA_INSTALL = $(INSTALL_DATA)
@@ -281,7 +272,7 @@
 	gtk-types.defs 		\
 	gdk.defs 		\
 	gdk-types.defs\
-libglade.c gtkunixprint.c
+gtkunixprint.c
 EXTRA_DIST = \
 	gtk-extrafuncs.defs	\
 	$(GDK_DEFS) 		\
@@ -291,7 +282,7 @@
 	$(GTK_TYPES_DEFS)	\
 	$(GTK_2_10_DEFS)	\
 	$(GTK_OVERRIDES)\
-$(LIBGLADE_DEFS) libglade.override $(GTKUNIXPRINT_DEFS) gtkunixprint.override
+$(GTKUNIXPRINT_DEFS) gtkunixprint.override
 INCLUDES = \
 	$(PYTHON_INCLUDES) \
 	$(PYGOBJECT_CFLAGS) \
@@ -300,16 +291,17 @@
 
 # defs files
 defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
-defs_DATA = $(am__append_6) $(am__append_8) $(am__append_9)
+defs_DATA = $(am__append_6) $(am__append_7)
 
 # gtk python extension modules
 pygtkexecdir = $(pkgpyexecdir)/gtk
-pygtkexec_LTLIBRARIES = $(am__append_5) $(am__append_7)
+pygtkexec_LTLIBRARIES = $(am__append_5)
 
 # gtk python scripts
 pygtkdir = $(pkgpythondir)/gtk
 pygtk_PYTHON = \
 	__init__.py 		\
+	_gtk.py			\
 	_lazyutils.py		\
 	compat.py			\
 	deprecation.py		\
@@ -351,10 +343,10 @@
 	gtkwidget.override 	\
 	gtkwindow.override
 
-_gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS) $(am__append_10)
-_gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
-_gtk_la_LIBADD = $(GTK_LIBS)
-_gtk_la_SOURCES = \
+_gtkimpl_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS) $(am__append_8)
+_gtkimpl_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
+_gtkimpl_la_LIBADD = $(GTK_LIBS)
+_gtkimpl_la_SOURCES = \
 	gtk-types.c 		\
   gtkmodule.c \
   gtkobject-support.c \
@@ -365,15 +357,21 @@
 	pygtktreemodel.h 	\
 	pygtktreemodel.c
 
-nodist__gtk_la_SOURCES = gtk.c gdk.c
+nodist__gtkimpl_la_SOURCES = gtk.c gdk.c
 
-# libglade module
-LIBGLADE_DEFS = libglade.defs
-glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
-glade_la_LIBADD = $(LIBGLADE_LIBS)
-glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
-glade_la_SOURCES = libglademodule.c
-nodist_glade_la_SOURCES = libglade.c
+#LIBGLADE_DEFS = libglade.defs
+#CLEANFILES += libglade.c
+#EXTRA_DIST += $(LIBGLADE_DEFS) libglade.override
+#libglade.c: $(LIBGLADE_DEFS) libglade.override gdk-types.defs gtk-types.defs
+#_glade_la_CFLAGS = $(LIBGLADE_CFLAGS)
+#_glade_la_LIBADD = $(LIBGLADE_LIBS)
+#_glade_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initglade
+#_glade_la_SOURCES = libglademodule.c
+#nodist__glade_la_SOURCES = libglade.c
+#if BUILD_LIBGLADE
+#pygtkexec_LTLIBRARIES += _glade.la
+#defs_DATA += $(LIBGLADE_DEFS)
+#endif
 
 # gtkunixprint module
 GTKUNIXPRINT_DEFS = gtkunixprint.defs
@@ -470,10 +468,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-_gtk.la: $(_gtk_la_OBJECTS) $(_gtk_la_DEPENDENCIES) 
-	$(LINK) -rpath $(pygtkexecdir) $(_gtk_la_LDFLAGS) $(_gtk_la_OBJECTS) $(_gtk_la_LIBADD) $(LIBS)
-glade.la: $(glade_la_OBJECTS) $(glade_la_DEPENDENCIES) 
-	$(LINK) -rpath $(pygtkexecdir) $(glade_la_LDFLAGS) $(glade_la_OBJECTS) $(glade_la_LIBADD) $(LIBS)
+_gtkimpl.la: $(_gtkimpl_la_OBJECTS) $(_gtkimpl_la_DEPENDENCIES) 
+	$(LINK) -rpath $(pygtkexecdir) $(_gtkimpl_la_LDFLAGS) $(_gtkimpl_la_OBJECTS) $(_gtkimpl_la_LIBADD) $(LIBS)
 gtkunixprint.la: $(gtkunixprint_la_OBJECTS) $(gtkunixprint_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkgpyexecdir) $(gtkunixprint_la_LDFLAGS) $(gtkunixprint_la_OBJECTS) $(gtkunixprint_la_LIBADD) $(LIBS)
 
@@ -483,15 +479,13 @@
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-gdk.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-gtk-types.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-gtk.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-gtkmodule.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-gtkobject-support.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-pygtkcellrenderer.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtk_la-pygtktreemodel.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glade_la-libglade.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glade_la-libglademodule.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-gdk.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-gtk-types.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-gtk.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-gtkmodule.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-gtkobject-support.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkunixprint_la-gtkunixprint.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Plo at am__quote@
 
@@ -519,222 +513,174 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-_gtk_la-gtk-types.o: gtk-types.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk-types.o -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk-types.Tpo" -c -o _gtk_la-gtk-types.o `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo" "$(DEPDIR)/_gtk_la-gtk-types.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-types.c' object='_gtk_la-gtk-types.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtk-types.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtk-types.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtk-types.o: gtk-types.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtk-types.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo" -c -o _gtkimpl_la-gtk-types.o `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo" "$(DEPDIR)/_gtkimpl_la-gtk-types.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-types.c' object='_gtkimpl_la-gtk-types.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtk-types.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtk-types.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk-types.o `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtk-types.o `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c
 
-_gtk_la-gtk-types.obj: gtk-types.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk-types.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk-types.Tpo" -c -o _gtk_la-gtk-types.obj `if test -f 'gtk-types.c'; then $(CYGPATH_W) 'gtk-types.c'; else $(CYGPATH_W) '$(srcdir)/gtk-types.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo" "$(DEPDIR)/_gtk_la-gtk-types.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-types.c' object='_gtk_la-gtk-types.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtk-types.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtk-types.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtk-types.obj: gtk-types.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtk-types.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo" -c -o _gtkimpl_la-gtk-types.obj `if test -f 'gtk-types.c'; then $(CYGPATH_W) 'gtk-types.c'; else $(CYGPATH_W) '$(srcdir)/gtk-types.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo" "$(DEPDIR)/_gtkimpl_la-gtk-types.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-types.c' object='_gtkimpl_la-gtk-types.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtk-types.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtk-types.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk-types.obj `if test -f 'gtk-types.c'; then $(CYGPATH_W) 'gtk-types.c'; else $(CYGPATH_W) '$(srcdir)/gtk-types.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtk-types.obj `if test -f 'gtk-types.c'; then $(CYGPATH_W) 'gtk-types.c'; else $(CYGPATH_W) '$(srcdir)/gtk-types.c'; fi`
 
-_gtk_la-gtk-types.lo: gtk-types.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk-types.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk-types.Tpo" -c -o _gtk_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo" "$(DEPDIR)/_gtk_la-gtk-types.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtk-types.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-types.c' object='_gtk_la-gtk-types.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtk-types.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-gtk-types.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtk-types.lo: gtk-types.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtk-types.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo" -c -o _gtkimpl_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo" "$(DEPDIR)/_gtkimpl_la-gtk-types.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtk-types.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk-types.c' object='_gtkimpl_la-gtk-types.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtk-types.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtk-types.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtk-types.lo `test -f 'gtk-types.c' || echo '$(srcdir)/'`gtk-types.c
 
-_gtk_la-gtkmodule.o: gtkmodule.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkmodule.o -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" -c -o _gtk_la-gtkmodule.o `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" "$(DEPDIR)/_gtk_la-gtkmodule.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkmodule.c' object='_gtk_la-gtkmodule.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtkmodule.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtkmodule.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtkmodule.o: gtkmodule.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtkmodule.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo" -c -o _gtkimpl_la-gtkmodule.o `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo" "$(DEPDIR)/_gtkimpl_la-gtkmodule.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkmodule.c' object='_gtkimpl_la-gtkmodule.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtkmodule.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtkmodule.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkmodule.o `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtkmodule.o `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c
 
-_gtk_la-gtkmodule.obj: gtkmodule.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkmodule.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" -c -o _gtk_la-gtkmodule.obj `if test -f 'gtkmodule.c'; then $(CYGPATH_W) 'gtkmodule.c'; else $(CYGPATH_W) '$(srcdir)/gtkmodule.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" "$(DEPDIR)/_gtk_la-gtkmodule.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkmodule.c' object='_gtk_la-gtkmodule.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtkmodule.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtkmodule.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtkmodule.obj: gtkmodule.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtkmodule.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo" -c -o _gtkimpl_la-gtkmodule.obj `if test -f 'gtkmodule.c'; then $(CYGPATH_W) 'gtkmodule.c'; else $(CYGPATH_W) '$(srcdir)/gtkmodule.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo" "$(DEPDIR)/_gtkimpl_la-gtkmodule.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkmodule.c' object='_gtkimpl_la-gtkmodule.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtkmodule.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtkmodule.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkmodule.obj `if test -f 'gtkmodule.c'; then $(CYGPATH_W) 'gtkmodule.c'; else $(CYGPATH_W) '$(srcdir)/gtkmodule.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtkmodule.obj `if test -f 'gtkmodule.c'; then $(CYGPATH_W) 'gtkmodule.c'; else $(CYGPATH_W) '$(srcdir)/gtkmodule.c'; fi`
 
-_gtk_la-gtkmodule.lo: gtkmodule.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkmodule.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" -c -o _gtk_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo" "$(DEPDIR)/_gtk_la-gtkmodule.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtkmodule.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkmodule.c' object='_gtk_la-gtkmodule.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtkmodule.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-gtkmodule.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtkmodule.lo: gtkmodule.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtkmodule.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo" -c -o _gtkimpl_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo" "$(DEPDIR)/_gtkimpl_la-gtkmodule.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtkmodule.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkmodule.c' object='_gtkimpl_la-gtkmodule.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtkmodule.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtkmodule.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtkmodule.lo `test -f 'gtkmodule.c' || echo '$(srcdir)/'`gtkmodule.c
 
-_gtk_la-gtkobject-support.o: gtkobject-support.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkobject-support.o -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" -c -o _gtk_la-gtkobject-support.o `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtk_la-gtkobject-support.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkobject-support.c' object='_gtk_la-gtkobject-support.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtkobject-support.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtkobject-support.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtkobject-support.o: gtkobject-support.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtkobject-support.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo" -c -o _gtkimpl_la-gtkobject-support.o `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkobject-support.c' object='_gtkimpl_la-gtkobject-support.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtkobject-support.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtkobject-support.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkobject-support.o `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtkobject-support.o `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c
 
-_gtk_la-gtkobject-support.obj: gtkobject-support.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkobject-support.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" -c -o _gtk_la-gtkobject-support.obj `if test -f 'gtkobject-support.c'; then $(CYGPATH_W) 'gtkobject-support.c'; else $(CYGPATH_W) '$(srcdir)/gtkobject-support.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtk_la-gtkobject-support.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkobject-support.c' object='_gtk_la-gtkobject-support.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtkobject-support.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtkobject-support.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtkobject-support.obj: gtkobject-support.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtkobject-support.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo" -c -o _gtkimpl_la-gtkobject-support.obj `if test -f 'gtkobject-support.c'; then $(CYGPATH_W) 'gtkobject-support.c'; else $(CYGPATH_W) '$(srcdir)/gtkobject-support.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkobject-support.c' object='_gtkimpl_la-gtkobject-support.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtkobject-support.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtkobject-support.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkobject-support.obj `if test -f 'gtkobject-support.c'; then $(CYGPATH_W) 'gtkobject-support.c'; else $(CYGPATH_W) '$(srcdir)/gtkobject-support.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtkobject-support.obj `if test -f 'gtkobject-support.c'; then $(CYGPATH_W) 'gtkobject-support.c'; else $(CYGPATH_W) '$(srcdir)/gtkobject-support.c'; fi`
 
-_gtk_la-gtkobject-support.lo: gtkobject-support.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtkobject-support.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" -c -o _gtk_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtk_la-gtkobject-support.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtkobject-support.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkobject-support.c' object='_gtk_la-gtkobject-support.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtkobject-support.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-gtkobject-support.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtkobject-support.lo: gtkobject-support.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtkobject-support.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo" -c -o _gtkimpl_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo" "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtkobject-support.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkobject-support.c' object='_gtkimpl_la-gtkobject-support.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtkobject-support.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtkobject-support.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtkobject-support.lo `test -f 'gtkobject-support.c' || echo '$(srcdir)/'`gtkobject-support.c
 
-_gtk_la-pygtkcellrenderer.o: pygtkcellrenderer.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtkcellrenderer.o -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" -c -o _gtk_la-pygtkcellrenderer.o `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Po"; else rm -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtkcellrenderer.c' object='_gtk_la-pygtkcellrenderer.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-pygtkcellrenderer.Po' tmpdepfile='$(DEPDIR)/_gtk_la-pygtkcellrenderer.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-pygtkcellrenderer.o: pygtkcellrenderer.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-pygtkcellrenderer.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo" -c -o _gtkimpl_la-pygtkcellrenderer.o `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtkcellrenderer.c' object='_gtkimpl_la-pygtkcellrenderer.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtkcellrenderer.o `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-pygtkcellrenderer.o `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c
 
-_gtk_la-pygtkcellrenderer.obj: pygtkcellrenderer.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtkcellrenderer.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" -c -o _gtk_la-pygtkcellrenderer.obj `if test -f 'pygtkcellrenderer.c'; then $(CYGPATH_W) 'pygtkcellrenderer.c'; else $(CYGPATH_W) '$(srcdir)/pygtkcellrenderer.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Po"; else rm -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtkcellrenderer.c' object='_gtk_la-pygtkcellrenderer.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-pygtkcellrenderer.Po' tmpdepfile='$(DEPDIR)/_gtk_la-pygtkcellrenderer.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-pygtkcellrenderer.obj: pygtkcellrenderer.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-pygtkcellrenderer.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo" -c -o _gtkimpl_la-pygtkcellrenderer.obj `if test -f 'pygtkcellrenderer.c'; then $(CYGPATH_W) 'pygtkcellrenderer.c'; else $(CYGPATH_W) '$(srcdir)/pygtkcellrenderer.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtkcellrenderer.c' object='_gtkimpl_la-pygtkcellrenderer.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtkcellrenderer.obj `if test -f 'pygtkcellrenderer.c'; then $(CYGPATH_W) 'pygtkcellrenderer.c'; else $(CYGPATH_W) '$(srcdir)/pygtkcellrenderer.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-pygtkcellrenderer.obj `if test -f 'pygtkcellrenderer.c'; then $(CYGPATH_W) 'pygtkcellrenderer.c'; else $(CYGPATH_W) '$(srcdir)/pygtkcellrenderer.c'; fi`
 
-_gtk_la-pygtkcellrenderer.lo: pygtkcellrenderer.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtkcellrenderer.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" -c -o _gtk_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Plo"; else rm -f "$(DEPDIR)/_gtk_la-pygtkcellrenderer.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtkcellrenderer.c' object='_gtk_la-pygtkcellrenderer.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-pygtkcellrenderer.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-pygtkcellrenderer.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-pygtkcellrenderer.lo: pygtkcellrenderer.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-pygtkcellrenderer.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo" -c -o _gtkimpl_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo" "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtkcellrenderer.c' object='_gtkimpl_la-pygtkcellrenderer.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-pygtkcellrenderer.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-pygtkcellrenderer.lo `test -f 'pygtkcellrenderer.c' || echo '$(srcdir)/'`pygtkcellrenderer.c
 
-_gtk_la-pygtktreemodel.o: pygtktreemodel.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtktreemodel.o -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" -c -o _gtk_la-pygtktreemodel.o `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtk_la-pygtktreemodel.Po"; else rm -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtktreemodel.c' object='_gtk_la-pygtktreemodel.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-pygtktreemodel.Po' tmpdepfile='$(DEPDIR)/_gtk_la-pygtktreemodel.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-pygtktreemodel.o: pygtktreemodel.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-pygtktreemodel.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo" -c -o _gtkimpl_la-pygtktreemodel.o `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtktreemodel.c' object='_gtkimpl_la-pygtktreemodel.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-pygtktreemodel.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtktreemodel.o `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-pygtktreemodel.o `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c
 
-_gtk_la-pygtktreemodel.obj: pygtktreemodel.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtktreemodel.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" -c -o _gtk_la-pygtktreemodel.obj `if test -f 'pygtktreemodel.c'; then $(CYGPATH_W) 'pygtktreemodel.c'; else $(CYGPATH_W) '$(srcdir)/pygtktreemodel.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtk_la-pygtktreemodel.Po"; else rm -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtktreemodel.c' object='_gtk_la-pygtktreemodel.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-pygtktreemodel.Po' tmpdepfile='$(DEPDIR)/_gtk_la-pygtktreemodel.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-pygtktreemodel.obj: pygtktreemodel.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-pygtktreemodel.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo" -c -o _gtkimpl_la-pygtktreemodel.obj `if test -f 'pygtktreemodel.c'; then $(CYGPATH_W) 'pygtktreemodel.c'; else $(CYGPATH_W) '$(srcdir)/pygtktreemodel.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtktreemodel.c' object='_gtkimpl_la-pygtktreemodel.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-pygtktreemodel.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtktreemodel.obj `if test -f 'pygtktreemodel.c'; then $(CYGPATH_W) 'pygtktreemodel.c'; else $(CYGPATH_W) '$(srcdir)/pygtktreemodel.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-pygtktreemodel.obj `if test -f 'pygtktreemodel.c'; then $(CYGPATH_W) 'pygtktreemodel.c'; else $(CYGPATH_W) '$(srcdir)/pygtktreemodel.c'; fi`
 
-_gtk_la-pygtktreemodel.lo: pygtktreemodel.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-pygtktreemodel.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" -c -o _gtk_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtk_la-pygtktreemodel.Plo"; else rm -f "$(DEPDIR)/_gtk_la-pygtktreemodel.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtktreemodel.c' object='_gtk_la-pygtktreemodel.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-pygtktreemodel.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-pygtktreemodel.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-pygtktreemodel.lo: pygtktreemodel.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-pygtktreemodel.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo" -c -o _gtkimpl_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo" "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pygtktreemodel.c' object='_gtkimpl_la-pygtktreemodel.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-pygtktreemodel.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-pygtktreemodel.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-pygtktreemodel.lo `test -f 'pygtktreemodel.c' || echo '$(srcdir)/'`pygtktreemodel.c
 
-_gtk_la-gtk.o: gtk.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk.o -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk.Tpo" -c -o _gtk_la-gtk.o `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtk.Tpo" "$(DEPDIR)/_gtk_la-gtk.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtk.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk.c' object='_gtk_la-gtk.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtk.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtk.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtk.o: gtk.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtk.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtk.Tpo" -c -o _gtkimpl_la-gtk.o `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtk.Tpo" "$(DEPDIR)/_gtkimpl_la-gtk.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtk.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk.c' object='_gtkimpl_la-gtk.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtk.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk.o `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtk.o `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c
 
-_gtk_la-gtk.obj: gtk.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk.Tpo" -c -o _gtk_la-gtk.obj `if test -f 'gtk.c'; then $(CYGPATH_W) 'gtk.c'; else $(CYGPATH_W) '$(srcdir)/gtk.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtk.Tpo" "$(DEPDIR)/_gtk_la-gtk.Po"; else rm -f "$(DEPDIR)/_gtk_la-gtk.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk.c' object='_gtk_la-gtk.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtk.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gtk.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtk.obj: gtk.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtk.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtk.Tpo" -c -o _gtkimpl_la-gtk.obj `if test -f 'gtk.c'; then $(CYGPATH_W) 'gtk.c'; else $(CYGPATH_W) '$(srcdir)/gtk.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtk.Tpo" "$(DEPDIR)/_gtkimpl_la-gtk.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtk.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk.c' object='_gtkimpl_la-gtk.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtk.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk.obj `if test -f 'gtk.c'; then $(CYGPATH_W) 'gtk.c'; else $(CYGPATH_W) '$(srcdir)/gtk.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtk.obj `if test -f 'gtk.c'; then $(CYGPATH_W) 'gtk.c'; else $(CYGPATH_W) '$(srcdir)/gtk.c'; fi`
 
-_gtk_la-gtk.lo: gtk.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gtk.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gtk.Tpo" -c -o _gtk_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gtk.Tpo" "$(DEPDIR)/_gtk_la-gtk.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gtk.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk.c' object='_gtk_la-gtk.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gtk.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-gtk.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-gtk.lo: gtk.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gtk.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gtk.Tpo" -c -o _gtkimpl_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gtk.Tpo" "$(DEPDIR)/_gtkimpl_la-gtk.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-gtk.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtk.c' object='_gtkimpl_la-gtk.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gtk.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gtk.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gtk.lo `test -f 'gtk.c' || echo '$(srcdir)/'`gtk.c
 
-_gtk_la-gdk.o: gdk.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gdk.o -MD -MP -MF "$(DEPDIR)/_gtk_la-gdk.Tpo" -c -o _gtk_la-gdk.o `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gdk.Tpo" "$(DEPDIR)/_gtk_la-gdk.Po"; else rm -f "$(DEPDIR)/_gtk_la-gdk.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdk.c' object='_gtk_la-gdk.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gdk.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gdk.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gdk.o: gdk.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gdk.o -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gdk.Tpo" -c -o _gtkimpl_la-gdk.o `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gdk.Tpo" "$(DEPDIR)/_gtkimpl_la-gdk.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gdk.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdk.c' object='_gtkimpl_la-gdk.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gdk.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gdk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gdk.o `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gdk.o `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c
 
-_gtk_la-gdk.obj: gdk.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gdk.obj -MD -MP -MF "$(DEPDIR)/_gtk_la-gdk.Tpo" -c -o _gtk_la-gdk.obj `if test -f 'gdk.c'; then $(CYGPATH_W) 'gdk.c'; else $(CYGPATH_W) '$(srcdir)/gdk.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gdk.Tpo" "$(DEPDIR)/_gtk_la-gdk.Po"; else rm -f "$(DEPDIR)/_gtk_la-gdk.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdk.c' object='_gtk_la-gdk.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gdk.Po' tmpdepfile='$(DEPDIR)/_gtk_la-gdk.TPo' @AMDEPBACKSLASH@
+_gtkimpl_la-gdk.obj: gdk.c
+ at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gdk.obj -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gdk.Tpo" -c -o _gtkimpl_la-gdk.obj `if test -f 'gdk.c'; then $(CYGPATH_W) 'gdk.c'; else $(CYGPATH_W) '$(srcdir)/gdk.c'; fi`; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gdk.Tpo" "$(DEPDIR)/_gtkimpl_la-gdk.Po"; else rm -f "$(DEPDIR)/_gtkimpl_la-gdk.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdk.c' object='_gtkimpl_la-gdk.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gdk.Po' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gdk.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gdk.obj `if test -f 'gdk.c'; then $(CYGPATH_W) 'gdk.c'; else $(CYGPATH_W) '$(srcdir)/gdk.c'; fi`
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gdk.obj `if test -f 'gdk.c'; then $(CYGPATH_W) 'gdk.c'; else $(CYGPATH_W) '$(srcdir)/gdk.c'; fi`
 
-_gtk_la-gdk.lo: gdk.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -MT _gtk_la-gdk.lo -MD -MP -MF "$(DEPDIR)/_gtk_la-gdk.Tpo" -c -o _gtk_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtk_la-gdk.Tpo" "$(DEPDIR)/_gtk_la-gdk.Plo"; else rm -f "$(DEPDIR)/_gtk_la-gdk.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdk.c' object='_gtk_la-gdk.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtk_la-gdk.Plo' tmpdepfile='$(DEPDIR)/_gtk_la-gdk.TPlo' @AMDEPBACKSLASH@
+_gtkimpl_la-gdk.lo: gdk.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -MT _gtkimpl_la-gdk.lo -MD -MP -MF "$(DEPDIR)/_gtkimpl_la-gdk.Tpo" -c -o _gtkimpl_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/_gtkimpl_la-gdk.Tpo" "$(DEPDIR)/_gtkimpl_la-gdk.Plo"; else rm -f "$(DEPDIR)/_gtkimpl_la-gdk.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdk.c' object='_gtkimpl_la-gdk.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/_gtkimpl_la-gdk.Plo' tmpdepfile='$(DEPDIR)/_gtkimpl_la-gdk.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtk_la_CFLAGS) $(CFLAGS) -c -o _gtk_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_gtkimpl_la_CFLAGS) $(CFLAGS) -c -o _gtkimpl_la-gdk.lo `test -f 'gdk.c' || echo '$(srcdir)/'`gdk.c
 
-glade_la-libglademodule.o: libglademodule.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglademodule.o -MD -MP -MF "$(DEPDIR)/glade_la-libglademodule.Tpo" -c -o glade_la-libglademodule.o `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/glade_la-libglademodule.Tpo" "$(DEPDIR)/glade_la-libglademodule.Po"; else rm -f "$(DEPDIR)/glade_la-libglademodule.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libglademodule.c' object='glade_la-libglademodule.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/glade_la-libglademodule.Po' tmpdepfile='$(DEPDIR)/glade_la-libglademodule.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglademodule.o `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c
-
-glade_la-libglademodule.obj: libglademodule.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglademodule.obj -MD -MP -MF "$(DEPDIR)/glade_la-libglademodule.Tpo" -c -o glade_la-libglademodule.obj `if test -f 'libglademodule.c'; then $(CYGPATH_W) 'libglademodule.c'; else $(CYGPATH_W) '$(srcdir)/libglademodule.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/glade_la-libglademodule.Tpo" "$(DEPDIR)/glade_la-libglademodule.Po"; else rm -f "$(DEPDIR)/glade_la-libglademodule.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libglademodule.c' object='glade_la-libglademodule.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/glade_la-libglademodule.Po' tmpdepfile='$(DEPDIR)/glade_la-libglademodule.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglademodule.obj `if test -f 'libglademodule.c'; then $(CYGPATH_W) 'libglademodule.c'; else $(CYGPATH_W) '$(srcdir)/libglademodule.c'; fi`
-
-glade_la-libglademodule.lo: libglademodule.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglademodule.lo -MD -MP -MF "$(DEPDIR)/glade_la-libglademodule.Tpo" -c -o glade_la-libglademodule.lo `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/glade_la-libglademodule.Tpo" "$(DEPDIR)/glade_la-libglademodule.Plo"; else rm -f "$(DEPDIR)/glade_la-libglademodule.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libglademodule.c' object='glade_la-libglademodule.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/glade_la-libglademodule.Plo' tmpdepfile='$(DEPDIR)/glade_la-libglademodule.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglademodule.lo `test -f 'libglademodule.c' || echo '$(srcdir)/'`libglademodule.c
-
-glade_la-libglade.o: libglade.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglade.o -MD -MP -MF "$(DEPDIR)/glade_la-libglade.Tpo" -c -o glade_la-libglade.o `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/glade_la-libglade.Tpo" "$(DEPDIR)/glade_la-libglade.Po"; else rm -f "$(DEPDIR)/glade_la-libglade.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libglade.c' object='glade_la-libglade.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/glade_la-libglade.Po' tmpdepfile='$(DEPDIR)/glade_la-libglade.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglade.o `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c
-
-glade_la-libglade.obj: libglade.c
- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglade.obj -MD -MP -MF "$(DEPDIR)/glade_la-libglade.Tpo" -c -o glade_la-libglade.obj `if test -f 'libglade.c'; then $(CYGPATH_W) 'libglade.c'; else $(CYGPATH_W) '$(srcdir)/libglade.c'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/glade_la-libglade.Tpo" "$(DEPDIR)/glade_la-libglade.Po"; else rm -f "$(DEPDIR)/glade_la-libglade.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libglade.c' object='glade_la-libglade.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/glade_la-libglade.Po' tmpdepfile='$(DEPDIR)/glade_la-libglade.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglade.obj `if test -f 'libglade.c'; then $(CYGPATH_W) 'libglade.c'; else $(CYGPATH_W) '$(srcdir)/libglade.c'; fi`
-
-glade_la-libglade.lo: libglade.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -MT glade_la-libglade.lo -MD -MP -MF "$(DEPDIR)/glade_la-libglade.Tpo" -c -o glade_la-libglade.lo `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/glade_la-libglade.Tpo" "$(DEPDIR)/glade_la-libglade.Plo"; else rm -f "$(DEPDIR)/glade_la-libglade.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libglade.c' object='glade_la-libglade.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/glade_la-libglade.Plo' tmpdepfile='$(DEPDIR)/glade_la-libglade.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glade_la_CFLAGS) $(CFLAGS) -c -o glade_la-libglade.lo `test -f 'libglade.c' || echo '$(srcdir)/'`libglade.c
-
 gtkunixprint_la-gtkunixprintmodule.o: gtkunixprintmodule.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtkunixprint_la_CFLAGS) $(CFLAGS) -MT gtkunixprint_la-gtkunixprintmodule.o -MD -MP -MF "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo" -c -o gtkunixprint_la-gtkunixprintmodule.o `test -f 'gtkunixprintmodule.c' || echo '$(srcdir)/'`gtkunixprintmodule.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo" "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Po"; else rm -f "$(DEPDIR)/gtkunixprint_la-gtkunixprintmodule.Tpo"; exit 1; fi
@@ -1044,7 +990,6 @@
 
 gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)
 gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES)
-libglade.c: $(LIBGLADE_DEFS) libglade.override gdk-types.defs gtk-types.defs
 gtkunixprint.c: $(GTKUNIXPRINT_DEFS) gtkunixprint.override gdk-types.defs \
 	gtk-types.defs
 

Modified: projects/haf/trunk/pygtk/gtk/__init__.py
===================================================================
--- projects/haf/trunk/pygtk/gtk/__init__.py	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/__init__.py	2006-11-21 22:25:43 UTC (rev 8245)
@@ -42,10 +42,10 @@
     raise ImportError(
         "PyGTK requires PyGObject 2.11.1 or higher, but %s was found" % (ver,))
 
-if 'gtk._gtk' in sys.modules:
-    _gtk = sys.modules['gtk._gtk']
+if 'gtk._gtkimpl' in sys.modules:
+    _gtk = sys.modules['gtk._gtkimpl']
 else:
-    from gtk import _gtk
+    from gtk import _gtkimpl
 
 import gdk
 
@@ -59,11 +59,12 @@
 def _init():
     import sys
 
+    init_check = _gtkimpl._get_symbol(globals(), 'init_check')
     try:
         sys_path = sys.path[:]
 
         try:
-            _gtk.init_check()
+            init_check()
         except RuntimeError, e:
             import warnings
             warnings.warn(str(e), _gtk.Warning)
@@ -74,14 +75,15 @@
             sys.path = sys_path
 
     # install the default log handlers
-    _gtk.add_log_handlers()
+    add_log_handlers = _gtkimpl._get_symbol(globals(), 'add_log_handlers')
+    add_log_handlers()
 
 keysyms = LazyModule('keysyms', locals())
 
 _init()
 
 # CAPI
-_PyGtk_API = _gtk._PyGtk_API
+_PyGtk_API = _gtkimpl._PyGtk_API
 
 gdk.INPUT_READ      = _gobject.IO_IN | _gobject.IO_HUP | _gobject.IO_ERR
 gdk.INPUT_WRITE     = _gobject.IO_OUT | _gobject.IO_HUP
@@ -126,14 +128,14 @@
 
 # Do this as late as possible, so programs like pyflakes can check
 # everything above
-from gtk._gtk import *
+from gtk._gtkimpl import *
 
-# # For testing, so you can just turn of dynamicnamespace in gtk.override
-# if hasattr(_gtk, '_get_symbol_names'):
-#     import gtk
-#     ns = LazyNamespace(_gtk, locals())
-#     ns.add_submodule('glade', '_glade')
-#     ns.add_submodule('_gtk', 'gtk._gtk')
-#     sys.modules['gtk'] = ns
-#     sys.modules['gtk.glade'] = LazyModule('_glade', {})
+# For testing, so you can just turn of dynamicnamespace in gtk.override
+if hasattr(_gtkimpl, '_get_symbol_names'):
+    import gtk
+    ns = LazyNamespace(_gtkimpl, locals())
+    ns.add_submodule('glade', '_glade')
+    ns.add_submodule('_gtk', 'gtk._gtk')
+    sys.modules['gtk'] = ns
+    sys.modules['gtk.glade'] = LazyModule('_glade', {})
 

Added: projects/haf/trunk/pygtk/gtk/_gtk.py
===================================================================
--- projects/haf/trunk/pygtk/gtk/_gtk.py	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/_gtk.py	2006-11-21 22:25:43 UTC (rev 8245)
@@ -0,0 +1,30 @@
+# -*- Mode: Python; py-indent-offset: 4 -*-
+# pygtk - Python bindings for the GTK+ widget set.
+# Copyright (C) 2006 Johan Dahlin
+#
+#   gtk/_gtk.py: backwards compatibility code.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+from gtk import _gtkimpl
+import gtk
+
+l = locals()
+for symbol in _gtkimpl._get_symbol_names():
+    l[symbol] = _gtkimpl._get_symbol(gtk.__dict__, symbol)
+del l
+
+_PyGtk_API = _gtkimpl._PyGtk_API

Modified: projects/haf/trunk/pygtk/gtk/_lazyutils.py
===================================================================
--- projects/haf/trunk/pygtk/gtk/_lazyutils.py	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/_lazyutils.py	2006-11-21 22:25:43 UTC (rev 8245)
@@ -35,19 +35,8 @@
             return dir(module)
         return getattr(module, attr)
 
-class _NotLoadedMarker:
-    pass
-_marker = _NotLoadedMarker()
+_marker = object()
 
-class LazyDict(dict):
-    def __init__(self, module):
-        self._module = module
-        dict.__init__(self)
-
-    def __getitem__(self, name):
-        print name
-        return getattr(self._module, name)
-
 class LazyNamespace(ModuleType):
     def __init__(self, module, locals):
         ModuleType.__init__(self, locals['__name__'])
@@ -60,7 +49,7 @@
         for symbol in module._get_symbol_names():
             lazy_symbols[symbol] = ns[symbol] = _marker
 
-        ns.update(__dict__=LazyDict(self),
+        ns.update(__dict__=ns,
                   __bases__=(ModuleType,),
                   add_submodule=self.add_submodule)
 

Modified: projects/haf/trunk/pygtk/gtk/deprecation.py
===================================================================
--- projects/haf/trunk/pygtk/gtk/deprecation.py	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/deprecation.py	2006-11-21 22:25:43 UTC (rev 8245)
@@ -23,7 +23,7 @@
 import sys
 import warnings
 
-from gtk._gtk import DeprecationWarning
+from gtk._gtkimpl import DeprecationWarning
 
 def _is_pydoc():
     if sys.argv:

Modified: projects/haf/trunk/pygtk/gtk/gtk.override
===================================================================
--- projects/haf/trunk/pygtk/gtk/gtk.override	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/gtk.override	2006-11-21 22:25:43 UTC (rev 8245)
@@ -123,6 +123,8 @@
 %%
 modulename gtk
 %%
+options dynamicnamespace
+%%
 import gobject.GObject as PyGObject_Type
 import atk.Object as PyAtkObject_Type
 import pango.Context as PyPangoContext_Type

Modified: projects/haf/trunk/pygtk/gtk/gtkmodule.c
===================================================================
--- projects/haf/trunk/pygtk/gtk/gtkmodule.c	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/gtkmodule.c	2006-11-21 22:25:43 UTC (rev 8245)
@@ -187,7 +187,7 @@
 }
 
 DL_EXPORT(void)
-init_gtk(void)
+init_gtkimpl(void)
 {
     PyObject *m, *d, *tuple, *o;
 
@@ -206,7 +206,7 @@
     pygobject_register_sinkfunc(GTK_TYPE_INVISIBLE, sink_gtkinvisible);
     pygobject_register_sinkfunc(GTK_TYPE_OBJECT, sink_gtkobject);
 	
-    m = Py_InitModule("gtk._gtk", pygtk_functions);
+    m = Py_InitModule("gtk._gtkimpl", pygtk_functions);
     d = PyModule_GetDict(m);
 
     /* gtk+ version */
@@ -223,7 +223,6 @@
 	
     _pygtk_register_boxed_types(d);
     pygtk_register_classes(d);
-    pygtk_add_constants(m, "GTK_");
     pygtk_add_extra_constants(m);
     pygtk_add_stock_items(d);
     

Modified: projects/haf/trunk/pygtk/gtk/libglademodule.c
===================================================================
--- projects/haf/trunk/pygtk/gtk/libglademodule.c	2006-11-21 21:18:32 UTC (rev 8244)
+++ projects/haf/trunk/pygtk/gtk/libglademodule.c	2006-11-21 22:25:43 UTC (rev 8245)
@@ -32,11 +32,11 @@
 extern PyMethodDef pylibglade_functions[];
 
 DL_EXPORT(void)
-initglade(void)
+init_glade(void)
 {
     PyObject *m, *d;
 
-    m = Py_InitModule("gtk.glade", pylibglade_functions);
+    m = Py_InitModule("_glade", pylibglade_functions);
     d = PyModule_GetDict(m);
 
     init_pygobject();


More information about the maemo-commits mailing list