GNOME.org
 

[gnome-python-extras] Use pygobject-codegen-2.0 instead of deprecated pygtk-codegen-2.0.

commit 6cb4b530a8ed9277cd7e6fb00ad72349b5134d2a
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun May 2 13:13:54 2010 +0200

    Use pygobject-codegen-2.0 instead of deprecated pygtk-codegen-2.0.
    
    * configure.ac: Check for pygobject-codegen-2.0 instead of pygtk-codegen-2.0.
    Rename the automake variables.
    * egg/recent/Makefile.am:
    * egg/tray/Makefile.am:
    * gda/Makefile.am:
    * gdl/Makefile.am:
    * gksu/Makefile.am:
    * gksu2/Makefile.am:
    * gtkhtml2/Makefile.am:
    * gtkmozembed/Makefile.am: Use the renamed variables.

 ChangeLog               |   15 +++++++++++++++
 configure.ac            |   10 +++++-----
 egg/recent/Makefile.am  |    2 +-
 egg/tray/Makefile.am    |    2 +-
 gda/Makefile.am         |    2 +-
 gdl/Makefile.am         |    4 ++--
 gksu/Makefile.am        |    2 +-
 gksu2/Makefile.am       |    2 +-
 gtkhtml2/Makefile.am    |    2 +-
 gtkmozembed/Makefile.am |    2 +-
 10 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ad8e6fa..1eb69c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2010-05-02  Murray Cumming  <murrayc murrayc com>
 
+	Use pygobject-codegen-2.0 instead of deprecated pygtk-codegen-2.0.
+	
+	* configure.ac: Check for pygobject-codegen-2.0 instead of pygtk-codegen-2.0.
+	Rename the automake variables.
+	* egg/recent/Makefile.am:
+	* egg/tray/Makefile.am:
+	* gda/Makefile.am:
+	* gdl/Makefile.am:
+	* gksu/Makefile.am:
+	* gksu2/Makefile.am:
+	* gtkhtml2/Makefile.am:
+	* gtkmozembed/Makefile.am: Use the renamed variables.
+
+2010-05-02  Murray Cumming  <murrayc murrayc com>
+
 	Gda: Updated
 	
 	* gda/gda.defs: Regenerated with small corrections, against libgda-4.0 (not 4.2)
diff --git a/configure.ac b/configure.ac
index d09afb4..fe2d44e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,9 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 dnl check for pygtk
 PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
 AC_SUBST(PYGTK_CFLAGS)
-AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
-if test "x$PYGTK_CODEGEN" = xno; then
-  AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
+AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
+if test "x$PYGOBJECT_CODEGEN" = xno; then
+  AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
 fi
 
 AC_MSG_CHECKING([for conflicting pygtk versions])
@@ -323,9 +323,9 @@ if $have_gdl07; then
   AC_DEFINE([HAVE_GDL_0_7], [], [If GDL >= 0.7 was found])
 fi
 
-AC_SUBST([PYGTK_CODEGEN_DEFINES])
+AC_SUBST([PYGOBJECT_CODEGEN_DEFINES])
 if $have_gdl07; then
-  PYGTK_CODEGEN_DEFINES="-DHAVE_GDL_0_7 $PYGTK_CODEGEN_DEFINES";
+  PYGOBJECT_CODEGEN_DEFINES="-DHAVE_GDL_0_7 $PYGOBJECT_CODEGEN_DEFINES";
 fi
 
 
diff --git a/egg/recent/Makefile.am b/egg/recent/Makefile.am
index 06a7210..0cf4d1b 100644
--- a/egg/recent/Makefile.am
+++ b/egg/recent/Makefile.am
@@ -61,7 +61,7 @@ eggrecent.c: eggrecent.defs eggrecent.override
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 	    --override $*.override \
 	    --load-types $(GNOME_PYTHON_ARGTYPES_DIR)/bonobo-arg-types.py \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
diff --git a/egg/tray/Makefile.am b/egg/tray/Makefile.am
index 779664c..24db37c 100644
--- a/egg/tray/Makefile.am
+++ b/egg/tray/Makefile.am
@@ -26,7 +26,7 @@ trayicon.c: trayicon.defs trayicon.override
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 	    --override $*.override \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
diff --git a/gda/Makefile.am b/gda/Makefile.am
index 8beb22d..48092f1 100644
--- a/gda/Makefile.am
+++ b/gda/Makefile.am
@@ -49,7 +49,7 @@ gda.c: gda.defs gda.override $(argtypes_PYTHON)
 # generic rule
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
 	    --load-types gda-arg-types.py \
 	    --register gda.defs \
diff --git a/gdl/Makefile.am b/gdl/Makefile.am
index 37fc224..7615a3e 100644
--- a/gdl/Makefile.am
+++ b/gdl/Makefile.am
@@ -18,9 +18,9 @@ CLEANFILES = gdl.c
 
 .defs.c:
 	(cd $(srcdir)\
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 		--override $*.override \
-	    $(PYGTK_CODEGEN_DEFINES) \
+	    $(PYGOBJECT_CODEGEN_DEFINES) \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
diff --git a/gksu/Makefile.am b/gksu/Makefile.am
index 9a15d7f..4a729cb 100644
--- a/gksu/Makefile.am
+++ b/gksu/Makefile.am
@@ -43,7 +43,7 @@ CLEANFILES += gksuui.c
 
 .defs.c:
 	(cd $(srcdir)\
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 		--override $*.override \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
diff --git a/gksu2/Makefile.am b/gksu2/Makefile.am
index b588344..3e5ca3f 100644
--- a/gksu2/Makefile.am
+++ b/gksu2/Makefile.am
@@ -30,7 +30,7 @@ CLEANFILES += gksu2.c
 
 .defs.c:
 	(cd $(srcdir)\
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 		--override $*.override \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/pango-types.defs \
diff --git a/gtkhtml2/Makefile.am b/gtkhtml2/Makefile.am
index fca98ca..fef625c 100644
--- a/gtkhtml2/Makefile.am
+++ b/gtkhtml2/Makefile.am
@@ -27,7 +27,7 @@ gtkhtml2.c: gtkhtml2.defs gtkhtml2.override
 
 .defs.c:
 	(cd $(srcdir) \
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 	    --override $*.override \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
diff --git a/gtkmozembed/Makefile.am b/gtkmozembed/Makefile.am
index 48aaa82..9596559 100644
--- a/gtkmozembed/Makefile.am
+++ b/gtkmozembed/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = gtkmozembed.override gtkmozembed.defs
 
 .defs.c:
 	(cd $(srcdir)\
-	 && $(PYGTK_CODEGEN) \
+	 && $(PYGOBJECT_CODEGEN) \
 	    $(GTKMOZEMBED_CODEGEN_DEFINES) \
 	    --override $*.override \
 	    --prefix py$* $*.defs) > gen-$*.c \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]