Commit ec09f3ab authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent 049771c5
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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
......
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 \
......
......@@ -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}
......@@ -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 = \
......
......@@ -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
......
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"
......
......@@ -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)
......
......@@ -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)
......
......@@ -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>
......
......@@ -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
......
......@@ -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 ##### -->
......
......@@ -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:
......@@ -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.
......
......@@ -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@
......@@ -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@
......@@ -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@
......
......@@ -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@
......@@ -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
......
......@@ -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 \
......
......@@ -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 =
......
......@@ -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
......
......@@ -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) \
......
......@@ -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@
......@@ -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@
......@@ -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) \