diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-05 21:04:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-05 21:04:09 +0000 |
| commit | ec09f3ab15ad4c797367363a40ac489d7ec64e8f (patch) | |
| tree | 8728429b4dfed1802fa139b45f79aa337ee49a8a | |
| parent | 049771c5f6eb927d5a65b4461bdd8e3b29aff163 (diff) | |
| download | gtk+-ec09f3ab15ad4c797367363a40ac489d7ec64e8f.tar.gz | |
Update version to 2.0.0
Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com>
* configure.in test/makefile.msc **.pc.in **/*.am:
Update version to 2.0.0
* gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp
files.
* configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0,
Pango, Atk, 1.0.0.
* m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum
version.
37 files changed, 254 insertions, 143 deletions
@@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 266c7c4461..f42114cd6b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 266c7c4461..f42114cd6b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 266c7c4461..f42114cd6b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 266c7c4461..f42114cd6b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 266c7c4461..f42114cd6b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 266c7c4461..f42114cd6b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +Tue Mar 5 15:47:54 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in test/makefile.msc **.pc.in **/*.am: + Update version to 2.0.0 + + * gtk/Makefile.am (MAINTAINERCLEANFILES): Add stamp + files. + + * configure.in (GDK_PIXBUF_VERSION): Require GLib 2.0.0, + Pango, Atk, 1.0.0. + + * m4macros/gtk-2.0.m4: Default to 2.0.0 as the minimum + version. + 2002-03-05 Havoc Pennington <hp@redhat.com> * gtk/gtktextview.c (gtk_text_view_size_allocate): don't assign diff --git a/configure.in b/configure.in index b3a5b37e28..7e9b0601a1 100644 --- a/configure.in +++ b/configure.in @@ -12,11 +12,6 @@ AC_INIT(gdk/gdktypes.h) # foo_DEP_CFLAGS: All cflags this module requires -## We could have pkg-config uniquify the ldflags and cflags by calling -## it once with both the GLib and Pango package names, but we don't, -## someone should fix that. - - # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -32,13 +27,14 @@ GLIB_AC_DIVERT_BEFORE_HELP([ # if backwards compatibility has been broken, # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. # -GTK_MAJOR_VERSION=1 -GTK_MINOR_VERSION=3 -GTK_MICRO_VERSION=15 +GTK_MAJOR_VERSION=2 +GTK_MINOR_VERSION=0 +GTK_MICRO_VERSION=0 GTK_INTERFACE_AGE=0 GTK_BINARY_AGE=0 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION -dnl +dnl This is the X.Y used in -lgtk-FOO-X.Y +GTK_API_VERSION=2.0 ])dnl AC_SUBST(GTK_MAJOR_VERSION) @@ -46,6 +42,7 @@ AC_SUBST(GTK_MINOR_VERSION) AC_SUBST(GTK_MICRO_VERSION) AC_SUBST(GTK_INTERFACE_AGE) AC_SUBST(GTK_BINARY_AGE) +AC_SUBST(GTK_API_VERSION) AC_SUBST(GTK_VERSION) # libtool versioning @@ -80,9 +77,9 @@ AC_SUBST(GDK_PIXBUF_MICRO) AC_SUBST(GDK_PIXBUF_VERSION) ## Versions of dependencies -GLIB_REQUIRED_VERSION=1.3.15 -PANGO_REQUIRED_VERSION=0.26 -ATK_REQUIRED_VERSION=0.13 +GLIB_REQUIRED_VERSION=2.0.0 +PANGO_REQUIRED_VERSION=1.0.0 +ATK_REQUIRED_VERSION=1.0.0 # For automake. VERSION=$GTK_VERSION @@ -193,8 +190,8 @@ case $gdktarget in *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);; esac -gdktargetlib=libgdk-$gdktarget-1.3.la -gtktargetlib=libgtk-$gdktarget-1.3.la +gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la +gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la AC_SUBST(gdktargetlib) AC_SUBST(gtktargetlib) @@ -1270,7 +1267,7 @@ fi if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then : else - AC_CHECK_LIB(atk, atk_object_get_type, : , AC_MSG_ERROR([ + AC_CHECK_LIB(atk-1.0, atk_object_get_type, : , AC_MSG_ERROR([ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required *** to build GTK+]), $ATK_LIBS $GLIB_LIBS) fi diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am index 45e1cefb16..9098e054a1 100644 --- a/contrib/gdk-pixbuf-xlib/Makefile.am +++ b/contrib/gdk-pixbuf-xlib/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES=libgdk_pixbuf_xlib-1.3.la +lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) -I$(top_builddir) \ @@ -11,11 +11,11 @@ LDADDS = @STRIP_BEGIN@ \ @GDK_PIXBUF_XLIB_DEP_LIBS@ \ @STRIP_END@ -libgdk_pixbuf_xlib_1_3_la_LDFLAGS = \ +libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ -export-dynamic \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libgdk_pixbuf_xlib_1_3_la_SOURCES = \ +libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ gdk-pixbuf-xlib.c \ gdk-pixbuf-xlib-render.c \ diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in index 026b1ffb2f..996d6c305c 100644 --- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in +++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in @@ -7,5 +7,5 @@ Name: GdkPixbuf Xlib Description: GdkPixbuf rendering for Xlib Version: @VERSION@ Requires: gobject-2.0,gmodule-2.0,gdk-pixbuf-2.0 -Libs: -L${libdir} -lgdk_pixbuf_xlib-1.3 +Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@ Cflags: -I${includedir} diff --git a/demos/Makefile.am b/demos/Makefile.am index 307b91c6e2..2230a8130c 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -14,14 +14,14 @@ INCLUDES = @STRIP_BEGIN@ \ @STRIP_END@ DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ -LDADDS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ \ +LDADDS = @STRIP_BEGIN@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gtk/@gtktargetlib@ \ @STRIP_END@ noinst_PROGRAMS = \ diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 021f74320c..b01a9eae41 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -36,14 +36,14 @@ INCLUDES = @STRIP_BEGIN@ \ @STRIP_END@ DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ -LDADDS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ \ +LDADDS = @STRIP_BEGIN@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gtk/@gtktargetlib@ \ @STRIP_END@ bin_PROGRAMS = gtk-demo diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 37a660e4af..159b6ac352 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +Tue Mar 5 14:28:28 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/compiling.sgml: Update version numbers in example. + 2002-03-04 Matthias Clasen <maclas@gmx.de> * gtk/gtk-docs.sgml: Move GtkOldEditable to the "Deprecated" diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index a47279e241..d93f8dffa3 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -58,11 +58,11 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \ @GTK_DEP_CFLAGS@ \ @STRIP_END@ -GTKDOC_LIBS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ \ - @GTK_DEP_LIBS@ \ +GTKDOC_LIBS = @STRIP_BEGIN@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gtk/@gtktargetlib@ \ + @GTK_DEP_LIBS@ \ @STRIP_END@ GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 22abcc8753..d2b8972eca 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -154,10 +154,10 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@ \ @GTK_DEP_CFLAGS@ \ @STRIP_END@ -GTKDOC_LIBS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ \ +GTKDOC_LIBS = @STRIP_BEGIN@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gtk/@gtktargetlib@ \ @STRIP_END@ GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) diff --git a/docs/reference/gtk/compiling.sgml b/docs/reference/gtk/compiling.sgml index 445b7e0ef0..609bc0c775 100644 --- a/docs/reference/gtk/compiling.sgml +++ b/docs/reference/gtk/compiling.sgml @@ -27,7 +27,7 @@ The following interactive shell session demonstrates how $ pkg-config --cflags gtk+-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/atk-1.0 $ pkg-config --libs gtk+-2.0 - -L/usr/lib -L/usr/X11R6/lib -lgtk-x11-1.3 -lgdk-x11-1.3 -lXi -lgdk_pixbuf-1.3 -lm -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-1.3 -lgmodule-1.3 -ldl -lglib-1.3 + -L/usr/lib -L/usr/X11R6/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -lXi -lgdk_pixbuf-2.0 -lm -lpangox -lpangoxft -lXft -lXrender -lXext -lX11 -lfreetype -lpango -latk -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 </programlisting> </para> <para> diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 456bfeb3dd..2494ad670b 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -908,6 +908,14 @@ a RC file. </para> +<!-- ##### SIGNAL GtkMenuBar::cycle-focus ##### --> +<para> + +</para> + +@menubar: the object which received the signal. +@arg1: + <!-- ##### ARG GtkObject:object-signal ##### --> <para> Setting this with a GtkType of GTK_TYPE_SIGNAL connects diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index a99e0a15d9..a0990a19c9 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -43,7 +43,7 @@ Creates a new #GtkEntry widget. <para> </para> -@max: +@max: @Returns: @@ -165,8 +165,8 @@ use gtk_editable_set_editable() instead. <para> </para> -@entry: -@max: +@entry: +@max: <!-- ##### FUNCTION gtk_entry_get_activates_default ##### --> diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml index 5c85311713..3b22a5872f 100644 --- a/docs/reference/gtk/tmpl/gtkmenubar.sgml +++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml @@ -64,11 +64,3 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position @position: the position in the item list where the @child is added. -<!-- ##### SIGNAL GtkMenuBar::cycle-focus ##### --> -<para> - -</para> - -@menubar: the object which received the signal. -@arg1: - diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml index fc64ef33df..bd5c539eb6 100644 --- a/docs/reference/gtk/tmpl/gtkmenushell.sgml +++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml @@ -161,6 +161,14 @@ Causes the GtkMenuShell::selection-done signal to be emitted. @menushell: the object which received the signal. +<!-- ##### SIGNAL GtkMenuShell::cycle-focus ##### --> +<para> + +</para> + +@menushell: the object which received the signal. +@arg1: + <!-- ##### SIGNAL GtkMenuShell::deactivate ##### --> <para> This signal is emitted when a menu shell is deactivated. diff --git a/gdk-2.0-uninstalled.pc.in b/gdk-2.0-uninstalled.pc.in index 3c70b7bb4f..99cbc7ad48 100644 --- a/gdk-2.0-uninstalled.pc.in +++ b/gdk-2.0-uninstalled.pc.in @@ -4,5 +4,5 @@ Name: GDK Uninstalled Description: GIMP Drawing Kit (${target} target), Not Installed Version: @VERSION@ Requires: gdk-pixbuf-2.0-uninstalled @GDK_PACKAGES@ -Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-1.3.la @GDK_EXTRA_LIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-@GTK_API_VERSION@.la @GDK_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@ diff --git a/gdk-2.0.pc.in b/gdk-2.0.pc.in index 54048b6420..27cbd9b3f7 100644 --- a/gdk-2.0.pc.in +++ b/gdk-2.0.pc.in @@ -8,5 +8,5 @@ Name: GDK Description: GIMP Drawing Kit (${target} target) Version: @VERSION@ Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@ -Libs: -L${libdir} -lgdk-${target}-1.3 @GDK_EXTRA_LIBS@ +Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@ Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@ diff --git a/gdk-pixbuf-2.0-uninstalled.pc.in b/gdk-pixbuf-2.0-uninstalled.pc.in index 20b2f2d5e3..c514cdbb6c 100644 --- a/gdk-pixbuf-2.0-uninstalled.pc.in +++ b/gdk-pixbuf-2.0-uninstalled.pc.in @@ -2,7 +2,7 @@ Name: GdkPixbuf Uninstalled Description: Image loading and scaling, Not Installed Version: @VERSION@ Requires: gobject-2.0,gmodule-2.0 -Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-1.3.la @GDK_PIXBUF_EXTRA_LIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-@GTK_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@ diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in index f4c0fb5b97..f8d130c02a 100644 --- a/gdk-pixbuf-2.0.pc.in +++ b/gdk-pixbuf-2.0.pc.in @@ -7,6 +7,6 @@ Name: GdkPixbuf Description: Image loading and scaling Version: @VERSION@ Requires: gobject-2.0,gmodule-2.0 -Libs: -L${libdir} -lgdk_pixbuf-1.3 @GDK_PIXBUF_EXTRA_LIBS@ +Libs: -L${libdir} -lgdk_pixbuf-@GTK_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ Cflags: -I${includedir}/gtk-2.0 @GDK_PIXBUF_EXTRA_CFLAGS@ diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index b40c1f36ef..f33a3bbe04 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -15,36 +15,36 @@ gdk_pixbuf-win32res.lo : gdk_pixbuf.rc $(top_srcdir)/build/win32/lt-compile-resource gdk_pixbuf.rc gdk_pixbuf-win32res.lo install-libtool-import-lib: - $(INSTALL) .libs/libgdk_pixbuf-1.3.dll.a $(DESTDIR)$(libdir) + $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libdk_pixbuf-1.3.dll.a + -rm $(DESTDIR)$(libdir)/libdk_pixbuf-$(GTK_API_VERSION).dll.a else install-libtool-import-lib: uninstall-libtool-import-lib: endif if MS_LIB_AVAILABLE -noinst_DATA = gdk_pixbuf-1.3.lib +noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib -gdk_pixbuf-1.3.lib: libgdk_pixbuf-1.3.la gdk_pixbuf.def - lib -name:libgdk_pixbuf-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@ +gdk_pixbuf-$(GTK_API_VERSION).lib: libgdk_pixbuf-$(GTK_API_VERSION).la gdk_pixbuf.def + lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@ install-ms-lib: - $(INSTALL) gdk_pixbuf-1.3.lib $(DESTDIR)$(libdir) + $(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/gdk_pixbuf-1.3.lib + -rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).lib else install-ms-lib: uninstall-ms-lib: endif lib_LTLIBRARIES = \ - libgdk_pixbuf-1.3.la + libgdk_pixbuf-2.0.la loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders -module_libs = libgdk_pixbuf-1.3.la $(GDK_PIXBUF_DEP_LIBS) +module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) # # The PNG plugin. @@ -212,7 +212,7 @@ builtin_objs = @INCLUDED_LOADER_OBJ@ endif -DEPS = libgdk_pixbuf-1.3.la +DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la INCLUDES = @STRIP_BEGIN@ \ -DG_LOG_DOMAIN=\"GdkPixbuf\" \ -I$(top_srcdir) -I$(top_builddir) \ @@ -227,7 +227,7 @@ INCLUDES = @STRIP_BEGIN@ \ @STRIP_END@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" -LDADDS = libgdk_pixbuf-1.3.la +LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la noinst_PROGRAMS = test-gdk-pixbuf test-loaders test_gdk_pixbuf_LDADD = $(LDADDS) @@ -248,7 +248,7 @@ man_MANS = gdk-pixbuf-csource.1 # The GdkPixBuf library # libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf -libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \ +libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \ gdk-pixbuf-i18n.h \ gdk-pixbuf.c \ gdk-pixbuf-animation.c \ @@ -260,15 +260,15 @@ libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \ gdk-pixdata.c \ $(gdk_pixbuf_built_cfiles) \ @STRIP_END@ -libgdk_pixbuf_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ +libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ @LIBTOOL_EXPORT_OPTIONS@ \ $(no_undefined) \ $(gdk_pixbuf_symbols) \ @STRIP_END@ -libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS) -libgdk_pixbuf_1_3_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) +libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS) +libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) gdk_pixbuf_headers = \ gdk-pixbuf.h \ @@ -286,7 +286,7 @@ noinst_HEADERS = \ gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h gdk-pixbuf-marshal.h gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c -$(libgdk_pixbuf_1_3_la_OBJECTS) $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c +$(libgdk_pixbuf_2_0_la_OBJECTS) $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c CLEANFILES = MAINTAINERCLEANFILES = $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c diff --git a/gdk-pixbuf/makefile.msc b/gdk-pixbuf/makefile.msc index bd935ca993..a66d22c85b 100644 --- a/gdk-pixbuf/makefile.msc +++ b/gdk-pixbuf/makefile.msc @@ -9,7 +9,7 @@ PKG_VER = $(GDK_PIXBUF_VER) PERL = perl !ENDIF -GDK_PIXBUF_VER = 1.3 +GDK_PIXBUF_VER = 2.0 # to get _working_ include modules we need respective defines ... BUILT_IN_FORMATS = -DINCLUDE_png -DINCLUDE_bmp -DINCLUDE_gif \ diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3accc9fd47..8bba21f69b 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -40,25 +40,25 @@ if OS_WIN32 gdk_win32_symbols = -export-symbols gdk.def install-libtool-import-lib: - $(INSTALL) .libs/libgdk-win32-1.3.dll.a $(DESTDIR)$(libdir) + $(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libdk-win32-1.3.dll.a + -rm $(DESTDIR)$(libdir)/libdk-win32-$(GTK_API_VERSION).dll.a else install-libtool-import-lib: uninstall-libtool-import-lib: endif if MS_LIB_AVAILABLE -noinst_DATA = gdk-win32-1.3.lib +noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib -gdk-win32-1.3.lib: libgdk-win32-1.3.la gdk.def - lib -name:libgdk-win32-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ +gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def + lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@ install-ms-lib: - $(INSTALL) gdk-win32-1.3.lib $(DESTDIR)$(libdir) + $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/gdk-win32-1.3.lib + -rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib else install-ms-lib: uninstall-ms-lib: @@ -67,15 +67,15 @@ endif # libtool stuff: set version and export symbols for resolving # since automake doesn't support conditionalized libsomething_la_LDFLAGS # we use the general approach here -LDFLAGS = @STRIP_BEGIN@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) \ - @LIBTOOL_EXPORT_OPTIONS@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(gdk_win32_symbols) \ - @GDK_DEP_LIBS@ \ +LDFLAGS = @STRIP_BEGIN@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) \ + @LIBTOOL_EXPORT_OPTIONS@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION) \ + $(gdk_win32_symbols) \ + @GDK_DEP_LIBS@ \ @STRIP_END@ # @@ -151,18 +151,18 @@ gdk_c_sources = @STRIP_BEGIN@ \ gdkincludedir = $(includedir)/gtk-2.0/gdk gdkinclude_HEADERS = $(gdk_headers) -libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c -libgdk_linux_fb_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c -libgdk_win32_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c +libgdk_x11_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c +libgdk_linux_fb_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c +libgdk_win32_2_0_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c -libgdk_x11_1_3_la_LIBADD = x11/libgdk-x11.la -libgdk_linux_fb_1_3_la_LIBADD = linux-fb/libgdk-linux-fb.la -libgdk_win32_1_3_la_LIBADD = \ +libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la +libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la +libgdk_win32_2_0_la_LIBADD = \ win32/libgdk-win32.la $(wintab_lib) $(ie55uuid_lib) lib_LTLIBRARIES = $(gdktargetlib) -EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-linux-fb-1.3.la libgdk-win32-1.3.la +EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la MAINTAINERCLEANFILES = EXTRA_HEADERS = diff --git a/gdk/makefile.msc b/gdk/makefile.msc index 6ddcb2a7ea..b904e0f4a1 100644 --- a/gdk/makefile.msc +++ b/gdk/makefile.msc @@ -33,7 +33,7 @@ CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo LDFLAGS = /link $(LINKDEBUG) # overwrite version? -GTK_VER=1.3 +GTK_VER=2.0 GDK_PIXBUF_VER=$(GTK_VER) !IFNDEF PERL diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc index 360790adb9..48947efec9 100644 --- a/gdk/win32/makefile.msc +++ b/gdk/win32/makefile.msc @@ -11,7 +11,7 @@ WTKIT = ..\..\..\wtkit126 TOP = ../../.. !INCLUDE $(TOP)/glib/build/win32/make.msc -GTK_VER=1.3 +GTK_VER=2.0 CFLAGS = -FImsvc_recommended_pragmas.h \ -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) \ diff --git a/gtk+-2.0-uninstalled.pc.in b/gtk+-2.0-uninstalled.pc.in index 4a8dd2f6eb..0cbe3afe8b 100644 --- a/gtk+-2.0-uninstalled.pc.in +++ b/gtk+-2.0-uninstalled.pc.in @@ -6,5 +6,5 @@ Name: GTK+ Uninstalled Description: GIMP Tool Kit (${target} target), Not Installed Version: @VERSION@ Requires: gdk-${target}-2.0-uninstalled @GTK_PACKAGES@ -Libs: ${pc_top_builddir}/${pcfiledir}/libgtk-${target}-1.3.la @GTK_EXTRA_LIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/libgtk-${target}-@GTK_API_VERSION@.la @GTK_EXTRA_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GTK_EXTRA_CFLAGS@ diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in index 8cfa00af80..08494f156f 100644 --- a/gtk+-2.0.pc.in +++ b/gtk+-2.0.pc.in @@ -11,5 +11,5 @@ Name: GTK+ Description: GIMP Tool Kit (${target} target) Version: @VERSION@ Requires: gdk-${target}-2.0 @GTK_PACKAGES@ -Libs: -L${libdir} -lgtk-${target}-1.3 @GTK_EXTRA_LIBS@ +Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@ Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 598e3f4bcc..33ac306659 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -36,25 +36,25 @@ gtk-win32res.lo : gtk-win32.rc $(top_srcdir)/build/win32/lt-compile-resource gtk-win32.rc gtk-win32res.lo install-libtool-import-lib: - $(INSTALL) .libs/libgtk-win32-1.3.dll.a $(DESTDIR)$(libdir) + $(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libtk-win32-1.3.dll.a + -rm $(DESTDIR)$(libdir)/libtk-win32-$(GTK_API_VERSION).dll.a else install-libtool-import-lib: uninstall-libtool-import-lib: endif if MS_LIB_AVAILABLE -noinst_DATA = gtk-win32-1.3.lib +noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib -gtk-win32-1.3.lib: libgtk-win32-1.3.la gtk.def - lib -name:libgtk-win32-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@ +gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def + lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@ install-ms-lib: - $(INSTALL) gtk-win32-1.3.lib $(DESTDIR)$(libdir) + $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/gtk-win32-1.3.lib + -rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib else install-ms-lib: uninstall-ms-lib: @@ -65,15 +65,15 @@ endif # we use the general approach here libgtkincludedir = $(includedir)/gtk-2.0/gtk LDFLAGS = @STRIP_BEGIN@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ - -rpath $(libdir) \ - $(no_undefined) \ - @LIBTOOL_EXPORT_OPTIONS@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(libgtk_target_ldflags) \ - @GTK_DEP_LIBS@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) \ + @LIBTOOL_EXPORT_OPTIONS@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ + $(libgtk_target_ldflags) \ + @GTK_DEP_LIBS@ \ @STRIP_END@ # @@ -431,6 +431,11 @@ gtk_built_sources = @STRIP_BEGIN@ \ ${gtk_built_private_headers} \ ${gtk_built_public_sources} \ @STRIP_END@ +stamp_files = @STRIP_BEGIN@ \ + stamp-gtkmarshalers.h \ + stamp-gtkmarshal.h \ + stamp-gtktypebuiltins.h \ +@STRIP_END@ # non-header sources (headers should be specified in the above variables) # that don't serve as direct make target sources, i.e. they don't have # their own .lo rules and don't get publically installed @@ -443,7 +448,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \ # # setup GTK+ sources and their dependancies # -MAINTAINERCLEANFILES = $(gtk_built_sources) +MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) EXTRA_HEADERS = EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources) EXTRA_DIST += $(gtk_built_sources) @@ -458,7 +463,7 @@ CLEANFILES = $(gen_sources) ## automake 1.5 supports this without $(OBJECTS): $(gtk_built_sources) hack #BUILT_SOURCES = $(gtk_built_sources) -$(libgtk_x11_1_3_la_OBJECTS) $(libgtk_linux_fb_1_3_la_OBJECTS) $(libgtk_win32_1_3_la_OBJECTS): ${gtk_built_public_sources} ${gtk_built_private_headers} +$(libgtk_x11_2_0_la_OBJECTS) $(libgtk_linux_fb_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_OBJECTS): ${gtk_built_public_sources} ${gtk_built_private_headers} # all autogenerated files need to be generated in the srcdir, # so old versions get remade and are not confused with newer @@ -540,17 +545,17 @@ lib_LTLIBRARIES = $(gtktargetlib) gtkincludedir = $(includedir)/gtk-2.0/gtk gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h -libgtk_x11_1_3_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources) -libgtk_linux_fb_1_3_la_SOURCES = $(gtk_c_sources) -libgtk_win32_1_3_la_SOURCES = $(gtk_c_sources) +libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) $(gtk_plug_c_sources) +libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources) +libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) -libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo) -libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) +libgtk_win32_2_0_la_LIBADD = $(gtk_win32res_lo) +libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) if USE_WIN32 libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32 endif -EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la +EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la if DISABLE_EXPLICIT_DEPS install-exec-local: @@ -569,14 +574,14 @@ install-data-local: install-ms-lib install-libtool-import-lib uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc -DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/$(gdktargetlib) +DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) TEST_DEPS = $(DEPS) gtk.immodules LDADDS = @STRIP_BEGIN@ \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/$(gdktargetlib) \ + $(gtktargetlib) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ @STRIP_END@ # diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am index 101a13d669..2819897e3c 100644 --- a/gtk/theme-bits/Makefile.am +++ b/gtk/theme-bits/Makefile.am @@ -6,6 +6,6 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ noinst_PROGRAMS = decompose-bits decompose_bits_SOURCES = decompose-bits.c -decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la +decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4 index 445c7143c7..7eafb05047 100644 --- a/m4macros/gtk-2.0.m4 +++ b/m4macros/gtk-2.0.m4 @@ -38,7 +38,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run no_gtk=yes fi - min_gtk_version=ifelse([$1], ,1.3.3,$1) + min_gtk_version=ifelse([$1], ,2.0.0,$1) AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) if test x$PKG_CONFIG != xno ; then diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 82876c33bc..bbe5bbd176 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -15,15 +15,15 @@ INCLUDES = @STRIP_BEGIN@ \ @STRIP_END@ DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ -LDADDS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ - $(top_builddir)/gtk/@gtktargetlib@ \ - @GTK_DEP_LIBS@ \ +LDADDS = @STRIP_BEGIN@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gtk/@gtktargetlib@ \ + @GTK_DEP_LIBS@ \ @STRIP_END@ moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules diff --git a/tests/Makefile.am b/tests/Makefile.am index 0306f84f86..6a9072f967 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,12 +9,12 @@ INCLUDES = @STRIP_BEGIN@ \ @STRIP_END@ DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ - $(top_builddir)/gdk/@gdktargetlib@ \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ LDADDS = @STRIP_BEGIN@ \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/@gdktargetlib@ \ $(top_builddir)/gtk/@gtktargetlib@ \ @STRIP_END@ diff --git a/tests/makefile.msc b/tests/makefile.msc index c83ff39f3d..64069a4afb 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -10,9 +10,8 @@ TOP = ..\.. ################################################################ # Possibly override versions from build/win32/module.defs -GTK_VER = 1.3 -GDK_PIXBUF_VER = 1.3 -GTK_VER=1.3 +GTK_VER = 2.0 +GDK_PIXBUF_VER = 2.0 GDK_LIBS = ../gdk/gdk-win32-$(GTK_VER).lib GTK_LIBS = ../gtk/gtk-win32-$(GTK_VER).lib |