diff --git a/debian/changelog b/debian/changelog index ff4b79130d..4d16cdbb9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,129 @@ -gtk+2.0 (2.12.12-1) unstable; urgency=low +gtk+2.0 (2.14.7-3) experimental; urgency=low - [ Josselin Mouette ] - * dh_gtkmodules.in: fix a pod2man error. - * New upstream release. - + Fixes infinite loop caused by setting color scheme. - Closes: #492590. - * 021_loader-files-d.patch: updated to apply cleanly. - * 070_mandatory-relibtoolize.patch: regenerated for the new version. + * 032_gdkwindowimpl_directfb.patch: new version of the patch. This + should restore the basic functionality of the backend, but there is + still work underway. + * 033_directfb_client-message.patch: stolen from the upstream SVN. Fix + the DirectFB client_message API. + * 034_directfb_memleak.patch: stolen from the upstream SVN. Fix memory + leak in the DirectFB code. + * Require DirectFB 1.0.0 for the 034 patch. + * 070_mandatory-relibtoolize.patch: updated accordingly. + + -- Josselin Mouette Sat, 21 Feb 2009 14:59:45 +0100 + +gtk+2.0 (2.14.7-2) experimental; urgency=low + + * 008_implicit_pointer_conversion_gdkgc_directfb.patch: removed, it’s + obsolete and just defines the same macro a second time. + * 007_implicit_pointer_conversion_gdkdrawable_directfb.patch: removed, + it’s not needed anymore with the latest directfb. + * 006_proper-directfb-modules.patch: removed from the package, it + won’t be necessary anymore. + * 001_static-linking-dont-query-immodules.patch, + 002_static-linking-dont-build-perf.patch, + 003_gdk.pc_privates.patch, + 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch: refreshed. + * Remove 071_correct_directfb_declarations.patch, and replace it by + 032_gdkwindowimpl_directfb.patch, a patch from Sven Neumann to + (hopefully) fix DirectFB support for GTK+ 2.14. + + -- Josselin Mouette Tue, 17 Feb 2009 23:17:56 +0100 + +gtk+2.0 (2.14.7-1) experimental; urgency=low [ Loic Minier ] * Don't purge /etc/gtk-2.0/gdk-pixbuf.loaders and /etc/gtk-2.0/gtk.immodules during first configuration. - -- Josselin Mouette Mon, 16 Feb 2009 13:47:06 +0100 + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. -gtk+2.0 (2.12.11-4) unstable; urgency=low + -- Sebastian Dröge Thu, 08 Jan 2009 08:06:02 +0100 + +gtk+2.0 (2.14.5-1) experimental; urgency=low + + [ Josselin Mouette ] + * Really install the faq and tutorial files correctly so that the + devhelp file is read. + * Update doc-base files accordingly. + * gruik2devhelp.awk: new script to generate the devhelp files + automatically for the FAQ and tutorial, based on the HTML doc. + * Build-depend on gawk, run the script appropriately. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Tue, 25 Nov 2008 11:00:35 +0100 + +gtk+2.0 (2.14.4-3) experimental; urgency=low + + * libgail*.install: fix installation paths. Closes: #505105. + * Do not ship .la files for gail modules. + * Generate shlibs for libgail. + * Bump shlibs version to 2.14.0. + * Do not install libgailutil in libgtk2.0-0. + * Do not install gtk libs in libgail-dev. + * Rework docs installation. + * Add doc links where needed. + * Install .devhelp files at the correct places. Closes: #504807. + * Bump dependencies for the development package. + * Fix dependencies of gail packages. + * Don’t install libgail in the udeb. + * Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses + it. + * Remove versioned conflicts with libgail packages. + * Remove libgail18.shlibs. + * Put debugging symbols of libgail modules in libgail-dbg. + * dh_gtkmodules.in: fix a pod2man error. + * Disable 006_proper-directfb-modules.patch. + * Update 070_mandatory_relibtoolize.patch accordingly. + + -- Josselin Mouette Tue, 11 Nov 2008 14:44:21 +0100 + +gtk+2.0 (2.14.4-2) experimental; urgency=low + + * debian/control, debian/rules, debian/libgail*: + - split libgail packages + + -- Gustavo Noronha Silva Wed, 05 Nov 2008 14:54:08 -0200 + +gtk+2.0 (2.14.4-1) experimental; urgency=low + + [ Gustavo Noronha Silva ] + * New upstream release + * debian/patches/006_proper-directfb-modules.patch: + - refreshed + * debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch, + debian/patches/009_gtk-export-filechooser.patch, + debian/patches/020_immodules-files-d.patch, + debian/patches/021_loader-files-d.patch, + - update borrowed from Ubuntu's package + * debian/patches/071_correct_directfb_declarations.patch, + debian/patches/072_workaround_directfb_build.patch: + - borrowed from ubuntu + * debian/patches/033_treeview_resizing.patch, + debian/patches/095_gtk-im-module-setting.patch: + - removed; fixed upstream + * debian/patches/070_mandatory-relibtoolize.patch: + - refreshed + * debian/control.in: + - added libjasper-dev to the Build-Depends, as GTK+ now supports + JPEG2000 + - make GTK+ packages conflict/replace with gail ones, since they are now + included in GTK+ + * debian/patches/092_fix_printtest_include.patch: + - new patch, to fix build problem in print test + * debian/patches/071_jasper_link_fix.patch: + - make gdk-pixbuf-csource link correctly with libjasper + * debian/rules, debian/control: + - newer libcairo2-dev contains everything needed to build the directfb + target, so disable building with the dummy libcairo-directfb2-dev + - this makes us have to build depend on libcairo2-dev >= 1.6.4-6.1 [ Loic Minier ] * Let libgtk2.0-dev recommend debhelper for dh_gtkmodules. @@ -22,15 +131,14 @@ gtk+2.0 (2.12.11-4) unstable; urgency=low gtk-builder-convert to work and might be relied upon by packages bdeping on libgtk2.0-dev. - [ Josselin Mouette ] - * Build-depend on libcairo2-dev 1.6.4-6.1, remove references to - libcairo-directfb2-dev. - * Disable 006_proper-directfb-modules.patch, it is made unnecessary by - these changes. - * 070_mandatory-relibtoolize.patch: updated accordingly. - * rules: remove -l flag to dh_shlibdeps. + [ Emilio Pozuelo Monfort ] + * Update build-dependencies for the new version: + - libglib2.0-dev >= 2.17.6 + - libpango1.0-dev >= 1.20 + - libatk1.0-dev >= 1.13.0 + - libcairo2-dev >= 1.6.0 - -- Josselin Mouette Mon, 13 Oct 2008 11:14:40 +0200 + -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:38:58 -0300 gtk+2.0 (2.12.11-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 9f420f676e..f969f295f1 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: gtk+2.0 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Gustavo Noronha Silva , Josselin Mouette , Sebastian Dröge Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, - libglib2.0-dev (>= 2.13.5), - libpango1.0-dev (>= 1.17.3), - libatk1.0-dev (>= 1.9.0), + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxi-dev (>= 1:1.0.1-4), @@ -25,15 +25,17 @@ Build-Depends: debhelper (>= 5.0.22), libcairo2-dev (>= 1.6.4-6.1), libtiff4-dev, libjpeg62-dev, + libjasper-dev, libpng12-dev, gnome-pkg-tools (>= 0.11), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, - libdirectfb-dev (>= 0.9.26), + libdirectfb-dev (>= 1.0.0), libcups2-dev (>= 1.2), - quilt -Build-Depends-Indep: gtk-doc-tools (>= 1.6), + quilt, + gawk +Build-Depends-Indep: gtk-doc-tools (>= 1.8), docbook-xml Standards-Version: 3.8.0 @@ -186,10 +188,10 @@ Depends: libgtk2.0-0 (= ${binary:Version}), libgtk2.0-common, ${misc:Depends}, ${shlibs:Depends}, - libglib2.0-dev (>= 2.12.0), - libpango1.0-dev (>= 1.10.0-2), - libatk1.0-dev (>= 1.6.1-2), - libcairo2-dev, + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), + libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxinerama-dev (>= 1:1.0.1-4.1), @@ -307,3 +309,73 @@ Description: Pixbuf-based theme for GTK+ 2.x suites. . This package contains the pixbuf theme engine. + +Package: libgail18 +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgtk2.0-0 (= ${binary:Version}) +Replaces: libgail17 +Description: GNOME Accessibility Implementation Library -- shared libraries + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the shared library. + +Package: libgail-common +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgail18 (= ${binary:Version}) +Description: GNOME Accessibility Implementation Library -- common modules + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains core shared libraries. + +Package: libgail-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libgail18 (= ${binary:Version}), + libgail-common (= ${binary:Version}), + libgtk2.0-dev (= ${binary:Version}), + pkg-config, + libatk1.0-dev (>= 1.13.0) +Suggests: libgail-doc +Description: GNOME Accessibility Implementation Library -- development files + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the development files for Gail. + +Package: libgail-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: ${misc:Depends}, libgail18 (= ${binary:Version}) +Recommends: libgtk2.0-0-dbg +Description: Gail libraries and debugging symbols + Gail is the "GNOME Accessibility Implementation Library". + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: libgail-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, lynx | www-browser +Description: documentation files of the Gail library + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the documentation files for Gail. diff --git a/debian/control.in b/debian/control.in index 8037fb2346..877f37a8e4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,9 +6,9 @@ Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, - libglib2.0-dev (>= 2.13.5), - libpango1.0-dev (>= 1.17.3), - libatk1.0-dev (>= 1.9.0), + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxi-dev (>= 1:1.0.1-4), @@ -25,15 +25,17 @@ Build-Depends: debhelper (>= 5.0.22), libcairo2-dev (>= 1.6.4-6.1), libtiff4-dev, libjpeg62-dev, + libjasper-dev, libpng12-dev, gnome-pkg-tools (>= 0.11), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, - libdirectfb-dev (>= 0.9.26), + libdirectfb-dev (>= 1.0.0), libcups2-dev (>= 1.2), - quilt -Build-Depends-Indep: gtk-doc-tools (>= 1.6), + quilt, + gawk +Build-Depends-Indep: gtk-doc-tools (>= 1.8), docbook-xml Standards-Version: 3.8.0 @@ -186,10 +188,10 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends}, ${shlibs:Depends}, - libglib2.0-dev (>= 2.12.0), - libpango1.0-dev (>= 1.10.0-2), - libatk1.0-dev (>= 1.6.1-2), - libcairo2-dev, + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), + libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxinerama-dev (>= 1:1.0.1-4.1), @@ -307,3 +309,73 @@ Description: Pixbuf-based theme for GTK+ 2.x suites. . This package contains the pixbuf theme engine. + +Package: libgail18 +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + @SHARED_PKG@ (= ${binary:Version}) +Replaces: libgail17 +Description: GNOME Accessibility Implementation Library -- shared libraries + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the shared library. + +Package: libgail-common +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgail18 (= ${binary:Version}) +Description: GNOME Accessibility Implementation Library -- common modules + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains core shared libraries. + +Package: libgail-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, + libgail18 (= ${binary:Version}), + libgail-common (= ${binary:Version}), + @DEV_PKG@ (= ${binary:Version}), + pkg-config, + libatk1.0-dev (>= 1.13.0) +Suggests: libgail-doc +Description: GNOME Accessibility Implementation Library -- development files + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the development files for Gail. + +Package: libgail-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: ${misc:Depends}, libgail18 (= ${binary:Version}) +Recommends: @DEBUG_PKG@ +Description: Gail libraries and debugging symbols + Gail is the "GNOME Accessibility Implementation Library". + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: libgail-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, lynx | www-browser +Description: documentation files of the Gail library + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the documentation files for Gail. diff --git a/debian/gruik2devhelp.awk b/debian/gruik2devhelp.awk new file mode 100644 index 0000000000..15f870d260 --- /dev/null +++ b/debian/gruik2devhelp.awk @@ -0,0 +1,29 @@ +#! /usr/bin/awk -f + +BEGIN { print ""; + level=1 } + +title == 1 { print "(.*)"; + print ""; + title=0 } +/^><DD$/ { level++ } +/^><\/DD$/ { level-- } + +intext == 0 && href != "" && /^>([^<>]*)<.*$/ { n=n gensub("^>(.*)<.*$", "\\1",1); } +intext == 1 && href != "" && /^([^<>]*)$/ { n=n $0 " "; } +intext == 0 && href != "" && /^>([^<>]*)$/ { n=n gensub("^>(.*)$", "\\1",1) " "; intext=1 } +intext == 1 && href != "" && /^([^<>]*)<.*$/ { n=n gensub("^([^<>]*)<.*$", "\\1",1); intext=0 } +href != "" && /<\/A$/ { for (i=level; i<lastlevel+1; i++) print "</sub>"; + print "<sub name=\"" n "\" link=\"" href "\">"; + href = ""; + lastlevel = level } +ending != 1 && /^HREF=".*"$/ { href=gensub("^HREF=\"(.*)\"$","\\1",1); + n = ""; + intext = 0 } +/^CLASS="NAVFOOTER"$/ { ending = 1 } + +END { for (i=0; i<lastlevel; i++) print "</sub>"; + print "</chapters>"; + print "</book>" } diff --git a/debian/libgail-common.install.in b/debian/libgail-common.install.in new file mode 100644 index 0000000000..ecbb50cb82 --- /dev/null +++ b/debian/libgail-common.install.in @@ -0,0 +1 @@ +debian/install/shared/@LIBDIR@/gtk-@APIVER@/modules/*.so @LIBDIR@/gtk-@APIVER@/modules diff --git a/debian/libgail-dbg.dirs b/debian/libgail-dbg.dirs new file mode 100644 index 0000000000..fca7cfd0a1 --- /dev/null +++ b/debian/libgail-dbg.dirs @@ -0,0 +1 @@ +usr/lib/debug/ diff --git a/debian/libgail-dev.install b/debian/libgail-dev.install new file mode 100644 index 0000000000..49cb143a93 --- /dev/null +++ b/debian/libgail-dev.install @@ -0,0 +1,5 @@ +debian/install/shared/usr/include/gail* /usr/include +debian/install/shared/usr/lib/libgail*.so /usr/lib +debian/install/shared/usr/lib/libgail*.la /usr/lib +debian/install/static/usr/lib/libgail*.a /usr/lib +debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig diff --git a/debian/libgail-doc.doc-base.gail-reference b/debian/libgail-doc.doc-base.gail-reference new file mode 100644 index 0000000000..1dbd1794d5 --- /dev/null +++ b/debian/libgail-doc.doc-base.gail-reference @@ -0,0 +1,10 @@ +Document: gail-reference +Title: Gail Reference Manual +Author: Padraig O'Briain <padraig.obriain@sun.com> +Abstract: This manual describes APIs for libgail-util +Section: Accessibility + +Format: HTML +Index: /usr/share/gtk-doc/html/gail-libgail-util/index.html +Files: /usr/share/gtk-doc/html/gail-libgail-util/*.html + diff --git a/debian/libgail-doc.install b/debian/libgail-doc.install new file mode 100644 index 0000000000..69c7f65e50 --- /dev/null +++ b/debian/libgail-doc.install @@ -0,0 +1 @@ +debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html diff --git a/debian/libgail-doc.links b/debian/libgail-doc.links new file mode 100644 index 0000000000..fd2bd875db --- /dev/null +++ b/debian/libgail-doc.links @@ -0,0 +1 @@ +/usr/share/gtk-doc/html/gail-libgail-util /usr/share/doc/libgail-doc/html diff --git a/debian/libgail18.install b/debian/libgail18.install new file mode 100644 index 0000000000..e852704ac0 --- /dev/null +++ b/debian/libgail18.install @@ -0,0 +1 @@ +debian/install/shared/usr/lib/libgail*.so.* /usr/lib diff --git a/debian/libgtk-directfb-2.0-0-udeb.install.in b/debian/libgtk-directfb-2.0-0-udeb.install.in index c3731925a5..95c0031e51 100644 --- a/debian/libgtk-directfb-2.0-0-udeb.install.in +++ b/debian/libgtk-directfb-2.0-0-udeb.install.in @@ -1,3 +1,3 @@ # from the directfb flavor debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders -debian/install/directfb/@LIBDIR@/*.so.* @LIBDIR@ +debian/install/directfb/@LIBDIR@/libg?k*.so.* @LIBDIR@ diff --git a/debian/libgtk-directfb-2.0-dev.install.in b/debian/libgtk-directfb-2.0-dev.install.in index 3be2c80f53..91e0284dd5 100644 --- a/debian/libgtk-directfb-2.0-dev.install.in +++ b/debian/libgtk-directfb-2.0-dev.install.in @@ -1,6 +1,5 @@ # from the directfb flavor debian/install/directfb/usr/include/gtk-@APIVER@/gdk/*directfb* usr/include/gtk-@APIVER@/gdk debian/install/directfb/@LIBDIR@/*directfb*.so @LIBDIR@ -debian/install/directfb/@LIBDIR@/pkgconfig/* @LIBDIR@/pkgconfig/@DIRECTFB_PKG@ debian/install/directfb/@LIBDIR@/pkgconfig/*directfb* @LIBDIR@/pkgconfig debian/install/directfb/@LIBDIR@/gtk-@APIVER@/include/gdkconfig.h @LIBDIR@/gtk-@APIVER@/include/directfb diff --git a/debian/libgtk2.0-0.install.in b/debian/libgtk2.0-0.install.in index 5c2239a40e..e4f12d93b9 100644 --- a/debian/libgtk2.0-0.install.in +++ b/debian/libgtk2.0-0.install.in @@ -9,4 +9,5 @@ debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@ debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends -debian/install/shared/@LIBDIR@/*.so.* @LIBDIR@ +debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ +debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@ diff --git a/debian/libgtk2.0-dev.install.in b/debian/libgtk2.0-dev.install.in index 01bcab9d05..841f040cc5 100644 --- a/debian/libgtk2.0-dev.install.in +++ b/debian/libgtk2.0-dev.install.in @@ -3,12 +3,12 @@ debian/dh_gtkmodules usr/bin # from the shared flavor debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin debian/install/shared/usr/bin/gtk-builder-convert usr/bin -debian/install/shared/usr/include usr -debian/install/shared/@LIBDIR@/*.la @LIBDIR@ -debian/install/shared/@LIBDIR@/*.so @LIBDIR@ -debian/install/shared/@LIBDIR@/pkgconfig @LIBDIR@ +debian/install/shared/usr/include/gtk* usr/include +debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@ +debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@ +debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/gtk-@APIVER@ debian/install/shared/usr/share/aclocal usr/share debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/ # from the static flavor -debian/install/static/@LIBDIR@/*.a @LIBDIR@ +debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@ diff --git a/debian/libgtk2.0-doc.doc-base.gtk-faq b/debian/libgtk2.0-doc.doc-base.gtk-faq index 57a7004fe8..1cba83eeac 100644 --- a/debian/libgtk2.0-doc.doc-base.gtk-faq +++ b/debian/libgtk2.0-doc.doc-base.gtk-faq @@ -8,5 +8,5 @@ Abstract: This document is intended to answer questions that are Section: Programming/C Format: HTML -Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html -Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html +Index: /usr/share/doc/libgtk2.0-doc/faq/book1.html +Files: /usr/share/doc/libgtk2.0-doc/faq/*.html diff --git a/debian/libgtk2.0-doc.doc-base.gtk2-tutorial b/debian/libgtk2.0-doc.doc-base.gtk2-tutorial index ec6982c333..e6db01f1ba 100644 --- a/debian/libgtk2.0-doc.doc-base.gtk2-tutorial +++ b/debian/libgtk2.0-doc.doc-base.gtk2-tutorial @@ -14,5 +14,5 @@ Abstract: GTK+ (GIMP Toolkit) is a library for creating graphical user Section: Programming/C Format: HTML -Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html -Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html +Index: /usr/share/doc/libgtk2.0-doc/tutorial/book1.html +Files: /usr/share/doc/libgtk2.0-doc/tutorial/*.html diff --git a/debian/libgtk2.0-doc.install.in b/debian/libgtk2.0-doc.install.in index 7af20820ad..ddf8e3029d 100644 --- a/debian/libgtk2.0-doc.install.in +++ b/debian/libgtk2.0-doc.install.in @@ -1,9 +1,10 @@ # from Debian -debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/gtk-faq -debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/gtk-tutorial +debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/faq +debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial # from the shared flavor -debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc +debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@ +debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@ # from the source -docs/faq/html usr/share/doc/@DOC_PKG@/faq -docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial +docs/faq/html/* usr/share/doc/@DOC_PKG@/faq +docs/tutorial/html/* usr/share/doc/@DOC_PKG@/tutorial docs/*.txt usr/share/doc/@DOC_PKG@ diff --git a/debian/libgtk2.0-doc.links.in b/debian/libgtk2.0-doc.links.in index 19af412b8f..a08fa2330f 100644 --- a/debian/libgtk2.0-doc.links.in +++ b/debian/libgtk2.0-doc.links.in @@ -1,6 +1,8 @@ usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk +usr/share/doc/@DOC_PKG@/faq usr/share/gtk-doc/html/gtk-faq +usr/share/doc/@DOC_PKG@/tutorial usr/share/gtk-doc/html/gtk-tutorial usr/share/doc/libatk1.0-doc/atk usr/share/doc/@DOC_PKG@/atk usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject diff --git a/debian/patches/001_static-linking-dont-query-immodules.patch b/debian/patches/001_static-linking-dont-query-immodules.patch index 4c58919244..d70030044d 100644 --- a/debian/patches/001_static-linking-dont-query-immodules.patch +++ b/debian/patches/001_static-linking-dont-query-immodules.patch @@ -1,8 +1,8 @@ -Index: gtk+2.0-2.11.5/configure.in +Index: gtk+-2.14.7/configure.in =================================================================== ---- gtk+2.0-2.11.5.orig/configure.in 2007-07-02 17:04:27.000000000 +0200 -+++ gtk+2.0-2.11.5/configure.in 2007-07-03 11:34:03.000000000 +0200 -@@ -134,6 +134,7 @@ +--- gtk+-2.14.7.orig/configure.in 2009-01-07 17:33:57.000000000 +0100 ++++ gtk+-2.14.7/configure.in 2009-02-17 23:06:24.718714576 +0100 +@@ -152,6 +152,7 @@ esac dnl Initialize libtool AC_PROG_CC AM_DISABLE_STATIC @@ -10,11 +10,11 @@ Index: gtk+2.0-2.11.5/configure.in dnl dnl Check for a working C++ compiler, but do not bail out, if none is found. -Index: gtk+2.0-2.11.5/modules/input/Makefile.am +Index: gtk+-2.14.7/modules/input/Makefile.am =================================================================== ---- gtk+2.0-2.11.5.orig/modules/input/Makefile.am 2007-07-02 17:04:10.000000000 +0200 -+++ gtk+2.0-2.11.5/modules/input/Makefile.am 2007-07-03 11:34:03.000000000 +0200 -@@ -106,8 +106,12 @@ +--- gtk+-2.14.7.orig/modules/input/Makefile.am 2009-01-07 17:33:31.000000000 +0100 ++++ gtk+-2.14.7/modules/input/Makefile.am 2009-02-17 23:06:24.731083956 +0100 +@@ -178,8 +178,12 @@ dist_imconffile_DATA = im-multipress.con if CROSS_COMPILING RUN_QUERY_IMMODULES_TEST=false else @@ -27,8 +27,8 @@ Index: gtk+2.0-2.11.5/modules/input/Makefile.am # Running this if cross compiling or if DESTDIR is set is going to # not work at all, so skip it. -@@ -148,7 +152,18 @@ - $(IM_IME_MODULE) +@@ -240,7 +244,18 @@ noinst_LTLIBRARIES = \ + included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules diff --git a/debian/patches/002_static-linking-dont-build-perf.patch b/debian/patches/002_static-linking-dont-build-perf.patch index 5e7fb5c4a5..2abf478197 100644 --- a/debian/patches/002_static-linking-dont-build-perf.patch +++ b/debian/patches/002_static-linking-dont-build-perf.patch @@ -1,9 +1,10 @@ -Index: gtk+2.0-2.10.10/Makefile.am +Index: gtk+-2.14.7/Makefile.am =================================================================== ---- gtk+2.0-2.10.10.orig/Makefile.am 2007-03-12 15:12:11.000000000 +0100 -+++ gtk+2.0-2.10.10/Makefile.am 2007-03-13 14:10:07.000000000 +0100 -@@ -1,6 +1,11 @@ +--- gtk+-2.14.7.orig/Makefile.am 2009-01-07 17:33:57.000000000 +0100 ++++ gtk+-2.14.7/Makefile.am 2009-02-17 23:07:14.895082593 +0100 +@@ -1,7 +1,12 @@ ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +# don't build perf measurement tools in static builds diff --git a/debian/patches/003_gdk.pc_privates.patch b/debian/patches/003_gdk.pc_privates.patch index 67cbecebce..06fa3c853a 100644 --- a/debian/patches/003_gdk.pc_privates.patch +++ b/debian/patches/003_gdk.pc_privates.patch @@ -1,10 +1,10 @@ -Index: gtk+-2.12.1/configure.in +Index: gtk+-2.14.7/configure.in =================================================================== ---- gtk+-2.12.1.orig/configure.in 2007-11-18 00:51:06.548600130 +0100 -+++ gtk+-2.12.1/configure.in 2007-11-18 01:06:06.279872893 +0100 -@@ -1459,21 +1459,23 @@ LDFLAGS="$saved_ldflags" +--- gtk+-2.14.7.orig/configure.in 2009-02-17 23:06:24.718714576 +0100 ++++ gtk+-2.14.7/configure.in 2009-02-17 23:07:30.398582828 +0100 +@@ -1680,21 +1680,23 @@ LDFLAGS="$saved_ldflags" - GDK_PACKAGES="$PANGO_PACKAGES" + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + GDK_PRIVATE_PACKAGES="$X_PACKAGES" @@ -30,12 +30,12 @@ Index: gtk+-2.12.1/configure.in AC_SUBST(GDK_EXTRA_LIBS) AC_SUBST(GDK_EXTRA_CFLAGS) AC_SUBST(GDK_DEP_LIBS) -Index: gtk+-2.12.1/gdk-2.0.pc.in +Index: gtk+-2.14.7/gdk-2.0.pc.in =================================================================== ---- gtk+-2.12.1.orig/gdk-2.0.pc.in 2007-11-17 23:53:16.038827049 +0100 -+++ gtk+-2.12.1/gdk-2.0.pc.in 2007-11-18 01:06:30.821271428 +0100 +--- gtk+-2.14.7.orig/gdk-2.0.pc.in 2009-01-07 17:33:57.000000000 +0100 ++++ gtk+-2.14.7/gdk-2.0.pc.in 2009-02-17 23:07:30.402582917 +0100 @@ -8,5 +8,6 @@ Name: GDK - Description: GIMP Drawing Kit (${target} target) + Description: GTK+ Drawing Kit (${target} target) Version: @VERSION@ Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@ +Requires.private: @GDK_PRIVATE_PACKAGES@ diff --git a/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch b/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch index 88b08b1aed..41111a76cb 100644 --- a/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch +++ b/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch @@ -1,9 +1,9 @@ -Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c +Index: gtk+-2.14.7/gtk/gtkfilesel.c =================================================================== ---- gtk+2.0-2.10.10.orig/gtk/gtkfilesel.c 2007-03-12 14:51:01.000000000 +0100 -+++ gtk+2.0-2.10.10/gtk/gtkfilesel.c 2007-03-13 14:10:10.000000000 +0100 -@@ -79,9 +79,13 @@ - #undef GTK_DISABLE_DEPRECATED +--- gtk+-2.14.7.orig/gtk/gtkfilesel.c 2009-01-07 17:32:57.000000000 +0100 ++++ gtk+-2.14.7/gtk/gtkfilesel.c 2009-02-17 23:07:34.883084908 +0100 +@@ -80,9 +80,13 @@ + #include "gtkeventbox.h" #include "gtkoptionmenu.h" +#include "gtkimage.h" @@ -16,7 +16,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c #include "gtkalias.h" #ifdef G_OS_WIN32 -@@ -317,6 +321,9 @@ +@@ -318,6 +322,9 @@ static gint cmpl_last_val */ static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state); @@ -26,7 +26,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c /* Directory operations. */ static CompletionDir* open_ref_dir (gchar* text_to_complete, -@@ -626,6 +633,10 @@ +@@ -627,6 +634,10 @@ gtk_file_selection_init (GtkFileSelectio GtkWidget *spacer; GtkDialog *dialog; @@ -37,7 +37,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c GtkListStore *model; GtkTreeViewColumn *column; -@@ -639,18 +650,9 @@ +@@ -640,18 +651,9 @@ gtk_file_selection_init (GtkFileSelectio filesel->main_vbox = dialog->vbox; gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); @@ -57,7 +57,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0); gtk_widget_show (pulldown_hbox); -@@ -662,14 +664,27 @@ +@@ -663,14 +665,27 @@ gtk_file_selection_init (GtkFileSelectio /* The horizontal box containing the directory and file listboxes */ @@ -87,7 +87,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c if (WANT_HPANED) list_container = g_object_new (GTK_TYPE_HPANED, "visible", TRUE, -@@ -681,9 +696,78 @@ +@@ -682,9 +697,78 @@ gtk_file_selection_init (GtkFileSelectio spacer = gtk_hbox_new (FALSE, 0); gtk_widget_set_size_request (spacer, -1, 5); @@ -167,7 +167,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c /* The directories list */ model = gtk_list_store_new (1, G_TYPE_STRING); -@@ -756,6 +840,15 @@ +@@ -757,6 +841,15 @@ gtk_file_selection_init (GtkFileSelectio gtk_widget_show (filesel->file_list); gtk_widget_show (scrolled_win); @@ -183,7 +183,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c /* action area for packing buttons into. */ filesel->action_area = gtk_hbox_new (TRUE, 0); gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->action_area, -@@ -1071,39 +1164,94 @@ +@@ -1012,39 +1105,94 @@ gtk_file_selection_new (const gchar *tit void gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel) { @@ -292,7 +292,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c gtk_widget_show (filesel->fileop_ren_file); } -@@ -1805,6 +1953,95 @@ +@@ -1746,6 +1894,95 @@ gtk_file_selection_update_fileops (GtkFi gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive); } @@ -388,10 +388,10 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c static gint gtk_file_selection_key_press (GtkWidget *widget, GdkEventKey *event, -Index: gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h +Index: gtk+-2.14.7/gtk/stock-icons/ximian-icons.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h 2007-03-13 14:10:10.000000000 +0100 ++++ gtk+-2.14.7/gtk/stock-icons/ximian-icons.h 2009-02-17 23:07:34.887082553 +0100 @@ -0,0 +1,825 @@ +/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ + diff --git a/debian/patches/009_gtk-export-filechooser.patch b/debian/patches/009_gtk-export-filechooser.patch index ea17c77edf..9afd331b41 100644 --- a/debian/patches/009_gtk-export-filechooser.patch +++ b/debian/patches/009_gtk-export-filechooser.patch @@ -34,22 +34,25 @@ * tests/autotestfilechooser.c: build with GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED ---- a/gtk/Makefile.am 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/Makefile.am 2008-04-01 11:10:48.000000000 +0200 -@@ -37,6 +37,8 @@ +Index: gtk+2.0-2.14.0/gtk/Makefile.am +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/Makefile.am 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/Makefile.am 2008-09-05 00:36:25.000000000 +0200 +@@ -34,6 +34,8 @@ + -I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ + -DMAEMO_CHANGES \ + -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ + -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(GTK_DEBUG_FLAGS) \ -@@ -341,12 +343,15 @@ +@@ -336,12 +338,16 @@ + # Installed header files without compatibility guarantees # that are not included in gtk/gtk.h gtk_semi_private_h_sources = \ - gtktextlayout.h \ -- gtkfilesystem.h +- gtktextlayout.h ++ gtktextlayout.h \ + gtkfilesystem.h \ + gtkfilesystemmodel.h \ + gtkfilechooserprivate.h \ @@ -64,21 +67,23 @@ gtksearchenginesimple.h \ gtkdndcursors.h \ gtkentryprivate.h \ -@@ -354,10 +359,7 @@ +@@ -349,11 +355,7 @@ gtkfilechooserdefault.h \ gtkfilechooserembed.h \ gtkfilechooserentry.h \ - gtkfilechooserprivate.h \ gtkfilechoosersettings.h \ - gtkfilechooserutils.h \ +- gtkfilesystem.h \ - gtkfilesystemmodel.h \ - gtkfilesystemunix.h \ - gtkhsv.h \ gtkiconcache.h \ - ---- a/gtk/gtk.symbols 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtk.symbols 2008-04-01 11:10:48.000000000 +0200 -@@ -1416,6 +1416,12 @@ + gtkintl.h \ + gtkkeyhash.h \ +Index: gtk+2.0-2.14.0/gtk/gtk.symbols +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtk.symbols 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtk.symbols 2008-09-05 00:36:25.000000000 +0200 +@@ -1492,6 +1492,12 @@ #endif #endif @@ -91,8 +96,10 @@ #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) gtk_file_chooser_widget_get_type G_GNUC_CONST ---- a/gtk/gtkfilechooserprivate.h 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtkfilechooserprivate.h 2008-04-01 11:10:48.000000000 +0200 +Index: gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserprivate.h 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtkfilechooserprivate.h 2008-09-05 00:36:25.000000000 +0200 @@ -21,6 +21,14 @@ #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ #define __GTK_FILE_CHOOSER_PRIVATE_H__ @@ -108,8 +115,10 @@ #include "gtkfilechooser.h" #include "gtkfilesystem.h" #include "gtkfilesystemmodel.h" ---- a/gtk/gtkfilechooserutils.c 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtkfilechooserutils.c 2008-04-01 11:10:48.000000000 +0200 +Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserutils.c 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtkfilechooserutils.c 2008-09-05 00:36:25.000000000 +0200 @@ -119,6 +119,22 @@ "do-overwrite-confirmation"); } @@ -140,8 +149,10 @@ + +#define __GTK_FILE_CHOOSER_UTILS_C__ +#include "gtkaliasdef.c" ---- a/gtk/gtkfilechooserutils.h 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtkfilechooserutils.h 2008-04-01 11:10:48.000000000 +0200 +Index: gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtkfilechooserutils.h 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtkfilechooserutils.h 2008-09-05 00:36:25.000000000 +0200 @@ -22,6 +22,14 @@ #ifndef __GTK_FILE_CHOOSER_UTILS_H__ #define __GTK_FILE_CHOOSER_UTILS_H__ @@ -167,8 +178,10 @@ void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface); void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, ---- a/gtk/gtkfilesystemmodel.h 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtkfilesystemmodel.h 2008-04-01 11:10:48.000000000 +0200 +Index: gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtkfilesystemmodel.h 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtkfilesystemmodel.h 2008-09-05 00:36:25.000000000 +0200 @@ -21,6 +21,10 @@ #ifndef __GTK_FILE_SYSTEM_MODEL_H__ #define __GTK_FILE_SYSTEM_MODEL_H__ @@ -177,21 +190,13 @@ +#error "GtkFileSystemModel is not supported API for general use" +#endif + - #include <glib-object.h> #include "gtkfilesystem.h" #include <gtk/gtktreemodel.h> ---- a/tests/autotestfilechooser.c 2008-04-01 11:10:41.000000000 +0200 -+++ b/tests/autotestfilechooser.c 2008-04-01 11:10:48.000000000 +0200 -@@ -30,6 +30,7 @@ - */ - #define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -+#define GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED - #undef GTK_DISABLE_DEPRECATED - - #include <config.h> ---- a/gtk/gtkquery.h 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtkquery.h 2008-04-01 11:10:48.000000000 +0200 +Index: gtk+2.0-2.14.0/gtk/gtkquery.h +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtkquery.h 2008-09-04 06:35:27.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtkquery.h 2008-09-05 00:36:25.000000000 +0200 @@ -23,6 +23,14 @@ #ifndef __GTK_QUERY_H__ #define __GTK_QUERY_H__ @@ -207,8 +212,10 @@ #include <glib-object.h> G_BEGIN_DECLS ---- a/gtk/gtksearchengine.h 2008-04-01 11:10:41.000000000 +0200 -+++ b/gtk/gtksearchengine.h 2008-04-01 11:10:48.000000000 +0200 +Index: gtk+2.0-2.14.0/gtk/gtksearchengine.h +=================================================================== +--- gtk+2.0-2.14.0.orig/gtk/gtksearchengine.h 2008-09-04 06:35:28.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtksearchengine.h 2008-09-05 00:36:25.000000000 +0200 @@ -23,6 +23,14 @@ #ifndef __GTK_SEARCH_ENGINE_H__ #define __GTK_SEARCH_ENGINE_H__ @@ -221,6 +228,6 @@ +#error "gtkfilechooserprivate.h is not supported API for general use" +#endif + - #include <glib-object.h> #include "gtkquery.h" + G_BEGIN_DECLS diff --git a/debian/patches/020_immodules-files-d.patch b/debian/patches/020_immodules-files-d.patch index 61f8139a91..dd64ed4056 100644 --- a/debian/patches/020_immodules-files-d.patch +++ b/debian/patches/020_immodules-files-d.patch @@ -1,8 +1,8 @@ -Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c +Index: gtk+2.0-2.14.0/gtk/gtkimmodule.c =================================================================== ---- gtk+2.0-2.10.10.orig/gtk/gtkimmodule.c 2007-03-12 14:51:28.000000000 +0100 -+++ gtk+2.0-2.10.10/gtk/gtkimmodule.c 2007-03-13 14:10:33.000000000 +0100 -@@ -59,6 +59,9 @@ +--- gtk+2.0-2.14.0.orig/gtk/gtkimmodule.c 2008-09-04 06:35:28.000000000 +0200 ++++ gtk+2.0-2.14.0/gtk/gtkimmodule.c 2008-09-05 00:36:29.000000000 +0200 +@@ -58,6 +58,9 @@ #define GTK_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_CAST ((im_module), GTK_TYPE_IM_MODULE, GtkIMModule)) #define GTK_IS_IM_MODULE(im_module) (G_TYPE_CHECK_INSTANCE_TYPE ((im_module), GTK_TYPE_IM_MODULE)) @@ -12,8 +12,8 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c struct _GtkIMModule { GTypeModule parent_instance; -@@ -261,31 +264,15 @@ - +@@ -298,19 +301,15 @@ + } static void -gtk_im_module_initialize (void) @@ -30,6 +30,13 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c - contexts_hash = g_hash_table_new (g_str_hash, g_str_equal); - + #define do_builtin(m) \ + { \ + const GtkIMContextInfo **contexts; \ +@@ -368,18 +367,6 @@ + + #undef do_builtin + - file = g_fopen (filename, "r"); - if (!file) - { @@ -45,7 +52,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkimmodule.c while (!have_error && pango_read_line (file, line_buf)) { const char *p; -@@ -383,10 +370,76 @@ +@@ -477,10 +464,76 @@ else if (module) add_module (module, infos); diff --git a/debian/patches/021_loader-files-d.patch b/debian/patches/021_loader-files-d.patch index d2cdacfd44..017d6a4ac5 100644 --- a/debian/patches/021_loader-files-d.patch +++ b/debian/patches/021_loader-files-d.patch @@ -1,23 +1,42 @@ -Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c +Index: gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am =================================================================== ---- gtk+-2.12.12.orig/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-13 02:00:46.000000000 +0200 -+++ gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c 2008-12-09 21:01:23.065715544 +0100 -@@ -45,6 +45,9 @@ - #undef STRICT - #endif +--- gtk+2.0-2.14.2.orig/gdk-pixbuf/Makefile.am 2008-09-18 03:49:27.000000000 +0200 ++++ gtk+2.0-2.14.2/gdk-pixbuf/Makefile.am 2008-09-18 11:14:51.000000000 +0200 +@@ -62,6 +62,7 @@ + libgdk_pixbuf-2.0.la + + loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders ++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d + + module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + +@@ -513,7 +514,7 @@ + $(GDK_PIXBUF_DEP_CFLAGS) \ + -DGDK_PIXBUF_ENABLE_BACKEND + +-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" + LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + + noinst_PROGRAMS = test-gdk-pixbuf +Index: gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c +=================================================================== +--- gtk+2.0-2.14.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 11:14:59.000000000 +0200 ++++ gtk+2.0-2.14.2/gdk-pixbuf/gdk-pixbuf-io.c 2008-09-18 11:15:06.000000000 +0200 +@@ -51,6 +51,9 @@ + #define SNIFF_BUFFER_SIZE 4096 + #define LOAD_BUFFER_SIZE 65536 +#define LOADERFILEEXT ".loaders" +#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT)) + + #ifndef GDK_PIXBUF_USE_GIO_MIME static gint format_check (GdkPixbufModule *module, guchar *buffer, int size) - { -@@ -289,89 +292,94 @@ static gboolean +@@ -310,115 +313,93 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module, GError **error); --static void --gdk_pixbuf_io_init (void) +/* FIXME this is a static copy of a public pango function which should really + * livein glib */ +static char * @@ -41,7 +60,7 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c + * livein glib */ +char ** +_ugly_copy_of_pango_split_file_list (const char *str) - { ++{ + int i = 0; + int j; + char **files; @@ -92,12 +111,13 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c + + return files; +} ++ + static void +-gdk_pixbuf_io_init (void) ++process_module_file (const gchar *filename, GIOChannel *channel) + { #ifdef USE_GMODULE - GIOChannel *channel; -+ -+static void -+process_module_file (const gchar *filename, GIOChannel *channel) -+{ gchar *line_buf; gsize term; GString *tmp_buf = g_string_new (NULL); @@ -109,7 +129,12 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c GdkPixbufModulePattern *pattern; - GError *error = NULL; -#endif -- GdkPixbufModule *builtin_module = NULL; +- GdkPixbufModule *builtin_module ; +- +- /* initialize on separate line to avoid compiler warnings in the +- * common case of no compiled-in modules. +- */ +- builtin_module = NULL; - -#define load_one_builtin_module(format) \ - builtin_module = g_new0 (GdkPixbufModule, 1); \ @@ -118,7 +143,7 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c - file_formats = g_slist_prepend (file_formats, builtin_module);\ - else \ - g_free (builtin_module) - +- -#ifdef INCLUDE_ani - load_one_builtin_module (ani); -#endif @@ -161,6 +186,28 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c -#ifdef INCLUDE_pcx - load_one_builtin_module (pcx); -#endif +-#ifdef INCLUDE_icns +- load_one_builtin_module (icns); +-#endif +-#ifdef INCLUDE_jasper +- load_one_builtin_module (jasper); +-#endif +-#ifdef INCLUDE_gdiplus +- /* We don't bother having the GDI+ loaders individually selectable +- * for building in or not. +- */ +- load_one_builtin_module (ico); +- load_one_builtin_module (wmf); +- load_one_builtin_module (emf); +- load_one_builtin_module (bmp); +- load_one_builtin_module (gif); +- load_one_builtin_module (jpeg); +- load_one_builtin_module (tiff); +-#endif +-#ifdef INCLUDE_gdip_png +- /* Except the gdip-png loader which normally isn't built at all even */ +- load_one_builtin_module (png); +-#endif - -#undef load_one_builtin_module - @@ -175,19 +222,18 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c - g_free (filename); - return; - } -- + while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { const char *p; - -@@ -508,8 +516,134 @@ gdk_pixbuf_io_init (void) +@@ -556,8 +537,156 @@ g_free (line_buf); } g_string_free (tmp_buf, TRUE); - g_io_channel_unref (channel); - g_free (filename); ++#endif /* USE_GMODULE */ +} + -+#endif /* USE_GMODULE */ + +static void +gdk_pixbuf_io_init (void) @@ -205,7 +251,7 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c +#define load_one_builtin_module(format) \ + builtin_module = g_new0 (GdkPixbufModule, 1); \ + builtin_module->module_name = #format; \ -+ if (_gdk_pixbuf_load_module (builtin_module, NULL)) \ ++ if (gdk_pixbuf_load_module_unlocked (builtin_module, NULL)) \ + file_formats = g_slist_prepend (file_formats, builtin_module);\ + else \ + g_free (builtin_module) @@ -252,6 +298,28 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c +#ifdef INCLUDE_pcx + load_one_builtin_module (pcx); +#endif ++#ifdef INCLUDE_icns ++ load_one_builtin_module (icns); ++#endif ++#ifdef INCLUDE_jasper ++ load_one_builtin_module (jasper); ++#endif ++#ifdef INCLUDE_gdiplus ++ /* We don't bother having the GDI+ loaders individually selectable ++ * for building in or not. ++ */ ++ load_one_builtin_module (ico); ++ load_one_builtin_module (wmf); ++ load_one_builtin_module (emf); ++ load_one_builtin_module (bmp); ++ load_one_builtin_module (gif); ++ load_one_builtin_module (jpeg); ++ load_one_builtin_module (tiff); ++#endif ++#ifdef INCLUDE_gdip_png ++ /* Except the gdip-png loader which normally isn't built at all even */ ++ load_one_builtin_module (png); ++#endif + +#undef load_one_builtin_module + @@ -316,24 +384,3 @@ Index: gtk+-2.12.12/gdk-pixbuf/gdk-pixbuf-io.c #endif } -Index: gtk+-2.12.12/gdk-pixbuf/Makefile.am -=================================================================== ---- gtk+-2.12.12.orig/gdk-pixbuf/Makefile.am 2008-09-13 02:00:46.000000000 +0200 -+++ gtk+-2.12.12/gdk-pixbuf/Makefile.am 2008-12-09 20:54:01.889718455 +0100 -@@ -59,6 +59,7 @@ lib_LTLIBRARIES = \ - libgdk_pixbuf-2.0.la - - loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders -+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d - - module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) - -@@ -319,7 +320,7 @@ INCLUDES = \ - $(GDK_PIXBUF_DEP_CFLAGS) \ - -DGDK_PIXBUF_ENABLE_BACKEND - --AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" -+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" - LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS) - - noinst_PROGRAMS = test-gdk-pixbuf diff --git a/debian/patches/032_gdkwindowimpl_directfb.patch b/debian/patches/032_gdkwindowimpl_directfb.patch new file mode 100644 index 0000000000..1e88ccf991 --- /dev/null +++ b/debian/patches/032_gdkwindowimpl_directfb.patch @@ -0,0 +1,904 @@ +Patch from Sven Neumann to fix DirectFB support for GTK+ 2.14. +Based on the original Ubuntu patch for 2.12. + +GNOME #554407 +Upstream svn r22358,r22381,r22383,r22385 + +Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-02-21 14:15:18.127086939 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-21 14:15:20.018583625 +0100 +@@ -41,9 +41,9 @@ + + + void +-_gdk_windowing_window_get_offsets (GdkWindow *window, +- gint *x_offset, +- gint *y_offset) ++_gdk_directfb_window_get_offsets (GdkWindow *window, ++ gint *x_offset, ++ gint *y_offset) + { + if (x_offset) + *x_offset = 0; +@@ -69,9 +69,9 @@ _gdk_windowing_window_queue_antiexpose ( + * brings in from offscreen areas are invalidated. + **/ + void +-gdk_window_scroll (GdkWindow *window, +- gint dx, +- gint dy) ++_gdk_directfb_window_scroll (GdkWindow *window, ++ gint dx, ++ gint dy) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +@@ -161,10 +161,10 @@ gdk_window_scroll (GdkWindow *window, + * Since: 2.8 + **/ + void +-gdk_window_move_region (GdkWindow *window, +- const GdkRegion *region, +- gint dx, +- gint dy) ++_gdk_directfb_window_move_region (GdkWindow *window, ++ const GdkRegion *region, ++ gint dx, ++ gint dy) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:15:18.091090046 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:17.138584001 +0100 +@@ -33,6 +33,7 @@ + + #include "config.h" + #include "gdk.h" ++#include "gdkwindowimpl.h" + #include "gdkwindow.h" + + #include "gdkdirectfb.h" +@@ -67,6 +68,9 @@ static void gdk_window_impl_directfb_ini + static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass); + static void gdk_window_impl_directfb_finalize (GObject *object); + ++static void gdk_window_impl_iface_init (GdkWindowImplIface *iface); ++ ++ + typedef struct + { + GdkWindowChildChanged changed; +@@ -98,9 +102,8 @@ gdk_window_directfb_process_all_updates + tmp_list = old_update_windows; + while (tmp_list) + { +- GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data ); +- GdkWindowImplDirectFB *wimpl = GDK_WINDOW_IMPL_DIRECTFB( private->impl ); +- ++ GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data ); ++ + if (private->update_freeze_count) + { + D_DEBUG_AT( GDKDFB_Updates, " -> %p frozen [%4d,%4d-%4dx%4d] (%d boxes)\n", +@@ -115,7 +118,7 @@ gdk_window_directfb_process_all_updates + wimpl->flips.num_regions ); + gdk_window_process_updates(tmp_list->data,TRUE); + } +- ++ + g_object_unref (tmp_list->data); + tmp_list = tmp_list->next; + } +@@ -220,6 +223,13 @@ gdk_window_impl_directfb_get_type (void) + NULL + }; + ++ const GInterfaceInfo window_impl_info = ++ { ++ (GInterfaceInitFunc) gdk_window_impl_iface_init, ++ NULL, ++ NULL ++ }; ++ + object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_DIRECTFB, + "GdkWindowImplDirectFB", + &object_info, 0); +@@ -227,6 +237,9 @@ gdk_window_impl_directfb_get_type (void) + GDK_TYPE_PAINTABLE, + &paintable_info); + ++ g_type_add_interface_static (object_type, ++ GDK_TYPE_WINDOW_IMPL, ++ &window_impl_info); + } + + return object_type; +@@ -401,11 +414,11 @@ _gdk_windowing_window_init (void) + + g_assert (_gdk_parent_root == NULL); + +- _gdk_display->layer->GetConfiguration( +- _gdk_display->layer, &dlc ); ++ _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc); + + _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL); + private = GDK_WINDOW_OBJECT (_gdk_parent_root); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + + private->window_type = GDK_WINDOW_ROOT; +@@ -647,8 +660,8 @@ gdk_directfb_window_new (GdkWindow + + GdkWindow * + _gdk_window_new (GdkWindow *parent, +- GdkWindowAttr *attributes, +- gint attributes_mask) ++ GdkWindowAttr *attributes, ++ gint attributes_mask) + { + g_return_val_if_fail (attributes != NULL, NULL); + +@@ -1230,28 +1243,19 @@ show_window_internal (GdkWindow *window, + } + } + +-void +-gdk_window_show_unraised (GdkWindow *window) +-{ +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); +- +- show_window_internal (window, FALSE); +-} +- +-void +-gdk_window_show (GdkWindow *window) ++static void ++gdk_directfb_window_show (GdkWindow *window, ++ gboolean raise) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + +- show_window_internal (window, TRUE); ++ show_window_internal (window, raise); + } + +-void +-gdk_window_hide (GdkWindow *window) ++static void ++gdk_directfb_window_hide (GdkWindow *window) + { + GdkWindowObject *private; + GdkWindowImplDirectFB *impl; +@@ -1276,11 +1280,11 @@ gdk_window_hide (GdkWindow *window) + + if (!private->input_only && private->parent) + { +- _gdk_windowing_window_clear_area (GDK_WINDOW (private->parent), +- private->x, +- private->y, +- impl->drawable.width, +- impl->drawable.height); ++ gdk_window_clear_area (GDK_WINDOW (private->parent), ++ private->x, ++ private->y, ++ impl->drawable.width, ++ impl->drawable.height); + } + + event_win = gdk_directfb_other_event_window (window, GDK_UNMAP); +@@ -1299,8 +1303,8 @@ gdk_window_hide (GdkWindow *window) + } + } + +-void +-gdk_window_withdraw (GdkWindow *window) ++static void ++gdk_directfb_window_withdraw (GdkWindow *window) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -1309,80 +1313,6 @@ gdk_window_withdraw (GdkWindow *window) + } + + void +-gdk_window_move (GdkWindow *window, +- gint x, +- gint y) +-{ +- GdkWindowObject *private; +- GdkWindowImplDirectFB *impl; +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- private = GDK_WINDOW_OBJECT (window); +- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); +- +- if (impl->window) +- { +- private->x = x; +- private->y = y; +- impl->window->MoveTo (impl->window, x, y); +- } +- else +- { +- gint width=impl->drawable.width; +- gint height=impl->drawable.height; +- GdkRectangle old = +- { private->x, private->y,width,height }; +- +- _gdk_directfb_move_resize_child (window, x, y, width, height); +- _gdk_directfb_calc_abs (window); +- +- if (GDK_WINDOW_IS_MAPPED (private)) +- { +- GdkWindow *mousewin; +- GdkRectangle new = { x, y, width, height }; +- +- gdk_rectangle_union (&new, &old, &new); +- gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); +- +- /* The window the pointer is in might have changed */ +- mousewin = gdk_window_at_pointer (NULL, NULL); +- gdk_directfb_window_send_crossing_events (NULL, mousewin, +- GDK_CROSSING_NORMAL); +- } +- } +-} +- +-void +-gdk_window_resize (GdkWindow *window, +- gint width, +- gint height) +-{ +- GdkWindowObject *private; +- gint x, y; +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- private = GDK_WINDOW_OBJECT (window); +- +- x = private->x; +- y = private->y; +- +- if (private->parent && (private->parent->window_type != GDK_WINDOW_CHILD)) +- { +- GdkWindowChildHandlerData *data; +- +- data = g_object_get_data (G_OBJECT (private->parent), +- "gdk-window-child-handler"); +- +- if (data) +- (*data->get_pos) (window, &x, &y, data->user_data); +- } +- +- gdk_window_move_resize (window, x, y, width, height); +-} +- +-void + _gdk_directfb_move_resize_child (GdkWindow *window, + gint x, + gint y, +@@ -1407,15 +1337,17 @@ _gdk_directfb_move_resize_child (GdkWind + + if (!private->input_only) + { +- if (impl->drawable.surface) { +- GdkDrawableImplDirectFB *dimpl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl); +- if(dimpl->cairo_surface) { +- cairo_surface_destroy(dimpl->cairo_surface); +- dimpl->cairo_surface= NULL; +- } +- impl->drawable.surface->Release (impl->drawable.surface); +- impl->drawable.surface = NULL; +- } ++ if (impl->drawable.surface) ++ { ++ if (impl->drawable.cairo_surface) ++ { ++ cairo_surface_destroy (impl->drawable.cairo_surface); ++ impl->drawable.cairo_surface = NULL; ++ } ++ ++ impl->drawable.surface->Release (impl->drawable.surface); ++ impl->drawable.surface = NULL; ++ } + + parent_impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (private->parent)->impl); + +@@ -1432,19 +1364,66 @@ _gdk_directfb_move_resize_child (GdkWind + for (list = private->children; list; list = list->next) + { + private = GDK_WINDOW_OBJECT (list->data); +- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); ++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); ++ + _gdk_directfb_move_resize_child (list->data, + private->x, private->y, + impl->drawable.width, impl->drawable.height); + } + } + +-void +-gdk_window_move_resize (GdkWindow *window, +- gint x, +- gint y, +- gint width, +- gint height) ++static void ++gdk_directfb_window_move (GdkWindow *window, ++ gint x, ++ gint y) ++{ ++ GdkWindowObject *private; ++ GdkWindowImplDirectFB *impl; ++ ++ g_return_if_fail (GDK_IS_WINDOW (window)); ++ ++ private = GDK_WINDOW_OBJECT (window); ++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); ++ ++ if (impl->window) ++ { ++ private->x = x; ++ private->y = y; ++ impl->window->MoveTo (impl->window, x, y); ++ } ++ else ++ { ++ gint width=impl->drawable.width; ++ gint height=impl->drawable.height; ++ GdkRectangle old = ++ { private->x, private->y,width,height }; ++ ++ _gdk_directfb_move_resize_child (window, x, y, width, height); ++ _gdk_directfb_calc_abs (window); ++ ++ if (GDK_WINDOW_IS_MAPPED (private)) ++ { ++ GdkWindow *mousewin; ++ GdkRectangle new = { x, y, width, height }; ++ ++ gdk_rectangle_union (&new, &old, &new); ++ gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); ++ ++ /* The window the pointer is in might have changed */ ++ mousewin = gdk_window_at_pointer (NULL, NULL); ++ gdk_directfb_window_send_crossing_events (NULL, mousewin, ++ GDK_CROSSING_NORMAL); ++ } ++ } ++} ++ ++static void ++gdk_directfb_window_move_resize (GdkWindow *window, ++ gboolean with_move, ++ gint x, ++ gint y, ++ gint width, ++ gint height) + { + GdkWindowObject *private; + GdkWindowImplDirectFB *impl; +@@ -1454,8 +1433,14 @@ gdk_window_move_resize (GdkWindow *windo + private = GDK_WINDOW_OBJECT (window); + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + ++ if (with_move && (width < 0 && height < 0)) ++ { ++ gdk_directfb_window_move (window, x, y); ++ return; ++ } ++ + if (width < 1) +- width = 1; ++ width = 1; + if (height < 1) + height = 1; + +@@ -1478,26 +1463,39 @@ gdk_window_move_resize (GdkWindow *windo + + if (impl->drawable.width == width && impl->drawable.height == height) + { +- gdk_window_move (window, x, y); ++ if (with_move) ++ gdk_directfb_window_move (window, x, y); + } + else if (impl->window) + { +- private->x = x; +- private->y = y; +- impl->window->MoveTo (impl->window, x, y); ++ private->x = x; ++ private->y = y; ++ impl->drawable.width = width; ++ impl->drawable.height = height; ++ ++ if (with_move) ++ impl->window->MoveTo (impl->window, x, y); + impl->window->Resize (impl->window, width, height); + } + else + { +- GdkRectangle old = +- { private->x, private->y, impl->drawable.width, impl->drawable.height }; +- _gdk_directfb_move_resize_child (window, x, y, width, height); ++ GdkRectangle old = { private->x, private->y, ++ impl->drawable.width, impl->drawable.height }; ++ GdkRectangle new = { x, y, width, height }; ++ ++ if (! with_move) ++ { ++ new.x = private->x; ++ new.y = private->y; ++ } ++ ++ _gdk_directfb_move_resize_child (window, ++ new.x, new.y, new.width, new.height); + _gdk_directfb_calc_abs (window); + + if (GDK_WINDOW_IS_MAPPED (private)) + { +- GdkWindow *mousewin; +- GdkRectangle new = { x, y, width, height }; ++ GdkWindow *mousewin; + + gdk_rectangle_union (&new, &old, &new); + gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); +@@ -1510,11 +1508,11 @@ gdk_window_move_resize (GdkWindow *windo + } + } + +-void +-_gdk_window_reparent (GdkWindow *window, +- GdkWindow *new_parent, +- gint x, +- gint y) ++static gboolean ++gdk_directfb_window_reparent (GdkWindow *window, ++ GdkWindow *new_parent, ++ gint x, ++ gint y) + { + GdkWindowObject *window_private; + GdkWindowObject *parent_private; +@@ -1523,10 +1521,10 @@ _gdk_window_reparent (GdkWindow *window, + GdkWindowImplDirectFB *parent_impl; + GdkVisual *visual; + +- g_return_if_fail (GDK_IS_WINDOW (window)); ++ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); + + if (GDK_WINDOW_DESTROYED (window)) +- return; ++ return FALSE; + + if (!new_parent) + new_parent = _gdk_parent_root; +@@ -1539,7 +1537,7 @@ _gdk_window_reparent (GdkWindow *window, + + /* already parented */ + if( window_private->parent == (GdkWindowObject *)new_parent ) +- return; ++ return FALSE; + + window_private->parent = (GdkWindowObject *) new_parent; + +@@ -1593,7 +1591,7 @@ _gdk_window_reparent (GdkWindow *window, + { + g_assert(0); + _gdk_window_destroy (window, FALSE); +- return; ++ return FALSE; + } + /* we hold a reference count on ourselves */ + g_object_ref (window); +@@ -1609,14 +1607,17 @@ _gdk_window_reparent (GdkWindow *window, + &rect, + &impl->drawable.surface); + } ++ ++ return TRUE; + } + +-void +-_gdk_windowing_window_clear_area (GdkWindow *window, +- gint x, +- gint y, +- gint width, +- gint height) ++static void ++gdk_directfb_window_clear_area (GdkWindow *window, ++ gint x, ++ gint y, ++ gint width, ++ gint height, ++ gboolean send_expose) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +@@ -1700,51 +1701,8 @@ _gdk_windowing_window_clear_area (GdkWin + g_object_unref (gc); + } + +-void +-_gdk_windowing_window_clear_area_e (GdkWindow *window, +- gint x, +- gint y, +- gint width, +- gint height) +-{ +- GdkRectangle rect; +- GdkWindowObject *private; +- GdkWindowImplDirectFB *impl; +- +- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d )\n", __FUNCTION__, window, x, y, width, height ); +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- private = GDK_WINDOW_OBJECT (window); +- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); +- +- /** +- Follow XClearArea definition for zero height width +- **/ +- if( width == 0 ) +- width = impl->drawable.width-x; +- if( height == 0 ) +- height = impl->drawable.height-y; +- +- rect.x = x; +- rect.y = y; +- rect.width = width; +- rect.height = height; +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- if (GDK_WINDOW_DESTROYED (window)) { +- D_DEBUG_AT( GDKDFB_Window, " -> DESTROYED!\n" ); +- return; +- } +- +- _gdk_windowing_window_clear_area (window, x, y, width, height); +- +- gdk_window_invalidate_rect (window, &rect, TRUE); +-} +- +-void +-gdk_window_raise (GdkWindow *window) ++static void ++gdk_window_directfb_raise (GdkWindow *window) + { + GdkWindowImplDirectFB *impl; + +@@ -1774,8 +1732,8 @@ gdk_window_raise (GdkWindow *window) + } + } + +-void +-gdk_window_lower (GdkWindow *window) ++static void ++gdk_window_directfb_lower (GdkWindow *window) + { + GdkWindowImplDirectFB *impl; + +@@ -1875,9 +1833,9 @@ gdk_window_set_role (GdkWindow *window + * Since: 2.12 + * + **/ +-void ++void + gdk_window_set_startup_id (GdkWindow *window, +- const gchar *startup_id) ++ const gchar *startup_id) + { + } + +@@ -1907,9 +1865,9 @@ gdk_window_set_transient_for (GdkWindow + root->children = g_list_insert (root->children, window, i); + } + +-void +-gdk_window_set_background (GdkWindow *window, +- const GdkColor *color) ++static void ++gdk_directfb_window_set_background (GdkWindow *window, ++ const GdkColor *color) + { + GdkWindowObject *private; + +@@ -1930,10 +1888,10 @@ gdk_window_set_background (GdkWindow *wi + private->bg_pixmap = NULL; + } + +-void +-gdk_window_set_back_pixmap (GdkWindow *window, +- GdkPixmap *pixmap, +- gint parent_relative) ++static void ++gdk_directfb_window_set_back_pixmap (GdkWindow *window, ++ GdkPixmap *pixmap, ++ gboolean parent_relative) + { + GdkWindowObject *private; + GdkPixmap *old_pixmap; +@@ -1972,9 +1930,9 @@ gdk_window_set_back_pixmap (GdkWindow *w + } + } + +-void +-gdk_window_set_cursor (GdkWindow *window, +- GdkCursor *cursor) ++static void ++gdk_directfb_window_set_cursor (GdkWindow *window, ++ GdkCursor *cursor) + { + GdkWindowImplDirectFB *impl; + GdkCursor *old_cursor; +@@ -2011,13 +1969,13 @@ gdk_window_set_cursor (GdkWindow *window + gdk_cursor_unref (old_cursor); + } + +-void +-gdk_window_get_geometry (GdkWindow *window, +- gint *x, +- gint *y, +- gint *width, +- gint *height, +- gint *depth) ++static void ++gdk_directfb_window_get_geometry (GdkWindow *window, ++ gint *x, ++ gint *y, ++ gint *width, ++ gint *height, ++ gint *depth) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +@@ -2078,10 +2036,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo + } + } + +-gboolean +-gdk_window_get_origin (GdkWindow *window, +- gint *x, +- gint *y) ++static gboolean ++gdk_directfb_window_get_origin (GdkWindow *window, ++ gint *x, ++ gint *y) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); + +@@ -2215,8 +2173,8 @@ _gdk_windowing_window_get_pointer (displ + + } + +-GdkEventMask +-gdk_window_get_events (GdkWindow *window) ++static GdkEventMask ++gdk_directfb_window_get_events (GdkWindow *window) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), 0); + +@@ -2226,9 +2184,9 @@ gdk_window_get_events (GdkWindow *window + return GDK_WINDOW_OBJECT (window)->event_mask; + } + +-void +-gdk_window_set_events (GdkWindow *window, +- GdkEventMask event_mask) ++static void ++gdk_directfb_window_set_events (GdkWindow *window, ++ GdkEventMask event_mask) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -2240,27 +2198,27 @@ gdk_window_set_events (GdkWindow *win + GDK_WINDOW_OBJECT (window)->event_mask = event_mask; + } + +-void +-gdk_window_shape_combine_mask (GdkWindow *window, +- GdkBitmap *mask, +- gint x, +- gint y) ++static void ++gdk_directfb_window_shape_combine_mask (GdkWindow *window, ++ GdkBitmap *mask, ++ gint x, ++ gint y) + { + } + + void + gdk_window_input_shape_combine_mask (GdkWindow *window, +- GdkBitmap *mask, +- gint x, +- gint y) ++ GdkBitmap *mask, ++ gint x, ++ gint y) + { + } + +-void +-gdk_window_shape_combine_region (GdkWindow *window, +- const GdkRegion *shape_region, +- gint offset_x, +- gint offset_y) ++static void ++gdk_directfb_window_shape_combine_region (GdkWindow *window, ++ const GdkRegion *shape_region, ++ gint offset_x, ++ gint offset_y) + { + } + +@@ -2584,13 +2542,13 @@ gdk_window_set_functions (GdkWindow + g_message("unimplemented %s", __FUNCTION__); + } + +-void +-gdk_window_set_child_shapes (GdkWindow *window) ++static void ++gdk_directfb_window_set_child_shapes (GdkWindow *window) + { + } + +-void +-gdk_window_merge_child_shapes (GdkWindow *window) ++static void ++gdk_directfb_window_merge_child_shapes (GdkWindow *window) + { + } + +@@ -2604,9 +2562,9 @@ gdk_window_merge_child_input_shapes (Gdk + { + } + +-gboolean +-gdk_window_set_static_gravities (GdkWindow *window, +- gboolean use_static) ++static gboolean ++gdk_directfb_window_set_static_gravities (GdkWindow *window, ++ gboolean use_static) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); + +@@ -2708,6 +2666,7 @@ GdkWindow *gdk_directfb_create_child_win + + window = g_object_new (GDK_TYPE_WINDOW, NULL); + private = GDK_WINDOW_OBJECT (window); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + parent_private = GDK_WINDOW_OBJECT (parent); + parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl); + private->parent = parent_private; +@@ -2787,6 +2746,7 @@ gdk_window_foreign_new_for_display (GdkD + /* we hold a reference count on ourselves */ + g_object_ref (window); + private = GDK_WINDOW_OBJECT (window); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + private->parent = parent_private; + private->window_type = GDK_WINDOW_TOPLEVEL; + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); +@@ -3153,11 +3113,11 @@ gdk_window_impl_directfb_begin_paint_reg + + D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) ); + +- _gdk_windowing_window_clear_area (GDK_WINDOW(wimpl->gdkWindow), +- box->x1, +- box->y1, +- box->x2 - box->x1, +- box->y2 - box->y1); ++ gdk_window_clear_area (GDK_WINDOW(wimpl->gdkWindow), ++ box->x1, ++ box->y1, ++ box->x2 - box->x1, ++ box->y2 - box->y1); + } + } + +@@ -3281,6 +3241,33 @@ _gdk_windowing_window_set_composited (Gd + { + } + ++static void ++gdk_window_impl_iface_init (GdkWindowImplIface *iface) ++{ ++ iface->show = gdk_directfb_window_show; ++ iface->hide = gdk_directfb_window_hide; ++ iface->withdraw = gdk_directfb_window_withdraw; ++ iface->raise = gdk_window_directfb_raise; ++ iface->lower = gdk_window_directfb_lower; ++ iface->move_resize = gdk_directfb_window_move_resize; ++ iface->move_region = _gdk_directfb_window_move_region; ++ iface->scroll = _gdk_directfb_window_scroll; ++ iface->clear_area = gdk_directfb_window_clear_area; ++ iface->set_background = gdk_directfb_window_set_background; ++ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap; ++ iface->get_events = gdk_directfb_window_get_events; ++ iface->set_events = gdk_directfb_window_set_events; ++ iface->reparent = gdk_directfb_window_reparent; ++ iface->set_cursor = gdk_directfb_window_set_cursor; ++ iface->get_geometry = gdk_directfb_window_get_geometry; ++ iface->get_origin = gdk_directfb_window_get_origin; ++ iface->get_offsets = _gdk_directfb_window_get_offsets; ++ iface->shape_combine_mask = gdk_directfb_window_shape_combine_mask; ++ iface->shape_combine_region = gdk_directfb_window_shape_combine_region; ++ iface->set_child_shapes = gdk_directfb_window_set_child_shapes; ++ iface->merge_child_shapes = gdk_directfb_window_merge_child_shapes; ++ iface->set_static_gravities = gdk_directfb_window_set_static_gravities; ++} + + #define __GDK_WINDOW_X11_C__ + #include "gdkaliasdef.c" +Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:15:18.071083243 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:48:30.330588850 +0100 +@@ -172,6 +172,17 @@ void gdk_directfb_window_id_table + void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id); + GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id); + ++void _gdk_directfb_window_get_offsets (GdkWindow *window, ++ gint *x_offset, ++ gint *y_offset); ++void _gdk_directfb_window_scroll (GdkWindow *window, ++ gint dx, ++ gint dy); ++void _gdk_directfb_window_move_region (GdkWindow *window, ++ const GdkRegion *region, ++ gint dx, ++ gint dy); ++ + + typedef struct + { +Index: gtk+-2.14.7/gdk/directfb/gdkdisplay-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkdisplay-directfb.c 2009-02-21 14:50:43.626587155 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkdisplay-directfb.c 2009-02-21 14:51:12.202624962 +0100 +@@ -36,14 +36,13 @@ + #include "gdkalias.h" + + +- +-extern void _gdk_visual_init (void); +-extern void _gdk_events_init (void); +-extern void _gdk_input_init (void); +-extern void _gdk_dnd_init (void); +-extern void _gdk_windowing_window_init (void); +-extern void _gdk_windowing_image_init (void); +-extern void _gdk_directfb_keyboard_init (void); ++extern void _gdk_visual_init (void); ++extern void _gdk_events_init (void); ++extern void _gdk_input_init (void); ++extern void _gdk_dnd_init (void); ++extern void _gdk_windowing_window_init (void); ++extern void _gdk_windowing_image_init (void); ++extern void _gdk_directfb_keyboard_init (void); + + static gboolean gdk_directfb_argb_font = FALSE; + static gint gdk_directfb_glyph_surface_cache = 8; +@@ -130,11 +129,10 @@ GdkDisplay * gdk_display_open (const gch + _gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL); + + _gdk_visual_init (); ++ _gdk_windowing_window_init (); + + gdk_screen_set_default_colormap (_gdk_screen, +- gdk_screen_get_system_colormap (_gdk_screen)); +- _gdk_windowing_window_init (); +- _gdk_windowing_image_init (); ++ gdk_screen_get_system_colormap (_gdk_screen)); _gdk_windowing_image_init (); + + _gdk_input_init (); + _gdk_dnd_init (); diff --git a/debian/patches/033_directfb_client-message.patch b/debian/patches/033_directfb_client-message.patch new file mode 100644 index 0000000000..a4d832cd7d --- /dev/null +++ b/debian/patches/033_directfb_client-message.patch @@ -0,0 +1,72 @@ +GNOME #560671 +Upstream svn r22364 + +Index: gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:35:01.226582685 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:35:44.242582415 +0100 +@@ -162,24 +162,22 @@ dfb_events_process_window_event (DFBWind + + static gboolean + gdk_event_send_client_message_by_window (GdkEvent *event, +- GdkWindow *window) ++ GdkWindow *window) + { +- GdkEvent *new_event; ++ DFBUserEvent evt; + + g_return_val_if_fail(event != NULL, FALSE); + g_return_val_if_fail(GDK_IS_WINDOW(window), FALSE); + +- new_event = gdk_directfb_event_make (window, GDK_CLIENT_EVENT); +- new_event->client.message_type = event->client.message_type; +- new_event->client.data_format = event->client.data_format; +- memcpy(&new_event->client.data, +- &event->client.data, +- sizeof(event->client.data)); ++ evt.clazz = DFEC_USER; ++ evt.type = GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (event->client.message_type)); ++ evt.data = (void *) event->client.data.l[0]; ++ ++ _gdk_display->buffer->PostEvent(_gdk_display->buffer, DFB_EVENT (&evt)); + + return TRUE; + } + +- + static void + dfb_events_dispatch (void) + { +@@ -230,6 +228,32 @@ dfb_events_io_func (GIOChannel *channe + else + dfb_events_process_window_event (&event->window); + break; ++ ++ case DFEC_USER: ++ { ++ GList *list; ++ ++ GDK_NOTE (EVENTS, g_print (" client_message")); ++ ++ for (list = client_filters; list; list = list->next) ++ { ++ GdkClientFilter *filter = list->data; ++ DFBUserEvent *user_event = (DFBUserEvent *) event; ++ GdkAtom type; ++ ++ type = GDK_POINTER_TO_ATOM (GUINT_TO_POINTER (user_event->type)); ++ ++ if (filter->type == type) ++ { ++ if (filter->function (user_event, ++ NULL, ++ filter->data) != GDK_FILTER_CONTINUE) ++ break; ++ } ++ } ++ } ++ break; ++ + default: + break; + } diff --git a/debian/patches/034_directfb_memleak.patch b/debian/patches/034_directfb_memleak.patch new file mode 100644 index 0000000000..a5fd039fab --- /dev/null +++ b/debian/patches/034_directfb_memleak.patch @@ -0,0 +1,117 @@ +GNOME #533456 +Upstream svn r22369 + +Index: gtk+-2.14.7/configure.in +=================================================================== +--- gtk+-2.14.7.orig/configure.in 2009-02-21 14:48:32.835086281 +0100 ++++ gtk+-2.14.7/configure.in 2009-02-21 14:54:42.690587468 +0100 +@@ -1620,7 +1620,7 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS) + AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS) + + if test "x$gdktarget" = "xdirectfb"; then +- DIRECTFB_REQUIRED_VERSION=0.9.26 ++ DIRECTFB_REQUIRED_VERSION=1.0.0 + AC_MSG_CHECKING(for DirectFB) + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then +Index: gtk+-2.14.7/gdk/directfb/gdkcursor-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkcursor-directfb.c 2009-02-21 14:48:30.306588314 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkcursor-directfb.c 2009-02-21 14:54:42.690587468 +0100 +@@ -41,10 +41,6 @@ + + #include <directfb_version.h> + +-#if DIRECTFB_MAJOR_VERSION < 1 +-#define u32 __u32 +-#define u8 __u8 +-#endif + + static struct { + const guchar *bits; +Index: gtk+-2.14.7/gdk/directfb/gdkdirectfb.h +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkdirectfb.h 2009-02-21 14:48:30.374585434 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkdirectfb.h 2009-02-21 14:54:42.690587468 +0100 +@@ -80,10 +80,8 @@ GdkVisual * gdk_directfb_visual_by_forma + IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window); + IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window); + +-#if (DIRECTFB_MAJOR_VERSION >= 1) + GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, +- IDirectFBSurface *subsurface); +-#endif ++ IDirectFBSurface *subsurface); + + + G_END_DECLS +Index: gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:54:41.887087234 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:54:42.690587468 +0100 +@@ -419,7 +419,6 @@ gdk_directfb_event_windows_add (GdkWindo + impl->window->CreateEventBuffer (impl->window, &EventBuffer); + } + +-#if (DIRECTFB_MAJOR_VERSION >= 1) + void + gdk_directfb_event_windows_remove (GdkWindow *window) + { +@@ -436,7 +435,6 @@ gdk_directfb_event_windows_remove (GdkWi + impl->window->DetachEventBuffer (impl->window, EventBuffer); + /* FIXME: should we warn if (! EventBuffer) ? */ + } +-#endif + + GdkWindow * + gdk_directfb_child_at (GdkWindow *window, +Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:48:30.330588850 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:54:42.690587468 +0100 +@@ -239,10 +239,8 @@ GdkImage* _gdk_directfb_copy_to_image (G + gint width, + gint height); + +-void gdk_directfb_event_windows_add (GdkWindow *window); +-#if (DIRECTFB_MAJOR_VERSION >= 1) ++void gdk_directfb_event_windows_add (GdkWindow *window); + void gdk_directfb_event_windows_remove (GdkWindow *window); +-#endif + + GdkGrabStatus gdk_directfb_keyboard_grab (GdkDisplay *display, + GdkWindow *window, +Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:17.138584001 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:42.694585602 +0100 +@@ -698,9 +698,8 @@ _gdk_windowing_window_destroy (GdkWindow + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + + _gdk_selection_window_destroyed (window); +-#if (DIRECTFB_MAJOR_VERSION >= 1) + gdk_directfb_event_windows_remove (window); +-#endif ++ + if (window == _gdk_directfb_pointer_grab_window) + gdk_pointer_ungrab (GDK_CURRENT_TIME); + if (window == _gdk_directfb_keyboard_grab_window) +@@ -2651,9 +2650,8 @@ gdk_window_get_frame_extents (GdkWindow + * Given a directfb window and a subsurface of that window + * create a gdkwindow child wrapper + */ +-#if (DIRECTFB_MAJOR_VERSION >= 1) + GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, +- IDirectFBSurface *subsurface) ++ IDirectFBSurface *subsurface) + { + GdkWindow *window; + GdkWindowObject *private; +@@ -2698,7 +2696,6 @@ GdkWindow *gdk_directfb_create_child_win + return window; + + } +-#endif + + /* + * The wrapping is not perfect since directfb does not give full access diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 5910ab7b8a..204a3320db 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,7 +1,7 @@ -Index: gtk+-2.12.12/aclocal.m4 +Index: gtk+-2.14.7/aclocal.m4 =================================================================== ---- gtk+-2.12.12.orig/aclocal.m4 2008-09-13 02:03:13.000000000 +0200 -+++ gtk+-2.12.12/aclocal.m4 2008-12-09 21:03:14.901713834 +0100 +--- gtk+-2.14.7.orig/aclocal.m4 2009-02-17 23:15:21.979084400 +0100 ++++ gtk+-2.14.7/aclocal.m4 2009-02-21 14:58:00.407081464 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- @@ -3905,15 +3905,30 @@ Index: gtk+-2.12.12/aclocal.m4 +]) # _AM_PROG_TAR +m4_include([acinclude.m4]) -Index: gtk+-2.12.12/configure +Index: gtk+-2.14.7/config.h.in =================================================================== ---- gtk+-2.12.12.orig/configure 2008-09-13 02:03:31.000000000 +0200 -+++ gtk+-2.12.12/configure 2008-12-09 21:03:55.961713848 +0100 +--- gtk+-2.14.7.orig/config.h.in 2009-02-17 23:15:21.971082266 +0100 ++++ gtk+-2.14.7/config.h.in 2009-02-21 14:56:58.110583864 +0100 +@@ -210,6 +210,10 @@ + /* Define to 1 if you have the `_NSGetEnviron' function. */ + #undef HAVE__NSGETENVIRON + ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ + /* Define if <X11/extensions/XIproto.h> needed for xReply */ + #undef NEED_XIPROTO_H_FOR_XREPLY + +Index: gtk+-2.14.7/configure +=================================================================== +--- gtk+-2.14.7.orig/configure 2009-02-17 23:15:21.959084442 +0100 ++++ gtk+-2.14.7/configure 2009-02-21 14:58:55.155081350 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.62 for gtk+ 2.12.12. -+# Generated by GNU Autoconf 2.61 for gtk+ 2.12.12. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.14.7. ++# Generated by GNU Autoconf 2.61 for gtk+ 2.14.7. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. # @@ -4156,63 +4171,350 @@ Index: gtk+-2.12.12/configure esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -831,6 +809,7 @@ target_alias - INSTALL_PROGRAM - INSTALL_SCRIPT - INSTALL_DATA -+am__isrc - CYGPATH_W - PACKAGE - VERSION -@@ -839,13 +818,16 @@ AUTOCONF - AUTOMAKE - AUTOHEADER - MAKEINFO +@@ -791,424 +769,396 @@ ac_includes_default="\ + # include <unistd.h> + #endif" + +-ac_subst_vars='LTLIBOBJS +-LIBOBJS +-ENABLE_MAN_FALSE +-ENABLE_MAN_TRUE +-XMLCATALOG +-XML_CATALOG_FILE +-XSLTPROC +-HAVE_DOCBOOK_FALSE +-HAVE_DOCBOOK_TRUE +-DB2HTML +-GTK_DOC_USE_LIBTOOL_FALSE +-GTK_DOC_USE_LIBTOOL_TRUE +-ENABLE_GTK_DOC_FALSE +-ENABLE_GTK_DOC_TRUE +-GTKDOC_CHECK +-HTML_DIR +-TEST_PRINT_BACKEND_FALSE +-TEST_PRINT_BACKEND_TRUE +-HAVE_HTTP_AUTHSTRING +-HAVE_CUPS_FALSE +-HAVE_CUPS_TRUE +-CUPS_LIBS +-CUPS_CFLAGS +-CUPS_API_MINOR +-CUPS_API_MAJOR +-CUPS_CONFIG +-GAIL_INET_LIBS +-GTK_XIM_FLAGS +-GTK_DEBUG_FLAGS +-CAIRO_PREFIX +-PANGO_PREFIX +-ATK_PREFIX +-GLIB_PREFIX +-GTK_DEP_CFLAGS +-GTK_DEP_LIBS +-GTK_EXTRA_CFLAGS +-GTK_EXTRA_LIBS +-GTK_PACKAGES +-GDK_PIXBUF_DEP_CFLAGS +-GDK_PIXBUF_DEP_LIBS +-GDK_PIXBUF_EXTRA_CFLAGS +-GDK_PIXBUF_EXTRA_LIBS +-GDK_PIXBUF_PACKAGES +-GDK_DEP_CFLAGS +-GDK_DEP_LIBS +-GDK_EXTRA_CFLAGS +-GDK_EXTRA_LIBS +-GDK_PACKAGES +-USE_DIRECTFB_FALSE +-USE_DIRECTFB_TRUE +-GDK_PIXBUF_XLIB_DEP_CFLAGS +-GDK_PIXBUF_XLIB_DEP_LIBS +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS +-GDK_PIXBUF_XLIB_EXTRA_LIBS +-GDK_PIXBUF_XLIB_PACKAGES +-USE_QUARTZ_FALSE +-USE_QUARTZ_TRUE +-USE_WIN32_FALSE +-USE_WIN32_TRUE +-USE_X11_FALSE +-USE_X11_TRUE +-XINPUT_XFREE_FALSE +-XINPUT_XFREE_TRUE +-HAVE_X11R6_FALSE +-HAVE_X11R6_TRUE +-X_EXTRA_LIBS +-X_LIBS +-X_PRE_LIBS +-X_CFLAGS +-XMKMF +-REBUILD_PNGS +-GTK_UPDATE_ICON_CACHE +-GDK_PIXBUF_CSOURCE +-CROSS_COMPILING_FALSE +-CROSS_COMPILING_TRUE +-USE_MMX_FALSE +-USE_MMX_TRUE +-USE_MEDIALIB25_FALSE +-USE_MEDIALIB25_TRUE +-USE_MEDIALIB_FALSE +-USE_MEDIALIB_TRUE +-HAVE_JASPER_FALSE +-HAVE_JASPER_TRUE +-HAVE_JPEG_FALSE +-HAVE_JPEG_TRUE +-HAVE_PNG_FALSE +-HAVE_PNG_TRUE +-HAVE_TIFF_FALSE +-HAVE_TIFF_TRUE +-INCLUDE_IM_XIM_FALSE +-INCLUDE_IM_XIM_TRUE +-INCLUDE_IM_VIQR_FALSE +-INCLUDE_IM_VIQR_TRUE +-INCLUDE_IM_TI_ET_FALSE +-INCLUDE_IM_TI_ET_TRUE +-INCLUDE_IM_TI_ER_FALSE +-INCLUDE_IM_TI_ER_TRUE +-INCLUDE_IM_THAI_FALSE +-INCLUDE_IM_THAI_TRUE +-INCLUDE_IM_MULTIPRESS_FALSE +-INCLUDE_IM_MULTIPRESS_TRUE +-INCLUDE_IM_IPA_FALSE +-INCLUDE_IM_IPA_TRUE +-INCLUDE_IM_INUKTITUT_FALSE +-INCLUDE_IM_INUKTITUT_TRUE +-INCLUDE_IM_IME_FALSE +-INCLUDE_IM_IME_TRUE +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE +-INCLUDE_IM_CEDILLA_FALSE +-INCLUDE_IM_CEDILLA_TRUE +-INCLUDE_IM_AM_ET_FALSE +-INCLUDE_IM_AM_ET_TRUE +-INCLUDED_IMMODULE_DEFINE +-INCLUDED_IMMODULE_OBJ +-HAVE_INCLUDED_IMMMODULES_FALSE +-HAVE_INCLUDED_IMMMODULES_TRUE +-INCLUDE_GDIPLUS_FALSE +-INCLUDE_GDIPLUS_TRUE +-INCLUDE_JASPER_FALSE +-INCLUDE_JASPER_TRUE +-INCLUDE_ICNS_FALSE +-INCLUDE_ICNS_TRUE +-INCLUDE_PCX_FALSE +-INCLUDE_PCX_TRUE +-INCLUDE_TGA_FALSE +-INCLUDE_TGA_TRUE +-INCLUDE_XBM_FALSE +-INCLUDE_XBM_TRUE +-INCLUDE_XPM_FALSE +-INCLUDE_XPM_TRUE +-INCLUDE_TIFF_FALSE +-INCLUDE_TIFF_TRUE +-INCLUDE_RAS_FALSE +-INCLUDE_RAS_TRUE +-INCLUDE_PNM_FALSE +-INCLUDE_PNM_TRUE +-INCLUDE_JPEG_FALSE +-INCLUDE_JPEG_TRUE +-INCLUDE_ANI_FALSE +-INCLUDE_ANI_TRUE +-INCLUDE_ICO_FALSE +-INCLUDE_ICO_TRUE +-INCLUDE_GIF_FALSE +-INCLUDE_GIF_TRUE +-INCLUDE_WBMP_FALSE +-INCLUDE_WBMP_TRUE +-INCLUDE_BMP_FALSE +-INCLUDE_BMP_TRUE +-INCLUDE_PNG_FALSE +-INCLUDE_PNG_TRUE +-INCLUDED_LOADER_DEFINE +-INCLUDED_LOADER_OBJ +-BUILD_DYNAMIC_MODULES_FALSE +-BUILD_DYNAMIC_MODULES_TRUE +-LIBJASPER +-LIBPNG +-LIBJPEG +-LIBTIFF +-BUILD_GDIPLUS_LOADERS_FALSE +-BUILD_GDIPLUS_LOADERS_TRUE +-GDK_WLIBS +-GLIB_MKENUMS +-GOBJECT_QUERY +-GLIB_GENMARSHAL +-GLIB_LIBS +-GLIB_CFLAGS +-MKINSTALLDIRS +-POSUB +-POFILES +-PO_IN_DATADIR_FALSE +-PO_IN_DATADIR_TRUE +-INTLLIBS +-INSTOBJEXT +-GMOFILES +-DATADIRNAME +-CATOBJEXT +-CATALOGS +-XGETTEXT +-GMSGFMT +-MSGFMT_OPTS +-MSGFMT +-USE_NLS +-REBUILD +-INDENT +-PERL +-DISABLE_EXPLICIT_DEPS_FALSE +-DISABLE_EXPLICIT_DEPS_TRUE +-LIBTOOL_EXPORT_OPTIONS +-BASE_DEPENDENCIES_LIBS +-BASE_DEPENDENCIES_CFLAGS +-PKG_CONFIG +-gtktargetlib +-gdktargetlib +-gdktarget +-MS_LIB_AVAILABLE_FALSE +-MS_LIB_AVAILABLE_TRUE +-ms_librarian +-WINDRES +-OS_LINUX_FALSE +-OS_LINUX_TRUE +-OS_UNIX_FALSE +-OS_UNIX_TRUE +-OS_WIN32_FALSE +-OS_WIN32_TRUE +-PLATFORM_WIN32_FALSE +-PLATFORM_WIN32_TRUE +-MAINT +-MAINTAINER_MODE_FALSE +-MAINTAINER_MODE_TRUE +-NM +-CCASFLAGS +-CCAS +-LIBTOOL +-ac_ct_F77 +-FFLAGS +-F77 +-CXXCPP +-CPP +-OBJDUMP +-AS +-DLLTOOL +-NMEDIT +-DSYMUTIL +-RANLIB +-AR +-ECHO +-LN_S +-EGREP +-GREP +-SED +-HAVE_OBJC_FALSE +-HAVE_OBJC_TRUE +-HAVE_CXX_FALSE +-HAVE_CXX_TRUE +-am__fastdepCXX_FALSE +-am__fastdepCXX_TRUE +-CXXDEPMODE +-CXXFLAGS +-ac_ct_CXX +-CXX +-am__fastdepCC_FALSE +-am__fastdepCC_TRUE +-CCDEPMODE +-AMDEPBACKSLASH +-AMDEP_FALSE +-AMDEP_TRUE +-am__quote +-am__include +-DEPDIR +-OBJEXT +-EXEEXT +-ac_ct_CC +-CPPFLAGS +-LDFLAGS +-CFLAGS +-CC +-LIB_EXE_MACHINE_FLAG +-host_os +-host_vendor +-host_cpu +-host +-build_os +-build_vendor +-build_cpu +-build +-GETTEXT_PACKAGE +-GDK_PIXBUF_VERSION +-GDK_PIXBUF_MICRO +-GDK_PIXBUF_MINOR +-GDK_PIXBUF_MAJOR +-GAIL_LT_CURRENT_MINUS_AGE +-GAIL_LT_VERSION_INFO +-LT_CURRENT_MINUS_AGE +-LT_VERSION_INFO +-GTK_BINARY_VERSION +-GTK_VERSION +-GTK_API_VERSION +-GTK_BINARY_AGE +-GTK_INTERFACE_AGE +-GTK_MICRO_VERSION +-GTK_MINOR_VERSION +-GTK_MAJOR_VERSION +-am__leading_dot +-SET_MAKE +-AWK +-INSTALL_STRIP_PROGRAM +-STRIP +-install_sh -AMTAR - install_sh - STRIP - INSTALL_STRIP_PROGRAM -+mkdir_p - AWK - SET_MAKE - am__leading_dot -+AMTAR -+am__tar -+am__untar - GTK_MAJOR_VERSION - GTK_MINOR_VERSION - GTK_MICRO_VERSION -@@ -885,6 +867,8 @@ AMDEPBACKSLASH - CCDEPMODE - am__fastdepCC_TRUE - am__fastdepCC_FALSE -+ENABLE_STATIC_TRUE -+ENABLE_STATIC_FALSE - CXX - CXXFLAGS - ac_ct_CXX -@@ -915,6 +899,9 @@ ac_ct_F77 - LIBTOOL - CCAS - CCASFLAGS -+CCASDEPMODE -+am__fastdepCCAS_TRUE -+am__fastdepCCAS_FALSE - NM - MAINTAINER_MODE_TRUE - MAINTAINER_MODE_FALSE -@@ -1040,6 +1027,7 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS - USE_DIRECTFB_TRUE - USE_DIRECTFB_FALSE - GDK_PACKAGES -+GDK_PRIVATE_PACKAGES - GDK_EXTRA_LIBS - GDK_EXTRA_CFLAGS - GDK_DEP_LIBS -@@ -1087,41 +1075,6 @@ ENABLE_MAN_FALSE - LIBOBJS - LTLIBOBJS' - ac_subst_files='' +-MAKEINFO +-AUTOHEADER +-AUTOMAKE +-AUTOCONF +-ACLOCAL +-VERSION +-PACKAGE +-CYGPATH_W +-INSTALL_DATA +-INSTALL_SCRIPT +-INSTALL_PROGRAM +-target_alias +-host_alias +-build_alias +-LIBS +-ECHO_T +-ECHO_N +-ECHO_C +-DEFS +-mandir +-localedir +-libdir +-psdir +-pdfdir +-dvidir +-htmldir +-infodir +-docdir +-oldincludedir +-includedir +-localstatedir +-sharedstatedir +-sysconfdir +-datadir +-datarootdir +-libexecdir +-sbindir +-bindir +-program_transform_name +-prefix +-exec_prefix +-PACKAGE_BUGREPORT +-PACKAGE_STRING +-PACKAGE_VERSION +-PACKAGE_TARNAME +-PACKAGE_NAME ++ac_subst_vars='SHELL + PATH_SEPARATOR +-SHELL' +-ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_dependency_tracking @@ -4239,7 +4541,10 @@ Index: gtk+-2.12.12/configure -with_libpng -with_libjpeg -with_libtiff +-with_libjasper +-enable_gdiplus -with_included_loaders +-with_included_immodules -with_x -enable_cups -enable_test_print_backend @@ -4248,28 +4553,424 @@ Index: gtk+-2.12.12/configure -enable_man -with_xml_catalog -' - ac_precious_vars='build_alias +- ac_precious_vars='build_alias ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias host_alias target_alias -@@ -1137,6 +1090,8 @@ CPP ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++am__isrc ++CYGPATH_W ++PACKAGE ++VERSION ++ACLOCAL ++AUTOCONF ++AUTOMAKE ++AUTOHEADER ++MAKEINFO ++install_sh ++STRIP ++INSTALL_STRIP_PROGRAM ++mkdir_p ++AWK ++SET_MAKE ++am__leading_dot ++AMTAR ++am__tar ++am__untar ++GTK_MAJOR_VERSION ++GTK_MINOR_VERSION ++GTK_MICRO_VERSION ++GTK_INTERFACE_AGE ++GTK_BINARY_AGE ++GTK_API_VERSION ++GTK_VERSION ++GTK_BINARY_VERSION ++LT_VERSION_INFO ++LT_CURRENT_MINUS_AGE ++GAIL_LT_VERSION_INFO ++GAIL_LT_CURRENT_MINUS_AGE ++GDK_PIXBUF_MAJOR ++GDK_PIXBUF_MINOR ++GDK_PIXBUF_MICRO ++GDK_PIXBUF_VERSION ++GETTEXT_PACKAGE ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++LIB_EXE_MACHINE_FLAG + CC + CFLAGS + LDFLAGS +-LIBS + CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE + CXX ++ac_ct_CXX + CXXFLAGS +-CCC ++CXXDEPMODE ++am__fastdepCXX_TRUE ++am__fastdepCXX_FALSE ++HAVE_CXX_TRUE ++HAVE_CXX_FALSE ++HAVE_OBJC_TRUE ++HAVE_OBJC_FALSE ++SED ++GREP ++EGREP ++LN_S ++ECHO ++AR ++RANLIB ++DSYMUTIL ++NMEDIT ++DLLTOOL ++AS ++OBJDUMP + CPP CXXCPP F77 FFLAGS ++ac_ct_F77 ++LIBTOOL +CCAS +CCASFLAGS ++CCASDEPMODE ++am__fastdepCCAS_TRUE ++am__fastdepCCAS_FALSE ++NM ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT ++PLATFORM_WIN32_TRUE ++PLATFORM_WIN32_FALSE ++OS_WIN32_TRUE ++OS_WIN32_FALSE ++OS_UNIX_TRUE ++OS_UNIX_FALSE ++OS_LINUX_TRUE ++OS_LINUX_FALSE ++WINDRES ++ms_librarian ++MS_LIB_AVAILABLE_TRUE ++MS_LIB_AVAILABLE_FALSE ++gdktarget ++gdktargetlib ++gtktargetlib PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS -@@ -1146,8 +1101,6 @@ XMKMF' - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false +-XMKMF' +- +- +-# Initialize some variables set by options. +-ac_init_help= +-ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -1246,21 +1199,13 @@ do +-# The variables have the same names as the options, with +-# dashes changed to underlines. +-cache_file=/dev/null +-exec_prefix=NONE +-no_create= +-no_recursion= +-prefix=NONE +-program_prefix=NONE +-program_suffix=NONE +-program_transform_name=s,x,x, +-silent= +-site= +-srcdir= +-verbose= +-x_includes=NONE ++LIBTOOL_EXPORT_OPTIONS ++DISABLE_EXPLICIT_DEPS_TRUE ++DISABLE_EXPLICIT_DEPS_FALSE ++PERL ++INDENT ++REBUILD ++USE_NLS ++MSGFMT ++MSGFMT_OPTS ++GMSGFMT ++XGETTEXT ++CATALOGS ++CATOBJEXT ++DATADIRNAME ++GMOFILES ++INSTOBJEXT ++INTLLIBS ++PO_IN_DATADIR_TRUE ++PO_IN_DATADIR_FALSE ++POFILES ++POSUB ++MKINSTALLDIRS ++GLIB_CFLAGS ++GLIB_LIBS ++GLIB_GENMARSHAL ++GOBJECT_QUERY ++GLIB_MKENUMS ++GDK_WLIBS ++BUILD_GDIPLUS_LOADERS_TRUE ++BUILD_GDIPLUS_LOADERS_FALSE ++LIBTIFF ++LIBJPEG ++LIBPNG ++LIBJASPER ++BUILD_DYNAMIC_MODULES_TRUE ++BUILD_DYNAMIC_MODULES_FALSE ++INCLUDED_LOADER_OBJ ++INCLUDED_LOADER_DEFINE ++INCLUDE_PNG_TRUE ++INCLUDE_PNG_FALSE ++INCLUDE_BMP_TRUE ++INCLUDE_BMP_FALSE ++INCLUDE_WBMP_TRUE ++INCLUDE_WBMP_FALSE ++INCLUDE_GIF_TRUE ++INCLUDE_GIF_FALSE ++INCLUDE_ICO_TRUE ++INCLUDE_ICO_FALSE ++INCLUDE_ANI_TRUE ++INCLUDE_ANI_FALSE ++INCLUDE_JPEG_TRUE ++INCLUDE_JPEG_FALSE ++INCLUDE_PNM_TRUE ++INCLUDE_PNM_FALSE ++INCLUDE_RAS_TRUE ++INCLUDE_RAS_FALSE ++INCLUDE_TIFF_TRUE ++INCLUDE_TIFF_FALSE ++INCLUDE_XPM_TRUE ++INCLUDE_XPM_FALSE ++INCLUDE_XBM_TRUE ++INCLUDE_XBM_FALSE ++INCLUDE_TGA_TRUE ++INCLUDE_TGA_FALSE ++INCLUDE_PCX_TRUE ++INCLUDE_PCX_FALSE ++INCLUDE_ICNS_TRUE ++INCLUDE_ICNS_FALSE ++INCLUDE_JASPER_TRUE ++INCLUDE_JASPER_FALSE ++INCLUDE_GDIPLUS_TRUE ++INCLUDE_GDIPLUS_FALSE ++HAVE_INCLUDED_IMMMODULES_TRUE ++HAVE_INCLUDED_IMMMODULES_FALSE ++INCLUDED_IMMODULE_OBJ ++INCLUDED_IMMODULE_DEFINE ++INCLUDE_IM_AM_ET_TRUE ++INCLUDE_IM_AM_ET_FALSE ++INCLUDE_IM_CEDILLA_TRUE ++INCLUDE_IM_CEDILLA_FALSE ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE ++INCLUDE_IM_IME_TRUE ++INCLUDE_IM_IME_FALSE ++INCLUDE_IM_INUKTITUT_TRUE ++INCLUDE_IM_INUKTITUT_FALSE ++INCLUDE_IM_IPA_TRUE ++INCLUDE_IM_IPA_FALSE ++INCLUDE_IM_MULTIPRESS_TRUE ++INCLUDE_IM_MULTIPRESS_FALSE ++INCLUDE_IM_THAI_TRUE ++INCLUDE_IM_THAI_FALSE ++INCLUDE_IM_TI_ER_TRUE ++INCLUDE_IM_TI_ER_FALSE ++INCLUDE_IM_TI_ET_TRUE ++INCLUDE_IM_TI_ET_FALSE ++INCLUDE_IM_VIQR_TRUE ++INCLUDE_IM_VIQR_FALSE ++INCLUDE_IM_XIM_TRUE ++INCLUDE_IM_XIM_FALSE ++HAVE_TIFF_TRUE ++HAVE_TIFF_FALSE ++HAVE_PNG_TRUE ++HAVE_PNG_FALSE ++HAVE_JPEG_TRUE ++HAVE_JPEG_FALSE ++HAVE_JASPER_TRUE ++HAVE_JASPER_FALSE ++USE_MEDIALIB_TRUE ++USE_MEDIALIB_FALSE ++USE_MEDIALIB25_TRUE ++USE_MEDIALIB25_FALSE ++USE_MMX_TRUE ++USE_MMX_FALSE ++CROSS_COMPILING_TRUE ++CROSS_COMPILING_FALSE ++GDK_PIXBUF_CSOURCE ++GTK_UPDATE_ICON_CACHE ++REBUILD_PNGS ++XMKMF ++X_CFLAGS ++X_PRE_LIBS ++X_LIBS ++X_EXTRA_LIBS ++HAVE_X11R6_TRUE ++HAVE_X11R6_FALSE ++XINPUT_XFREE_TRUE ++XINPUT_XFREE_FALSE ++USE_X11_TRUE ++USE_X11_FALSE ++USE_WIN32_TRUE ++USE_WIN32_FALSE ++USE_QUARTZ_TRUE ++USE_QUARTZ_FALSE ++GDK_PIXBUF_XLIB_PACKAGES ++GDK_PIXBUF_XLIB_EXTRA_LIBS ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS ++GDK_PIXBUF_XLIB_DEP_LIBS ++GDK_PIXBUF_XLIB_DEP_CFLAGS ++USE_DIRECTFB_TRUE ++USE_DIRECTFB_FALSE ++GDK_PACKAGES ++GDK_PRIVATE_PACKAGES ++GDK_EXTRA_LIBS ++GDK_EXTRA_CFLAGS ++GDK_DEP_LIBS ++GDK_DEP_CFLAGS ++GDK_PIXBUF_PACKAGES ++GDK_PIXBUF_EXTRA_LIBS ++GDK_PIXBUF_EXTRA_CFLAGS ++GDK_PIXBUF_DEP_LIBS ++GDK_PIXBUF_DEP_CFLAGS ++GTK_PACKAGES ++GTK_EXTRA_LIBS ++GTK_EXTRA_CFLAGS ++GTK_DEP_LIBS ++GTK_DEP_CFLAGS ++GLIB_PREFIX ++ATK_PREFIX ++PANGO_PREFIX ++CAIRO_PREFIX ++GTK_DEBUG_FLAGS ++GTK_XIM_FLAGS ++GAIL_INET_LIBS ++CUPS_CONFIG ++CUPS_API_MAJOR ++CUPS_API_MINOR ++CUPS_CFLAGS ++CUPS_LIBS ++HAVE_CUPS_TRUE ++HAVE_CUPS_FALSE ++HAVE_HTTP_AUTHSTRING ++TEST_PRINT_BACKEND_TRUE ++TEST_PRINT_BACKEND_FALSE ++HTML_DIR ++GTKDOC_CHECK ++ENABLE_GTK_DOC_TRUE ++ENABLE_GTK_DOC_FALSE ++GTK_DOC_USE_LIBTOOL_TRUE ++GTK_DOC_USE_LIBTOOL_FALSE ++DB2HTML ++HAVE_DOCBOOK_TRUE ++HAVE_DOCBOOK_FALSE ++XSLTPROC ++XML_CATALOG_FILE ++XMLCATALOG ++ENABLE_MAN_TRUE ++ENABLE_MAN_FALSE ++LIBOBJS ++LTLIBOBJS' ++ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CXX ++CXXFLAGS ++CCC ++CPP ++CXXCPP ++F77 ++FFLAGS ++CCAS ++CCASFLAGS ++PKG_CONFIG ++BASE_DEPENDENCIES_CFLAGS ++BASE_DEPENDENCIES_LIBS ++XMKMF' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++# The variables have the same names as the options, with ++# dashes changed to underlines. ++cache_file=/dev/null ++exec_prefix=NONE ++no_create= ++no_recursion= ++prefix=NONE ++program_prefix=NONE ++program_suffix=NONE ++program_transform_name=s,x,x, ++silent= ++site= ++srcdir= ++verbose= ++x_includes=NONE + x_libraries=NONE + + # Installation directory options. +@@ -1292,21 +1242,13 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) @@ -4296,7 +4997,7 @@ Index: gtk+-2.12.12/configure -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; -@@ -1273,21 +1218,13 @@ do +@@ -1319,21 +1261,13 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) @@ -4323,7 +5024,7 @@ Index: gtk+-2.12.12/configure -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1478,38 +1415,22 @@ do +@@ -1524,38 +1458,22 @@ do ac_init_version=: ;; -with-* | --with-*) @@ -4372,7 +5073,7 @@ Index: gtk+-2.12.12/configure --x) # Obsolete; use --with-x. -@@ -1529,7 +1450,7 @@ do +@@ -1575,7 +1493,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -4381,7 +5082,7 @@ Index: gtk+-2.12.12/configure Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -1538,16 +1459,16 @@ Try \`$0 --help' for more information." +@@ -1584,16 +1502,16 @@ Try \`$0 --help' for more information." ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && @@ -4401,7 +5102,7 @@ Index: gtk+-2.12.12/configure : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; -@@ -1556,38 +1477,22 @@ done +@@ -1602,38 +1520,22 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -4413,9 +5114,9 @@ Index: gtk+-2.12.12/configure -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; -- fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; -- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; +- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - @@ -4443,7 +5144,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } done -@@ -1602,7 +1507,7 @@ target=$target_alias +@@ -1648,7 +1550,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -4452,11 +5153,11 @@ Index: gtk+-2.12.12/configure If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes -@@ -1618,10 +1523,10 @@ test "$silent" = yes && exec 6>/dev/null +@@ -1664,10 +1566,10 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { $as_echo "$as_me: error: Working directory cannot be determined" >&2 +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { echo "$as_me: error: Working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || @@ -4465,7 +5166,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } -@@ -1629,12 +1534,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +@@ -1675,12 +1577,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. @@ -4484,7 +5185,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -1661,12 +1566,12 @@ else +@@ -1707,12 +1609,12 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -4499,7 +5200,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. -@@ -1715,9 +1620,9 @@ Configuration: +@@ -1761,9 +1663,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -4511,7 +5212,7 @@ Index: gtk+-2.12.12/configure By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1727,25 +1632,25 @@ for instance \`--prefix=\$HOME'. +@@ -1773,25 +1675,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: @@ -4556,7 +5257,7 @@ Index: gtk+-2.12.12/configure _ACEOF cat <<\_ACEOF -@@ -1772,19 +1677,18 @@ if test -n "$ac_init_help"; then +@@ -1818,19 +1720,18 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: @@ -4580,7 +5281,7 @@ Index: gtk+-2.12.12/configure --enable-debug=[no/minimum/yes] turn on debugging [default=minimum] --enable-shm support shared memory if available [default=yes] -@@ -1839,6 +1743,8 @@ Some influential environment variables: +@@ -1889,6 +1790,8 @@ Some influential environment variables: CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -4589,7 +5290,7 @@ Index: gtk+-2.12.12/configure PKG_CONFIG path to pkg-config utility BASE_DEPENDENCIES_CFLAGS C compiler flags for BASE_DEPENDENCIES, overriding pkg-config -@@ -1857,17 +1763,15 @@ fi +@@ -1907,17 +1810,15 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue @@ -4610,7 +5311,7 @@ Index: gtk+-2.12.12/configure case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1903,7 +1807,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ +@@ -1953,7 +1854,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ echo && $SHELL "$ac_srcdir/configure" --help=recursive else @@ -4619,11 +5320,11 @@ Index: gtk+-2.12.12/configure fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done -@@ -1913,10 +1817,10 @@ test -n "$ac_init_help" && exit $ac_stat +@@ -1963,10 +1864,10 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF - gtk+ configure 2.12.12 --generated by GNU Autoconf 2.62 + gtk+ configure 2.14.7 +-generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -4632,16 +5333,16 @@ Index: gtk+-2.12.12/configure This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF -@@ -1927,7 +1831,7 @@ This file contains any messages produced +@@ -1977,7 +1878,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. - It was created by gtk+ $as_me 2.12.12, which was --generated by GNU Autoconf 2.62. Invocation command line was + It was created by gtk+ $as_me 2.14.7, which was +-generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ -@@ -1963,7 +1867,7 @@ for as_dir in $PATH +@@ -2013,7 +1914,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4650,7 +5351,7 @@ Index: gtk+-2.12.12/configure done IFS=$as_save_IFS -@@ -1998,7 +1902,7 @@ do +@@ -2048,7 +1949,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) @@ -4659,12 +5360,12 @@ Index: gtk+-2.12.12/configure esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -2050,12 +1954,11 @@ _ASBOX +@@ -2100,12 +2001,11 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac @@ -4674,7 +5375,7 @@ Index: gtk+-2.12.12/configure *) $as_unset $ac_var ;; esac ;; esac -@@ -2085,9 +1988,9 @@ _ASBOX +@@ -2135,9 +2035,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in @@ -4686,7 +5387,7 @@ Index: gtk+-2.12.12/configure done | sort echo -@@ -2102,9 +2005,9 @@ _ASBOX +@@ -2152,9 +2052,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in @@ -4698,7 +5399,7 @@ Index: gtk+-2.12.12/configure done | sort echo fi -@@ -2120,8 +2023,8 @@ _ASBOX +@@ -2170,8 +2070,8 @@ _ASBOX echo fi test "$ac_signal" != 0 && @@ -4709,7 +5410,7 @@ Index: gtk+-2.12.12/configure } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -2163,24 +2066,21 @@ _ACEOF +@@ -2213,24 +2113,21 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. @@ -4743,7 +5444,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi -@@ -2190,16 +2090,16 @@ if test -r "$cache_file"; then +@@ -2240,16 +2137,16 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then @@ -4764,7 +5465,7 @@ Index: gtk+-2.12.12/configure >$cache_file fi -@@ -2213,38 +2113,29 @@ for ac_var in $ac_precious_vars; do +@@ -2263,38 +2160,29 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -4815,10 +5516,12 @@ Index: gtk+-2.12.12/configure *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in -@@ -2254,10 +2145,10 @@ $as_echo "$as_me: current value: \`$ac +@@ -2304,12 +2192,10 @@ $as_echo "$as_me: current value: \`$ac fi done if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 @@ -4830,7 +5533,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi -@@ -2298,7 +2189,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -2350,7 +2236,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -4840,7 +5543,7 @@ Index: gtk+-2.12.12/configure ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then -@@ -2316,8 +2208,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s +@@ -2368,8 +2255,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s fi done if test -z "$ac_aux_dir"; then @@ -4851,7 +5554,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi -@@ -2343,12 +2235,11 @@ ac_configure="$SHELL $ac_aux_dir/configu +@@ -2395,12 +2282,11 @@ ac_configure="$SHELL $ac_aux_dir/configu # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -4867,7 +5570,7 @@ Index: gtk+-2.12.12/configure else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -2377,29 +2268,17 @@ case $as_dir/ in +@@ -2429,29 +2315,17 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else @@ -4899,7 +5602,7 @@ Index: gtk+-2.12.12/configure fi if test "${ac_cv_path_install+set}" = set; then -@@ -2412,8 +2291,8 @@ fi +@@ -2464,8 +2338,8 @@ fi INSTALL=$ac_install_sh fi fi @@ -4910,7 +5613,7 @@ Index: gtk+-2.12.12/configure # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -2423,8 +2302,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR +@@ -2475,8 +2349,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -4921,7 +5624,7 @@ Index: gtk+-2.12.12/configure # Just in case sleep 1 echo timestamp > conftest.file -@@ -2447,9 +2326,9 @@ if ( +@@ -2499,9 +2373,9 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -4933,7 +5636,7 @@ Index: gtk+-2.12.12/configure alias in your environment" >&2;} { (exit 1); exit 1; }; } fi -@@ -2460,24 +2339,26 @@ then +@@ -2512,24 +2386,26 @@ then # Ok. : else @@ -4968,7 +5671,7 @@ Index: gtk+-2.12.12/configure # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -2488,18 +2369,66 @@ if eval "$MISSING --run true"; then +@@ -2540,18 +2416,66 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= @@ -4976,8 +5679,8 @@ Index: gtk+-2.12.12/configure -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+fi -+ + fi + +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then @@ -5016,7 +5719,7 @@ Index: gtk+-2.12.12/configure + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi - fi ++fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + @@ -5025,7 +5728,7 @@ Index: gtk+-2.12.12/configure + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac - ++ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -5040,7 +5743,7 @@ Index: gtk+-2.12.12/configure else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2512,7 +2441,7 @@ do +@@ -2564,7 +2488,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" @@ -5049,7 +5752,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -2523,23 +2452,22 @@ fi +@@ -2575,23 +2499,22 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -5081,7 +5784,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.make <<\_ACEOF SHELL = /bin/sh -@@ -2556,12 +2484,12 @@ esac +@@ -2608,12 +2531,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -5098,7 +5801,7 @@ Index: gtk+-2.12.12/configure SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2574,12 +2502,16 @@ else +@@ -2626,12 +2549,16 @@ else fi rmdir .tst 2>/dev/null @@ -5120,7 +5823,7 @@ Index: gtk+-2.12.12/configure fi # test whether we have cygpath -@@ -2613,10 +2545,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru +@@ -2665,10 +2592,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} @@ -5132,7 +5835,7 @@ Index: gtk+-2.12.12/configure # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right -@@ -2626,10 +2555,10 @@ if test "$cross_compiling" != no; then +@@ -2678,10 +2602,10 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -5146,7 +5849,7 @@ Index: gtk+-2.12.12/configure else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2642,7 +2571,7 @@ do +@@ -2694,7 +2618,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" @@ -5155,7 +5858,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -2653,11 +2582,11 @@ fi +@@ -2705,11 +2629,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -5171,7 +5874,7 @@ Index: gtk+-2.12.12/configure fi -@@ -2666,10 +2595,10 @@ if test -z "$ac_cv_prog_STRIP"; then +@@ -2718,10 +2642,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -5185,7 +5888,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2682,7 +2611,7 @@ do +@@ -2734,7 +2658,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" @@ -5194,7 +5897,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -2693,11 +2622,11 @@ fi +@@ -2745,11 +2669,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -5210,20 +5913,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_STRIP" = x; then -@@ -2705,10 +2634,10 @@ fi +@@ -2757,8 +2681,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -2720,10 +2649,17 @@ else + esac + STRIP=$ac_ct_STRIP +@@ -2768,10 +2696,17 @@ else fi fi @@ -5242,7 +5947,7 @@ Index: gtk+-2.12.12/configure -@@ -2797,34 +2733,34 @@ _ACEOF +@@ -2855,34 +2790,34 @@ _ACEOF # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -5290,7 +5995,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; };; esac build=$ac_cv_build -@@ -2841,27 +2777,27 @@ IFS=$ac_save_IFS +@@ -2899,27 +2834,27 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -5327,7 +6032,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; };; esac host=$ac_cv_host -@@ -2880,8 +2816,8 @@ case $host_os in *\ *) host_os=`echo "$h +@@ -2938,8 +2873,8 @@ case $host_os in *\ *) host_os=`echo "$h MATH_LIB=-lm @@ -5335,10 +6040,10 @@ Index: gtk+-2.12.12/configure -$as_echo_n "checking for native Win32... " >&6; } +{ echo "$as_me:$LINENO: checking for native Win32" >&5 +echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } + LIB_EXE_MACHINE_FLAG=X86 case "$host" in *-*-mingw*) - os_win32=yes -@@ -2891,8 +2827,8 @@ case "$host" in +@@ -2956,8 +2891,8 @@ case "$host" in os_win32=no ;; esac @@ -5347,9 +6052,9 @@ Index: gtk+-2.12.12/configure +{ echo "$as_me:$LINENO: result: $os_win32" >&5 +echo "${ECHO_T}$os_win32" >&6; } - case $host in - *-*-linux*) -@@ -2907,10 +2843,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +@@ -2975,10 +2910,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -5363,7 +6068,7 @@ Index: gtk+-2.12.12/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2923,7 +2859,7 @@ do +@@ -2991,7 +2926,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" @@ -5372,7 +6077,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -2934,11 +2870,11 @@ fi +@@ -3002,11 +2937,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5388,7 +6093,7 @@ Index: gtk+-2.12.12/configure fi -@@ -2947,10 +2883,10 @@ if test -z "$ac_cv_prog_CC"; then +@@ -3015,10 +2950,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -5402,7 +6107,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2963,7 +2899,7 @@ do +@@ -3031,7 +2966,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" @@ -5411,7 +6116,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -2974,11 +2910,11 @@ fi +@@ -3042,11 +2977,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -5427,20 +6132,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_CC" = x; then -@@ -2986,10 +2922,10 @@ fi +@@ -3054,8 +2989,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -3004,10 +2940,10 @@ if test -z "$CC"; then + esac + CC=$ac_ct_CC +@@ -3068,10 +3007,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -5454,7 +6161,7 @@ Index: gtk+-2.12.12/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3020,7 +2956,7 @@ do +@@ -3084,7 +3023,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" @@ -5463,7 +6170,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -3031,11 +2967,11 @@ fi +@@ -3095,11 +3034,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5479,7 +6186,7 @@ Index: gtk+-2.12.12/configure fi -@@ -3044,10 +2980,10 @@ fi +@@ -3108,10 +3047,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -5493,7 +6200,7 @@ Index: gtk+-2.12.12/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3065,7 +3001,7 @@ do +@@ -3129,7 +3068,7 @@ do continue fi ac_cv_prog_CC="cc" @@ -5502,7 +6209,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -3088,11 +3024,11 @@ fi +@@ -3152,11 +3091,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5518,7 +6225,7 @@ Index: gtk+-2.12.12/configure fi -@@ -3103,10 +3039,10 @@ if test -z "$CC"; then +@@ -3167,10 +3106,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -5532,7 +6239,7 @@ Index: gtk+-2.12.12/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3119,7 +3055,7 @@ do +@@ -3183,7 +3122,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" @@ -5541,7 +6248,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -3130,11 +3066,11 @@ fi +@@ -3194,11 +3133,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -5557,7 +6264,7 @@ Index: gtk+-2.12.12/configure fi -@@ -3147,10 +3083,10 @@ if test -z "$CC"; then +@@ -3211,10 +3150,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5571,7 +6278,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3163,7 +3099,7 @@ do +@@ -3227,7 +3166,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" @@ -5580,7 +6287,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -3174,11 +3110,11 @@ fi +@@ -3238,11 +3177,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -5596,30 +6303,35 @@ Index: gtk+-2.12.12/configure fi -@@ -3190,10 +3126,10 @@ done +@@ -3254,8 +3193,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -3205,48 +3141,44 @@ fi + esac + CC=$ac_ct_CC +@@ -3265,50 +3208,44 @@ fi fi --test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 @@ -5668,7 +6380,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -@@ -3265,22 +3197,27 @@ main () +@@ -3327,22 +3264,27 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files @@ -5705,7 +6417,7 @@ Index: gtk+-2.12.12/configure * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done -@@ -3291,11 +3228,10 @@ case "(($ac_try" in +@@ -3353,11 +3295,10 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -5719,7 +6431,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -3306,7 +3242,7 @@ for ac_file in $ac_files '' +@@ -3368,7 +3309,7 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -5728,7 +6440,7 @@ Index: gtk+-2.12.12/configure ;; [ab].out ) # We found the default executable, but exeext='' is most -@@ -3333,15 +3269,15 @@ else +@@ -3395,27 +3336,25 @@ else ac_file='' fi @@ -5741,15 +6453,19 @@ Index: gtk+-2.12.12/configure + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables +echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +- { (exit 77); exit 77; }; }; } ++ { (exit 77); exit 77; }; } fi -@@ -3350,8 +3286,8 @@ ac_exeext=$ac_cv_exeext + + ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -5760,7 +6476,7 @@ Index: gtk+-2.12.12/configure # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then -@@ -3360,51 +3296,49 @@ if test "$cross_compiling" != yes; then +@@ -3424,53 +3363,49 @@ if test "$cross_compiling" != yes; then *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -5777,7 +6493,9 @@ Index: gtk+-2.12.12/configure if test "$cross_compiling" = maybe; then cross_compiling=yes else -- { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 @@ -5785,7 +6503,8 @@ Index: gtk+-2.12.12/configure +echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } fi fi fi @@ -5827,7 +6546,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3413,31 +3347,31 @@ $as_echo "$ac_try_echo") >&5 +@@ -3479,33 +3414,31 @@ $as_echo "$ac_try_echo") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -5839,13 +6558,16 @@ Index: gtk+-2.12.12/configure esac done else -- { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext @@ -5867,7 +6589,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -3460,41 +3394,40 @@ case "(($ac_try" in +@@ -3528,43 +3461,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -5893,13 +6615,16 @@ Index: gtk+-2.12.12/configure + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext @@ -5920,7 +6645,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -3520,21 +3453,20 @@ case "(($ac_try" in +@@ -3590,21 +3520,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -5945,7 +6670,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -3544,19 +3476,15 @@ rm -f core conftest.err conftest.$ac_obj +@@ -3614,19 +3543,15 @@ rm -f core conftest.err conftest.$ac_obj ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -5971,7 +6696,7 @@ Index: gtk+-2.12.12/configure else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -3583,21 +3511,20 @@ case "(($ac_try" in +@@ -3653,21 +3578,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -5996,7 +6721,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" -@@ -3622,21 +3549,20 @@ case "(($ac_try" in +@@ -3692,21 +3616,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6021,7 +6746,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3662,21 +3588,20 @@ case "(($ac_try" in +@@ -3732,21 +3655,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6046,7 +6771,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3691,8 +3616,8 @@ fi +@@ -3761,8 +3683,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi @@ -6057,7 +6782,7 @@ Index: gtk+-2.12.12/configure if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then -@@ -3708,10 +3633,10 @@ else +@@ -3778,10 +3700,10 @@ else CFLAGS= fi fi @@ -6071,7 +6796,7 @@ Index: gtk+-2.12.12/configure else ac_cv_prog_cc_c89=no ac_save_CC=$CC -@@ -3782,21 +3707,20 @@ case "(($ac_try" in +@@ -3852,21 +3774,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6096,7 +6821,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3812,15 +3736,15 @@ fi +@@ -3882,15 +3803,15 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -6118,7 +6843,7 @@ Index: gtk+-2.12.12/configure esac -@@ -3841,8 +3765,8 @@ am__doit: +@@ -3911,8 +3832,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -6129,7 +6854,7 @@ Index: gtk+-2.12.12/configure am__include="#" am__quote= _am_result=none -@@ -3869,8 +3793,8 @@ if test "$am__include" = "#"; then +@@ -3939,8 +3860,8 @@ if test "$am__include" = "#"; then fi @@ -6140,7 +6865,7 @@ Index: gtk+-2.12.12/configure rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -@@ -3882,9 +3806,7 @@ if test "x$enable_dependency_tracking" ! +@@ -3952,9 +3873,7 @@ if test "x$enable_dependency_tracking" ! am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi @@ -6151,7 +6876,7 @@ Index: gtk+-2.12.12/configure AMDEP_TRUE= AMDEP_FALSE='#' else -@@ -3894,13 +3816,12 @@ fi +@@ -3964,13 +3883,12 @@ fi @@ -6168,7 +6893,7 @@ Index: gtk+-2.12.12/configure else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up -@@ -3936,7 +3857,9 @@ else +@@ -4006,7 +3924,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -6179,7 +6904,7 @@ Index: gtk+-2.12.12/configure done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -3960,13 +3883,19 @@ else +@@ -4030,13 +3950,19 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && @@ -6202,7 +6927,7 @@ Index: gtk+-2.12.12/configure am_cv_CC_dependencies_compiler_type=$depmode break fi -@@ -3980,13 +3909,11 @@ else +@@ -4050,13 +3976,11 @@ else fi fi @@ -6219,7 +6944,7 @@ Index: gtk+-2.12.12/configure test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= -@@ -4022,15 +3949,23 @@ fi +@@ -4092,16 +4016,24 @@ fi @@ -6232,46 +6957,8 @@ Index: gtk+-2.12.12/configure +fi + - for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4043,7 +3978,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4054,11 +3989,11 @@ fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4088,10 +4023,10 @@ if test -z "$CXX"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -6285,7 +6972,7 @@ Index: gtk+-2.12.12/configure else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4104,7 +4039,7 @@ do +@@ -4114,7 +4046,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" @@ -6294,7 +6981,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -4115,11 +4050,11 @@ fi +@@ -4125,11 +4057,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -6310,7 +6997,7 @@ Index: gtk+-2.12.12/configure fi -@@ -4132,10 +4067,10 @@ if test -z "$CXX"; then +@@ -4142,10 +4074,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6324,7 +7011,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4148,7 +4083,7 @@ do +@@ -4158,7 +4090,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" @@ -6333,7 +7020,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -4159,11 +4094,11 @@ fi +@@ -4169,11 +4101,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -6349,20 +7036,115 @@ Index: gtk+-2.12.12/configure fi -@@ -4175,10 +4110,10 @@ done +@@ -4185,8 +4117,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -4190,47 +4125,43 @@ fi + esac + CXX=$ac_ct_CXX +@@ -4215,10 +4151,10 @@ if test -z "$CXX"; then + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4231,7 +4167,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4242,11 +4178,11 @@ fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4259,10 +4195,10 @@ if test -z "$CXX"; then + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4275,7 +4211,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4286,11 +4222,11 @@ fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4302,8 +4238,12 @@ done + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +@@ -4313,47 +4253,43 @@ fi fi fi # Provide some information about the compiler. @@ -6421,7 +7203,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -4256,21 +4187,20 @@ case "(($ac_try" in +@@ -4379,21 +4315,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6446,7 +7228,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -4280,19 +4210,15 @@ rm -f core conftest.err conftest.$ac_obj +@@ -4403,19 +4338,15 @@ rm -f core conftest.err conftest.$ac_obj ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -6472,7 +7254,7 @@ Index: gtk+-2.12.12/configure else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes -@@ -4319,21 +4245,20 @@ case "(($ac_try" in +@@ -4442,21 +4373,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6497,7 +7279,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" -@@ -4358,21 +4283,20 @@ case "(($ac_try" in +@@ -4481,21 +4411,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6522,7 +7304,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag -@@ -4398,21 +4322,20 @@ case "(($ac_try" in +@@ -4521,21 +4450,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6547,7 +7329,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -4427,8 +4350,8 @@ fi +@@ -4550,8 +4478,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi @@ -6558,7 +7340,7 @@ Index: gtk+-2.12.12/configure if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then -@@ -4452,10 +4375,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -4575,10 +4503,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= @@ -6572,7 +7354,7 @@ Index: gtk+-2.12.12/configure else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up -@@ -4491,7 +4414,9 @@ else +@@ -4614,7 +4542,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -6583,7 +7365,7 @@ Index: gtk+-2.12.12/configure done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4515,13 +4440,19 @@ else +@@ -4638,13 +4568,19 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && @@ -6606,7 +7388,7 @@ Index: gtk+-2.12.12/configure am_cv_CXX_dependencies_compiler_type=$depmode break fi -@@ -4535,13 +4466,11 @@ else +@@ -4658,13 +4594,11 @@ else fi fi @@ -6623,7 +7405,7 @@ Index: gtk+-2.12.12/configure test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= -@@ -4574,30 +4503,27 @@ case "(($ac_try" in +@@ -4697,30 +4631,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6658,7 +7440,7 @@ Index: gtk+-2.12.12/configure HAVE_CXX_TRUE= HAVE_CXX_FALSE='#' else -@@ -4629,30 +4555,27 @@ case "(($ac_try" in +@@ -4752,30 +4683,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6688,12 +7470,12 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - --if test "$OBJC" == "yes"; then -+ if test "$OBJC" == "yes"; then +-if test "$OBJC" = "yes"; then ++ if test "$OBJC" = "yes"; then HAVE_OBJC_TRUE= HAVE_OBJC_FALSE='#' else -@@ -4670,13 +4593,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -4793,13 +4721,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -6711,7 +7493,7 @@ Index: gtk+-2.12.12/configure fi enable_shared=yes fi -@@ -4731,10 +4654,10 @@ else +@@ -4854,10 +4782,10 @@ else fi @@ -6725,7 +7507,7 @@ Index: gtk+-2.12.12/configure else # Loop through the user's path and test for sed and gsed. # Then use that list of sed's as ones to test for truncation. -@@ -4787,40 +4710,45 @@ fi +@@ -4910,40 +4838,45 @@ fi SED=$lt_cv_path_SED @@ -6738,14 +7520,14 @@ Index: gtk+-2.12.12/configure -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } - if test "${ac_cv_path_GREP+set}" = set; then -- $as_echo_n "(cached) " >&6 ++if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then + if test "${ac_cv_path_GREP+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$GREP"; then @@ -6785,7 +7567,7 @@ Index: gtk+-2.12.12/configure "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` -@@ -4835,60 +4763,74 @@ case `"$ac_path_GREP" --version 2>&1` in +@@ -4958,60 +4891,74 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac @@ -6880,7 +7662,7 @@ Index: gtk+-2.12.12/configure "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` -@@ -4903,24 +4845,33 @@ case `"$ac_path_EGREP" --version 2>&1` i +@@ -5026,24 +4973,33 @@ case `"$ac_path_EGREP" --version 2>&1` i rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac @@ -6922,7 +7704,7 @@ Index: gtk+-2.12.12/configure EGREP="$ac_cv_path_EGREP" -@@ -4935,8 +4886,8 @@ fi +@@ -5058,8 +5014,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -6933,7 +7715,7 @@ Index: gtk+-2.12.12/configure case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -4965,14 +4916,14 @@ $as_echo_n "checking for ld used by $CC. +@@ -5088,14 +5044,14 @@ $as_echo_n "checking for ld used by $CC. ;; esac elif test "$with_gnu_ld" = yes; then @@ -6953,7 +7735,7 @@ Index: gtk+-2.12.12/configure else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -5002,19 +4953,19 @@ fi +@@ -5125,19 +5081,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -6982,7 +7764,7 @@ Index: gtk+-2.12.12/configure else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in -@@ -5026,20 +4977,20 @@ case `$LD -v 2>&1 </dev/null` in +@@ -5149,20 +5105,20 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi @@ -7010,7 +7792,7 @@ Index: gtk+-2.12.12/configure reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; -@@ -5056,10 +5007,10 @@ case $host_os in +@@ -5179,10 +5135,10 @@ case $host_os in ;; esac @@ -7024,7 +7806,7 @@ Index: gtk+-2.12.12/configure else if test -n "$NM"; then # Let the user override the test. -@@ -5105,25 +5056,25 @@ else +@@ -5228,25 +5184,25 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi @@ -7061,7 +7843,7 @@ Index: gtk+-2.12.12/configure else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= -@@ -5235,7 +5186,7 @@ linux* | k*bsd*-gnu) +@@ -5358,7 +5314,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7070,7 +7852,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -5306,8 +5257,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* +@@ -5429,8 +5385,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* esac fi @@ -7081,7 +7863,7 @@ Index: gtk+-2.12.12/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5341,7 +5292,7 @@ ia64-*-hpux*) +@@ -5464,7 +5420,7 @@ ia64-*-hpux*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7090,12 +7872,12 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) -@@ -5356,11 +5307,11 @@ ia64-*-hpux*) +@@ -5479,11 +5435,11 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 5359 "configure"' > conftest.$ac_ext -+ echo '#line 5310 "configure"' > conftest.$ac_ext +- echo '#line 5482 "configure"' > conftest.$ac_ext ++ echo '#line 5438 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7104,7 +7886,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in -@@ -5398,7 +5349,7 @@ s390*-*linux*|sparc*-*linux*) +@@ -5521,7 +5477,7 @@ s390*-*linux*|sparc*-*linux*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7113,7 +7895,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *32-bit*) -@@ -5421,7 +5372,6 @@ s390*-*linux*|sparc*-*linux*) +@@ -5544,7 +5500,6 @@ s390*-*linux*|sparc*-*linux*) esac ;; *64-bit*) @@ -7121,7 +7903,7 @@ Index: gtk+-2.12.12/configure case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -5449,10 +5399,10 @@ s390*-*linux*|sparc*-*linux*) +@@ -5572,10 +5527,10 @@ s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -7135,7 +7917,7 @@ Index: gtk+-2.12.12/configure else ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5481,30 +5431,26 @@ case "(($ac_try" in +@@ -5604,30 +5559,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7171,7 +7953,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c -@@ -5514,8 +5460,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA +@@ -5637,8 +5588,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -7182,7 +7964,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" -@@ -5527,7 +5473,7 @@ sparc*-*solaris*) +@@ -5650,7 +5601,7 @@ sparc*-*solaris*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7191,7 +7973,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *64-bit*) -@@ -5549,10 +5495,10 @@ sparc*-*solaris*) +@@ -5672,10 +5623,10 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 @@ -7205,7 +7987,7 @@ Index: gtk+-2.12.12/configure else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -@@ -5565,7 +5511,7 @@ do +@@ -5688,7 +5639,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" @@ -7214,7 +7996,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -5576,11 +5522,11 @@ fi +@@ -5699,11 +5650,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then @@ -7230,7 +8012,7 @@ Index: gtk+-2.12.12/configure fi -@@ -5589,10 +5535,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then +@@ -5712,10 +5663,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 @@ -7244,7 +8026,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -@@ -5605,7 +5551,7 @@ do +@@ -5728,7 +5679,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" @@ -7253,7 +8035,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -5616,11 +5562,11 @@ fi +@@ -5739,11 +5690,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then @@ -7269,20 +8051,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_DLLTOOL" = x; then -@@ -5628,10 +5574,10 @@ fi +@@ -5751,8 +5702,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -5645,10 +5591,10 @@ fi + esac + DLLTOOL=$ac_ct_DLLTOOL +@@ -5764,10 +5719,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -7296,7 +8080,7 @@ Index: gtk+-2.12.12/configure else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. -@@ -5661,7 +5607,7 @@ do +@@ -5780,7 +5735,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" @@ -7305,7 +8089,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -5672,11 +5618,11 @@ fi +@@ -5791,11 +5746,11 @@ fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then @@ -7321,7 +8105,7 @@ Index: gtk+-2.12.12/configure fi -@@ -5685,10 +5631,10 @@ if test -z "$ac_cv_prog_AS"; then +@@ -5804,10 +5759,10 @@ if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 @@ -7335,7 +8119,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -@@ -5701,7 +5647,7 @@ do +@@ -5820,7 +5775,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" @@ -7344,7 +8128,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -5712,11 +5658,11 @@ fi +@@ -5831,11 +5786,11 @@ fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then @@ -7360,20 +8144,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_AS" = x; then -@@ -5724,10 +5670,10 @@ fi +@@ -5843,8 +5798,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -5741,10 +5687,10 @@ fi + esac + AS=$ac_ct_AS +@@ -5856,10 +5815,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -7387,7 +8173,7 @@ Index: gtk+-2.12.12/configure else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -@@ -5757,7 +5703,7 @@ do +@@ -5872,7 +5831,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" @@ -7396,7 +8182,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -5768,11 +5714,11 @@ fi +@@ -5883,11 +5842,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then @@ -7412,7 +8198,7 @@ Index: gtk+-2.12.12/configure fi -@@ -5781,10 +5727,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then +@@ -5896,10 +5855,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -7426,7 +8212,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -@@ -5797,7 +5743,7 @@ do +@@ -5912,7 +5871,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" @@ -7435,7 +8221,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -5808,11 +5754,11 @@ fi +@@ -5923,11 +5882,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then @@ -7451,20 +8237,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_OBJDUMP" = x; then -@@ -5820,10 +5766,10 @@ fi +@@ -5935,8 +5894,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -5846,15 +5792,15 @@ ac_cpp='$CPP $CPPFLAGS' + esac + OBJDUMP=$ac_ct_OBJDUMP +@@ -5957,15 +5920,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -7483,7 +8271,7 @@ Index: gtk+-2.12.12/configure else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -5886,21 +5832,20 @@ case "(($ac_try" in +@@ -5997,21 +5960,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7508,7 +8296,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -5924,14 +5869,13 @@ case "(($ac_try" in +@@ -6035,14 +5997,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7525,7 +8313,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -5939,7 +5883,7 @@ $as_echo "$ac_try_echo") >&5 +@@ -6050,7 +6011,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -7534,7 +8322,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -5964,8 +5908,8 @@ fi +@@ -6075,8 +6036,8 @@ fi else ac_cv_prog_CPP=$CPP fi @@ -7545,7 +8333,7 @@ Index: gtk+-2.12.12/configure ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do -@@ -5993,21 +5937,20 @@ case "(($ac_try" in +@@ -6104,21 +6065,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7570,7 +8358,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6031,14 +5974,13 @@ case "(($ac_try" in +@@ -6142,14 +6102,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7587,7 +8375,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -6046,7 +5988,7 @@ $as_echo "$ac_try_echo") >&5 +@@ -6157,7 +6116,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -7596,19 +8384,24 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6062,9 +6004,9 @@ rm -f conftest.err conftest.$ac_ext +@@ -6173,13 +6132,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else -- { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } fi -@@ -6076,10 +6018,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + + ac_ext=c +@@ -6189,10 +6146,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -7622,7 +8415,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -6106,21 +6048,20 @@ case "(($ac_try" in +@@ -6219,21 +6176,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7647,7 +8440,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no -@@ -6212,40 +6153,37 @@ case "(($ac_try" in +@@ -6325,40 +6281,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7696,7 +8489,7 @@ Index: gtk+-2.12.12/configure if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -6267,11 +6205,11 @@ fi +@@ -6380,11 +6333,11 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do @@ -7712,7 +8505,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -6289,21 +6227,20 @@ case "(($ac_try" in +@@ -6402,21 +6355,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7737,7 +8530,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" -@@ -6311,14 +6248,12 @@ fi +@@ -6424,15 +6376,12 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -7745,8 +8538,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -7757,7 +8551,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -6329,21 +6264,20 @@ done +@@ -6443,21 +6392,20 @@ done for ac_header in dlfcn.h do @@ -7788,7 +8582,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -6359,33 +6293,32 @@ case "(($ac_try" in +@@ -6473,33 +6421,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7829,7 +8623,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -6399,52 +6332,51 @@ case "(($ac_try" in +@@ -6513,52 +6460,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7903,7 +8697,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -6453,23 +6385,21 @@ _ASBOX +@@ -6567,24 +6513,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -7926,8 +8720,9 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -7935,7 +8730,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -6486,11 +6416,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' +@@ -6601,11 +6544,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -7950,7 +8745,7 @@ Index: gtk+-2.12.12/configure else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" -@@ -6522,21 +6452,20 @@ case "(($ac_try" in +@@ -6637,21 +6580,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7975,7 +8770,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6560,14 +6489,13 @@ case "(($ac_try" in +@@ -6675,14 +6617,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7992,7 +8787,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err -@@ -6575,7 +6503,7 @@ $as_echo "$ac_try_echo") >&5 +@@ -6690,7 +6631,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -8001,7 +8796,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6600,8 +6528,8 @@ fi +@@ -6715,8 +6656,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi @@ -8012,7 +8807,7 @@ Index: gtk+-2.12.12/configure ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do -@@ -6629,21 +6557,20 @@ case "(($ac_try" in +@@ -6744,21 +6685,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8037,7 +8832,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6667,14 +6594,13 @@ case "(($ac_try" in +@@ -6782,14 +6722,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8054,7 +8849,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err -@@ -6682,7 +6608,7 @@ $as_echo "$ac_try_echo") >&5 +@@ -6797,7 +6736,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -8063,19 +8858,24 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6698,9 +6624,9 @@ rm -f conftest.err conftest.$ac_ext +@@ -6813,13 +6752,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else -- { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } fi -@@ -6722,10 +6648,10 @@ if test -n "$ac_tool_prefix"; then + + ac_ext=cpp +@@ -6839,10 +6776,10 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -8089,7 +8889,7 @@ Index: gtk+-2.12.12/configure else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. -@@ -6738,7 +6664,7 @@ do +@@ -6855,7 +6792,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" @@ -8098,7 +8898,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -6749,11 +6675,11 @@ fi +@@ -6866,11 +6803,11 @@ fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then @@ -8114,7 +8914,7 @@ Index: gtk+-2.12.12/configure fi -@@ -6766,10 +6692,10 @@ if test -z "$F77"; then +@@ -6883,10 +6820,10 @@ if test -z "$F77"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8128,7 +8928,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -@@ -6782,7 +6708,7 @@ do +@@ -6899,7 +6836,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" @@ -8137,7 +8937,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -6793,11 +6719,11 @@ fi +@@ -6910,11 +6847,11 @@ fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then @@ -8153,20 +8953,22 @@ Index: gtk+-2.12.12/configure fi -@@ -6809,10 +6735,10 @@ done +@@ -6926,8 +6863,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -6823,41 +6749,37 @@ fi + esac + F77=$ac_ct_F77 +@@ -6936,41 +6877,37 @@ fi # Provide some information about the compiler. @@ -8216,7 +9018,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } rm -f a.out -@@ -6865,10 +6787,10 @@ rm -f a.out +@@ -6978,10 +6915,10 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F @@ -8230,7 +9032,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF program main -@@ -6884,21 +6806,20 @@ case "(($ac_try" in +@@ -6997,21 +6934,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8255,7 +9057,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -6908,16 +6829,16 @@ rm -f core conftest.err conftest.$ac_obj +@@ -7021,16 +6957,16 @@ rm -f core conftest.err conftest.$ac_obj ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi @@ -8277,7 +9079,7 @@ Index: gtk+-2.12.12/configure else FFLAGS=-g cat >conftest.$ac_ext <<_ACEOF -@@ -6931,21 +6852,20 @@ case "(($ac_try" in +@@ -7044,21 +6980,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8302,7 +9104,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_f77_g=no -@@ -6954,8 +6874,8 @@ fi +@@ -7067,8 +7002,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -8313,7 +9115,7 @@ Index: gtk+-2.12.12/configure if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then -@@ -6972,11 +6892,7 @@ else +@@ -7085,11 +7020,7 @@ else fi fi @@ -8326,7 +9128,7 @@ Index: gtk+-2.12.12/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -6987,10 +6903,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -7100,10 +7031,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments @@ -8340,7 +9142,7 @@ Index: gtk+-2.12.12/configure else i=0 teststring="ABCD" -@@ -7099,11 +7015,11 @@ else +@@ -7212,11 +7143,11 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -8356,7 +9158,7 @@ Index: gtk+-2.12.12/configure fi -@@ -7111,10 +7027,10 @@ fi +@@ -7224,10 +7155,10 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -8370,7 +9172,7 @@ Index: gtk+-2.12.12/configure else # These are sane defaults that work on at least a few old systems. -@@ -7219,14 +7135,14 @@ EOF +@@ -7332,14 +7263,14 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8387,7 +9189,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then -@@ -7281,7 +7197,7 @@ EOF +@@ -7394,7 +7325,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? @@ -8396,7 +9198,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } && test -s conftest${ac_exeext}; then pipe_works=yes fi -@@ -7316,17 +7232,17 @@ if test -z "$lt_cv_sys_global_symbol_pip +@@ -7429,17 +7360,17 @@ if test -z "$lt_cv_sys_global_symbol_pip lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -8421,7 +9223,7 @@ Index: gtk+-2.12.12/configure else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null -@@ -7338,8 +7254,8 @@ else +@@ -7451,8 +7382,8 @@ else fi rmdir .libs 2>/dev/null fi @@ -8432,7 +9234,7 @@ Index: gtk+-2.12.12/configure objdir=$lt_cv_objdir -@@ -7390,10 +7306,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" +@@ -7503,10 +7434,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -8446,7 +9248,7 @@ Index: gtk+-2.12.12/configure else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -7406,7 +7322,7 @@ do +@@ -7519,7 +7450,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" @@ -8455,7 +9257,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7417,11 +7333,11 @@ fi +@@ -7530,11 +7461,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then @@ -8471,7 +9273,7 @@ Index: gtk+-2.12.12/configure fi -@@ -7430,10 +7346,10 @@ if test -z "$ac_cv_prog_AR"; then +@@ -7543,10 +7474,10 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -8485,7 +9287,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -@@ -7446,7 +7362,7 @@ do +@@ -7559,7 +7490,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" @@ -8494,7 +9296,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7457,11 +7373,11 @@ fi +@@ -7570,11 +7501,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then @@ -8510,20 +9312,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_AR" = x; then -@@ -7469,10 +7385,10 @@ fi +@@ -7582,8 +7513,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -7486,10 +7402,10 @@ fi + esac + AR=$ac_ct_AR +@@ -7595,10 +7530,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -8537,7 +9341,7 @@ Index: gtk+-2.12.12/configure else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -7502,7 +7418,7 @@ do +@@ -7611,7 +7546,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" @@ -8546,7 +9350,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7513,11 +7429,11 @@ fi +@@ -7622,11 +7557,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -8562,7 +9366,7 @@ Index: gtk+-2.12.12/configure fi -@@ -7526,10 +7442,10 @@ if test -z "$ac_cv_prog_RANLIB"; then +@@ -7635,10 +7570,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -8576,7 +9380,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -7542,7 +7458,7 @@ do +@@ -7651,7 +7586,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" @@ -8585,7 +9389,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7553,11 +7469,11 @@ fi +@@ -7662,11 +7597,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -8601,20 +9405,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_RANLIB" = x; then -@@ -7565,10 +7481,10 @@ fi +@@ -7674,8 +7609,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -7582,10 +7498,10 @@ fi + esac + RANLIB=$ac_ct_RANLIB +@@ -7687,10 +7626,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -8628,7 +9434,7 @@ Index: gtk+-2.12.12/configure else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -7598,7 +7514,7 @@ do +@@ -7703,7 +7642,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" @@ -8637,7 +9443,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7609,11 +7525,11 @@ fi +@@ -7714,11 +7653,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -8653,7 +9459,7 @@ Index: gtk+-2.12.12/configure fi -@@ -7622,10 +7538,10 @@ if test -z "$ac_cv_prog_STRIP"; then +@@ -7727,10 +7666,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -8667,7 +9473,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -7638,7 +7554,7 @@ do +@@ -7743,7 +7682,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" @@ -8676,7 +9482,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7649,11 +7565,11 @@ fi +@@ -7754,11 +7693,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -8692,20 +9498,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_STRIP" = x; then -@@ -7661,10 +7577,10 @@ fi +@@ -7766,8 +7705,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -7729,10 +7645,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + esac + STRIP=$ac_ct_STRIP +@@ -7830,10 +7773,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -8719,7 +9527,7 @@ Index: gtk+-2.12.12/configure else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) -@@ -7782,19 +7698,19 @@ fi +@@ -7883,19 +7826,19 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -8746,7 +9554,7 @@ Index: gtk+-2.12.12/configure else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) -@@ -7844,11 +7760,11 @@ fi +@@ -7945,11 +7888,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -8762,7 +9570,7 @@ Index: gtk+-2.12.12/configure fi else -@@ -7866,10 +7782,10 @@ esac +@@ -7967,10 +7910,10 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -8776,7 +9584,7 @@ Index: gtk+-2.12.12/configure else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -@@ -7882,7 +7798,7 @@ do +@@ -7983,7 +7926,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" @@ -8785,7 +9593,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7893,11 +7809,11 @@ fi +@@ -7994,11 +7937,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then @@ -8801,7 +9609,7 @@ Index: gtk+-2.12.12/configure fi -@@ -7906,10 +7822,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then +@@ -8007,10 +7950,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -8815,7 +9623,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -@@ -7922,7 +7838,7 @@ do +@@ -8023,7 +7966,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" @@ -8824,7 +9632,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7933,11 +7849,11 @@ fi +@@ -8034,11 +7977,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then @@ -8840,20 +9648,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_DSYMUTIL" = x; then -@@ -7945,10 +7861,10 @@ fi +@@ -8046,8 +7989,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -7962,10 +7878,10 @@ fi + esac + DSYMUTIL=$ac_ct_DSYMUTIL +@@ -8059,10 +8006,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -8867,7 +9677,7 @@ Index: gtk+-2.12.12/configure else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -@@ -7978,7 +7894,7 @@ do +@@ -8075,7 +8022,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" @@ -8876,7 +9686,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -7989,11 +7905,11 @@ fi +@@ -8086,11 +8033,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then @@ -8892,7 +9702,7 @@ Index: gtk+-2.12.12/configure fi -@@ -8002,10 +7918,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then +@@ -8099,10 +8046,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -8906,7 +9716,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -@@ -8018,7 +7934,7 @@ do +@@ -8115,7 +8062,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" @@ -8915,7 +9725,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -8029,11 +7945,11 @@ fi +@@ -8126,11 +8073,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then @@ -8931,20 +9741,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_NMEDIT" = x; then -@@ -8041,10 +7957,10 @@ fi +@@ -8138,8 +8085,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -8056,10 +7972,10 @@ else + esac + NMEDIT=$ac_ct_NMEDIT +@@ -8149,10 +8100,10 @@ else fi @@ -8958,7 +9770,7 @@ Index: gtk+-2.12.12/configure else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then -@@ -8077,12 +7993,12 @@ else +@@ -8170,12 +8121,12 @@ else rm conftest.c fi fi @@ -8976,7 +9788,7 @@ Index: gtk+-2.12.12/configure else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS -@@ -8109,37 +8025,33 @@ case "(($ac_try" in +@@ -8202,37 +8153,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9021,7 +9833,7 @@ Index: gtk+-2.12.12/configure case $host_os in rhapsody* | darwin1.[0123]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -8251,10 +8163,10 @@ if test "$GCC" = yes; then +@@ -8344,10 +8291,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -9035,21 +9847,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext -@@ -8269,11 +8181,11 @@ else +@@ -8362,11 +8309,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8272: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8184: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8365: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:8276: \$? = $ac_status" >&5 -+ echo "$as_me:8188: \$? = $ac_status" >&5 +- echo "$as_me:8369: \$? = $ac_status" >&5 ++ echo "$as_me:8316: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -8286,8 +8198,8 @@ else +@@ -8379,8 +8326,8 @@ else $rm conftest* fi @@ -9060,7 +9872,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -@@ -8301,8 +8213,8 @@ lt_prog_compiler_wl= +@@ -8394,8 +8341,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= @@ -9071,7 +9883,7 @@ Index: gtk+-2.12.12/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8533,18 +8445,18 @@ $as_echo_n "checking for $compiler optio +@@ -8626,18 +8573,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -9095,21 +9907,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext -@@ -8559,11 +8471,11 @@ else +@@ -8652,11 +8599,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8562: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8474: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:8566: \$? = $ac_status" >&5 -+ echo "$as_me:8478: \$? = $ac_status" >&5 +- echo "$as_me:8659: \$? = $ac_status" >&5 ++ echo "$as_me:8606: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -8576,8 +8488,8 @@ else +@@ -8669,8 +8616,8 @@ else $rm conftest* fi @@ -9120,7 +9932,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in -@@ -8604,10 +8516,10 @@ esac +@@ -8697,10 +8644,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -9134,7 +9946,7 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" -@@ -8632,8 +8544,8 @@ else +@@ -8725,8 +8672,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -9145,7 +9957,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_static_works" = xyes; then : -@@ -8642,10 +8554,10 @@ else +@@ -8735,10 +8682,10 @@ else fi @@ -9159,21 +9971,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_c_o=no $rm -r conftest 2>/dev/null -@@ -8663,11 +8575,11 @@ else +@@ -8756,11 +8703,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8666: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8578: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8759: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:8670: \$? = $ac_status" >&5 -+ echo "$as_me:8582: \$? = $ac_status" >&5 +- echo "$as_me:8763: \$? = $ac_status" >&5 ++ echo "$as_me:8710: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -8689,34 +8601,34 @@ else +@@ -8782,34 +8729,34 @@ else $rm conftest* fi @@ -9218,7 +10030,7 @@ Index: gtk+-2.12.12/configure runpath_var= allow_undefined_flag= -@@ -8928,12 +8840,13 @@ EOF +@@ -9021,12 +8968,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -9233,7 +10045,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -9146,21 +9059,18 @@ case "(($ac_try" in +@@ -9239,21 +9187,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9259,7 +10071,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -9175,13 +9085,12 @@ if test -z "$aix_libpath"; then +@@ -9268,13 +9213,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -9274,7 +10086,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -9216,21 +9125,18 @@ case "(($ac_try" in +@@ -9309,21 +9253,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9300,7 +10112,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -9245,13 +9151,12 @@ if test -z "$aix_libpath"; then +@@ -9338,13 +9279,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -9315,7 +10127,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -9484,7 +9389,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9577,7 +9517,7 @@ if test -z "$aix_libpath"; then aix_libp link_all_deplibs=yes ;; @@ -9324,7 +10136,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9703,8 +9608,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9796,8 +9736,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi @@ -9335,7 +10147,7 @@ Index: gtk+-2.12.12/configure test "$ld_shlibs" = no && can_build_shared=no # -@@ -9724,15 +9629,15 @@ x|xyes) +@@ -9817,15 +9757,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -9354,7 +10166,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -9750,7 +9655,7 @@ $as_echo_n "checking whether -lc should +@@ -9843,7 +9783,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -9363,7 +10175,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } then archive_cmds_need_lc=no -@@ -9762,16 +9667,16 @@ $as_echo_n "checking whether -lc should +@@ -9855,16 +9795,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -9384,7 +10196,7 @@ Index: gtk+-2.12.12/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -10179,13 +10084,11 @@ linux* | k*bsd*-gnu) +@@ -10272,13 +10212,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -9399,7 +10211,7 @@ Index: gtk+-2.12.12/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -10197,6 +10100,18 @@ linux* | k*bsd*-gnu) +@@ -10290,6 +10228,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -9418,7 +10230,7 @@ Index: gtk+-2.12.12/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -10374,19 +10289,19 @@ uts4*) +@@ -10467,19 +10417,19 @@ uts4*) dynamic_linker=no ;; esac @@ -9442,7 +10254,7 @@ Index: gtk+-2.12.12/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -10398,8 +10313,8 @@ if test "$GCC" = yes; then +@@ -10491,8 +10441,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -9453,7 +10265,7 @@ Index: gtk+-2.12.12/configure hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ -@@ -10423,8 +10338,8 @@ else +@@ -10516,8 +10466,8 @@ else # directories. hardcode_action=unsupported fi @@ -9464,7 +10276,7 @@ Index: gtk+-2.12.12/configure if test "$hardcode_action" = relink; then # Fast installation is not supported -@@ -10437,13 +10352,13 @@ fi +@@ -10530,13 +10480,13 @@ fi striplib= old_striplib= @@ -9482,7 +10294,7 @@ Index: gtk+-2.12.12/configure else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in -@@ -10451,16 +10366,16 @@ else +@@ -10544,16 +10494,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -9505,7 +10317,7 @@ Index: gtk+-2.12.12/configure ;; esac fi -@@ -10492,10 +10407,10 @@ else +@@ -10585,10 +10535,10 @@ else darwin*) # if libdl is installed we need to link against it @@ -9519,7 +10331,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -10527,36 +10442,32 @@ case "(($ac_try" in +@@ -10620,37 +10570,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9558,12 +10370,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then ++if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -10570,10 +10481,10 @@ fi + +@@ -10663,10 +10609,10 @@ fi ;; *) @@ -9577,7 +10391,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -10626,42 +10537,38 @@ case "(($ac_try" in +@@ -10719,42 +10665,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9615,9 +10429,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } - if test $ac_cv_func_shl_load = yes; then ++if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 @@ -9630,7 +10445,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -10693,43 +10600,39 @@ case "(($ac_try" in +@@ -10786,43 +10728,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9669,9 +10484,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then ++if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 @@ -9684,7 +10500,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -10782,42 +10685,38 @@ case "(($ac_try" in +@@ -10875,42 +10813,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9722,9 +10538,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } - if test $ac_cv_func_dlopen = yes; then ++if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 @@ -9737,7 +10554,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -10849,43 +10748,39 @@ case "(($ac_try" in +@@ -10942,43 +10876,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9776,9 +10593,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then ++if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 @@ -9791,7 +10609,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -@@ -10917,43 +10812,39 @@ case "(($ac_try" in +@@ -11010,43 +10940,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9830,9 +10648,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } - if test $ac_cv_lib_svld_dlopen = yes; then ++if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 @@ -9845,7 +10664,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -10985,36 +10876,32 @@ case "(($ac_try" in +@@ -11078,37 +11004,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9884,12 +10703,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } - if test $ac_cv_lib_dld_dld_link = yes; then ++if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -11054,10 +10941,10 @@ fi + +@@ -11147,10 +11069,10 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -9903,16 +10724,16 @@ Index: gtk+-2.12.12/configure else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross -@@ -11065,7 +10952,7 @@ else +@@ -11158,7 +11080,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF --#line 11068 "configure" -+#line 10955 "configure" +-#line 11161 "configure" ++#line 11083 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11131,7 +11018,7 @@ EOF +@@ -11224,7 +11146,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? @@ -9921,7 +10742,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? -@@ -11149,15 +11036,15 @@ rm -fr conftest* +@@ -11242,15 +11164,15 @@ rm -fr conftest* fi @@ -9942,16 +10763,16 @@ Index: gtk+-2.12.12/configure else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross -@@ -11165,7 +11052,7 @@ else +@@ -11258,7 +11180,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF --#line 11168 "configure" -+#line 11055 "configure" +-#line 11261 "configure" ++#line 11183 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11231,7 +11118,7 @@ EOF +@@ -11324,7 +11246,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? @@ -9960,7 +10781,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? -@@ -11249,8 +11136,8 @@ rm -fr conftest* +@@ -11342,8 +11264,8 @@ rm -fr conftest* fi @@ -9971,7 +10792,7 @@ Index: gtk+-2.12.12/configure fi CPPFLAGS="$save_CPPFLAGS" -@@ -11272,13 +11159,13 @@ fi +@@ -11365,13 +11287,13 @@ fi # Report which library types will actually be built @@ -9991,7 +10812,7 @@ Index: gtk+-2.12.12/configure test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -11298,15 +11185,15 @@ aix[4-9]*) +@@ -11391,15 +11313,15 @@ aix[4-9]*) fi ;; esac @@ -10013,7 +10834,7 @@ Index: gtk+-2.12.12/configure # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -11399,8 +11286,8 @@ if test -f "$ltmain"; then +@@ -11492,8 +11414,8 @@ if test -f "$ltmain"; then cfgfile="${ofile}T" trap "$rm \"$cfgfile\"; exit 1" 1 2 15 $rm -f "$cfgfile" @@ -10024,7 +10845,7 @@ Index: gtk+-2.12.12/configure cat <<__EOF__ >> "$cfgfile" #! $SHELL -@@ -11812,18 +11699,18 @@ fi +@@ -11905,18 +11827,18 @@ fi if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -10049,7 +10870,7 @@ Index: gtk+-2.12.12/configure fi fi if test -z "$LTCFLAGS"; then -@@ -11840,16 +11727,16 @@ $as_echo "$as_me: WARNING: using \`LTCC= +@@ -11933,16 +11855,16 @@ $as_echo "$as_me: WARNING: using \`LTCC= # Check whether tagname contains only valid characters case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in "") ;; @@ -10070,7 +10891,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi -@@ -11992,8 +11879,8 @@ fi +@@ -12085,8 +12007,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -10081,7 +10902,7 @@ Index: gtk+-2.12.12/configure case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -12022,14 +11909,14 @@ $as_echo_n "checking for ld used by $CC. +@@ -12115,14 +12037,14 @@ $as_echo_n "checking for ld used by $CC. ;; esac elif test "$with_gnu_ld" = yes; then @@ -10101,7 +10922,7 @@ Index: gtk+-2.12.12/configure else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -12059,19 +11946,19 @@ fi +@@ -12152,19 +12074,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -10130,7 +10951,7 @@ Index: gtk+-2.12.12/configure else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in -@@ -12083,8 +11970,8 @@ case `$LD -v 2>&1 </dev/null` in +@@ -12176,8 +12098,8 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi @@ -10141,7 +10962,7 @@ Index: gtk+-2.12.12/configure with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -12134,8 +12021,8 @@ else +@@ -12227,8 +12149,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics @@ -10152,7 +10973,7 @@ Index: gtk+-2.12.12/configure ld_shlibs_CXX=yes case $host_os in aix3*) -@@ -12252,21 +12139,18 @@ case "(($ac_try" in +@@ -12345,21 +12267,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10178,7 +10999,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -12281,13 +12165,12 @@ if test -z "$aix_libpath"; then +@@ -12374,13 +12293,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -10193,7 +11014,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -12323,21 +12206,18 @@ case "(($ac_try" in +@@ -12416,21 +12334,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10219,7 +11040,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -12352,13 +12232,12 @@ if test -z "$aix_libpath"; then +@@ -12445,13 +12360,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -10234,7 +11055,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -12761,7 +12640,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12854,7 +12768,7 @@ if test -z "$aix_libpath"; then aix_libp ;; esac ;; @@ -10243,7 +11064,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -13088,8 +12967,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -13181,8 +13095,8 @@ if test -z "$aix_libpath"; then aix_libp ld_shlibs_CXX=no ;; esac @@ -10254,7 +11075,7 @@ Index: gtk+-2.12.12/configure test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" -@@ -13108,7 +12987,7 @@ EOF +@@ -13201,7 +13115,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10263,7 +11084,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -13264,8 +13143,8 @@ lt_prog_compiler_wl_CXX= +@@ -13357,8 +13271,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -10274,7 +11095,7 @@ Index: gtk+-2.12.12/configure # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -13465,7 +13344,7 @@ $as_echo_n "checking for $compiler optio +@@ -13558,7 +13472,7 @@ $as_echo_n "checking for $compiler optio ;; esac ;; @@ -10283,7 +11104,7 @@ Index: gtk+-2.12.12/configure ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -13548,18 +13427,18 @@ $as_echo_n "checking for $compiler optio +@@ -13641,18 +13555,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -10307,21 +11128,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext -@@ -13574,11 +13453,11 @@ else +@@ -13667,11 +13581,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13577: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13456: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13670: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:13581: \$? = $ac_status" >&5 -+ echo "$as_me:13460: \$? = $ac_status" >&5 +- echo "$as_me:13674: \$? = $ac_status" >&5 ++ echo "$as_me:13588: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -13591,8 +13470,8 @@ else +@@ -13684,8 +13598,8 @@ else $rm conftest* fi @@ -10332,7 +11153,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in -@@ -13619,10 +13498,10 @@ esac +@@ -13712,10 +13626,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" @@ -10346,7 +11167,7 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" -@@ -13647,8 +13526,8 @@ else +@@ -13740,8 +13654,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -10357,7 +11178,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : -@@ -13657,10 +13536,10 @@ else +@@ -13750,10 +13664,10 @@ else fi @@ -10371,21 +11192,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_c_o_CXX=no $rm -r conftest 2>/dev/null -@@ -13678,11 +13557,11 @@ else +@@ -13771,11 +13685,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13681: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13560: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13774: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:13685: \$? = $ac_status" >&5 -+ echo "$as_me:13564: \$? = $ac_status" >&5 +- echo "$as_me:13778: \$? = $ac_status" >&5 ++ echo "$as_me:13692: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -13704,34 +13583,34 @@ else +@@ -13797,34 +13711,34 @@ else $rm conftest* fi @@ -10430,7 +11251,7 @@ Index: gtk+-2.12.12/configure export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in -@@ -13750,14 +13629,17 @@ $as_echo_n "checking whether the $compil +@@ -13843,14 +13757,17 @@ $as_echo_n "checking whether the $compil cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; @@ -10450,7 +11271,7 @@ Index: gtk+-2.12.12/configure test "$ld_shlibs_CXX" = no && can_build_shared=no # -@@ -13777,15 +13659,15 @@ x|xyes) +@@ -13870,15 +13787,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -10469,7 +11290,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -13803,7 +13685,7 @@ $as_echo_n "checking whether -lc should +@@ -13896,7 +13813,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -10478,7 +11299,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } then archive_cmds_need_lc_CXX=no -@@ -13815,16 +13697,16 @@ $as_echo_n "checking whether -lc should +@@ -13908,16 +13825,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -10499,7 +11320,7 @@ Index: gtk+-2.12.12/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -14180,13 +14062,11 @@ linux* | k*bsd*-gnu) +@@ -14273,13 +14190,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -10514,7 +11335,7 @@ Index: gtk+-2.12.12/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -14198,6 +14078,18 @@ linux* | k*bsd*-gnu) +@@ -14291,6 +14206,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -10533,7 +11354,7 @@ Index: gtk+-2.12.12/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -14375,19 +14267,19 @@ uts4*) +@@ -14468,19 +14395,19 @@ uts4*) dynamic_linker=no ;; esac @@ -10557,7 +11378,7 @@ Index: gtk+-2.12.12/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -14399,8 +14291,8 @@ if test "$GCC" = yes; then +@@ -14492,8 +14419,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -10568,7 +11389,7 @@ Index: gtk+-2.12.12/configure hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ -@@ -14424,8 +14316,8 @@ else +@@ -14517,8 +14444,8 @@ else # directories. hardcode_action_CXX=unsupported fi @@ -10579,7 +11400,7 @@ Index: gtk+-2.12.12/configure if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported -@@ -14963,13 +14855,13 @@ done +@@ -15056,13 +14983,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` @@ -10599,7 +11420,7 @@ Index: gtk+-2.12.12/configure test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -14988,15 +14880,15 @@ aix[4-9]*) +@@ -15081,15 +15008,15 @@ aix[4-9]*) fi ;; esac @@ -10621,7 +11442,7 @@ Index: gtk+-2.12.12/configure GCC_F77="$G77" LD_F77="$LD" -@@ -15005,8 +14897,8 @@ lt_prog_compiler_wl_F77= +@@ -15098,8 +15025,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= @@ -10632,7 +11453,7 @@ Index: gtk+-2.12.12/configure if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' -@@ -15237,18 +15129,18 @@ $as_echo_n "checking for $compiler optio +@@ -15330,18 +15257,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -10656,21 +11477,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext -@@ -15263,11 +15155,11 @@ else +@@ -15356,11 +15283,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15266: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15158: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15359: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:15270: \$? = $ac_status" >&5 -+ echo "$as_me:15162: \$? = $ac_status" >&5 +- echo "$as_me:15363: \$? = $ac_status" >&5 ++ echo "$as_me:15290: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -15280,8 +15172,8 @@ else +@@ -15373,8 +15300,8 @@ else $rm conftest* fi @@ -10681,7 +11502,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in -@@ -15308,10 +15200,10 @@ esac +@@ -15401,10 +15328,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" @@ -10695,7 +11516,7 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" -@@ -15336,8 +15228,8 @@ else +@@ -15429,8 +15356,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -10706,7 +11527,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : -@@ -15346,10 +15238,10 @@ else +@@ -15439,10 +15366,10 @@ else fi @@ -10720,21 +11541,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_c_o_F77=no $rm -r conftest 2>/dev/null -@@ -15367,11 +15259,11 @@ else +@@ -15460,11 +15387,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15370: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15262: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:15463: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15390: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:15374: \$? = $ac_status" >&5 -+ echo "$as_me:15266: \$? = $ac_status" >&5 +- echo "$as_me:15467: \$? = $ac_status" >&5 ++ echo "$as_me:15394: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -15393,34 +15285,34 @@ else +@@ -15486,34 +15413,34 @@ else $rm conftest* fi @@ -10779,7 +11600,7 @@ Index: gtk+-2.12.12/configure runpath_var= allow_undefined_flag_F77= -@@ -15632,12 +15524,13 @@ EOF +@@ -15725,12 +15652,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -10794,7 +11615,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15840,21 +15733,18 @@ case "(($ac_try" in +@@ -15933,21 +15861,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10820,7 +11641,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -15869,13 +15759,12 @@ if test -z "$aix_libpath"; then +@@ -15962,13 +15887,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -10835,7 +11656,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -15900,21 +15789,18 @@ case "(($ac_try" in +@@ -15993,21 +15917,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10861,7 +11682,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -15929,13 +15815,12 @@ if test -z "$aix_libpath"; then +@@ -16022,13 +15943,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -10876,7 +11697,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -16168,7 +16053,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -16261,7 +16181,7 @@ if test -z "$aix_libpath"; then aix_libp link_all_deplibs_F77=yes ;; @@ -10885,7 +11706,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -16387,8 +16272,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -16480,8 +16400,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi @@ -10896,7 +11717,7 @@ Index: gtk+-2.12.12/configure test "$ld_shlibs_F77" = no && can_build_shared=no # -@@ -16408,15 +16293,15 @@ x|xyes) +@@ -16501,15 +16421,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -10915,7 +11736,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -16434,7 +16319,7 @@ $as_echo_n "checking whether -lc should +@@ -16527,7 +16447,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -10924,7 +11745,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } then archive_cmds_need_lc_F77=no -@@ -16446,16 +16331,16 @@ $as_echo_n "checking whether -lc should +@@ -16539,16 +16459,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -10945,7 +11766,7 @@ Index: gtk+-2.12.12/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -16811,13 +16696,11 @@ linux* | k*bsd*-gnu) +@@ -16904,13 +16824,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -10960,7 +11781,7 @@ Index: gtk+-2.12.12/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16829,6 +16712,18 @@ linux* | k*bsd*-gnu) +@@ -16922,6 +16840,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -10979,7 +11800,7 @@ Index: gtk+-2.12.12/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -17006,19 +16901,19 @@ uts4*) +@@ -17099,19 +17029,19 @@ uts4*) dynamic_linker=no ;; esac @@ -11003,7 +11824,7 @@ Index: gtk+-2.12.12/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -17030,8 +16925,8 @@ if test "$GCC" = yes; then +@@ -17123,8 +17053,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -11014,7 +11835,7 @@ Index: gtk+-2.12.12/configure hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ -@@ -17055,8 +16950,8 @@ else +@@ -17148,8 +17078,8 @@ else # directories. hardcode_action_F77=unsupported fi @@ -11025,7 +11846,7 @@ Index: gtk+-2.12.12/configure if test "$hardcode_action_F77" = relink; then # Fast installation is not supported -@@ -17566,10 +17461,10 @@ if test "$GCC" = yes; then +@@ -17659,10 +17589,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' @@ -11039,21 +11860,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext -@@ -17584,11 +17479,11 @@ else +@@ -17677,11 +17607,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17587: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17482: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17680: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17610: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:17591: \$? = $ac_status" >&5 -+ echo "$as_me:17486: \$? = $ac_status" >&5 +- echo "$as_me:17684: \$? = $ac_status" >&5 ++ echo "$as_me:17614: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -17601,8 +17496,8 @@ else +@@ -17694,8 +17624,8 @@ else $rm conftest* fi @@ -11064,7 +11885,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -@@ -17616,8 +17511,8 @@ lt_prog_compiler_wl_GCJ= +@@ -17709,8 +17639,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= @@ -11075,7 +11896,7 @@ Index: gtk+-2.12.12/configure if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' -@@ -17848,18 +17743,18 @@ $as_echo_n "checking for $compiler optio +@@ -17941,18 +17871,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -11099,21 +11920,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext -@@ -17874,11 +17769,11 @@ else +@@ -17967,11 +17897,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17877: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17772: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:17970: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:17881: \$? = $ac_status" >&5 -+ echo "$as_me:17776: \$? = $ac_status" >&5 +- echo "$as_me:17974: \$? = $ac_status" >&5 ++ echo "$as_me:17904: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -17891,8 +17786,8 @@ else +@@ -17984,8 +17914,8 @@ else $rm conftest* fi @@ -11124,7 +11945,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in -@@ -17919,10 +17814,10 @@ esac +@@ -18012,10 +17942,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" @@ -11138,7 +11959,7 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" -@@ -17947,8 +17842,8 @@ else +@@ -18040,8 +17970,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -11149,7 +11970,7 @@ Index: gtk+-2.12.12/configure if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : -@@ -17957,10 +17852,10 @@ else +@@ -18050,10 +17980,10 @@ else fi @@ -11163,21 +11984,21 @@ Index: gtk+-2.12.12/configure else lt_cv_prog_compiler_c_o_GCJ=no $rm -r conftest 2>/dev/null -@@ -17978,11 +17873,11 @@ else +@@ -18071,11 +18001,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17981: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17876: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:18074: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:17985: \$? = $ac_status" >&5 -+ echo "$as_me:17880: \$? = $ac_status" >&5 +- echo "$as_me:18078: \$? = $ac_status" >&5 ++ echo "$as_me:18008: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -18004,34 +17899,34 @@ else +@@ -18097,34 +18027,34 @@ else $rm conftest* fi @@ -11222,7 +12043,7 @@ Index: gtk+-2.12.12/configure runpath_var= allow_undefined_flag_GCJ= -@@ -18243,12 +18138,13 @@ EOF +@@ -18336,12 +18266,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -11237,7 +12058,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -18461,21 +18357,18 @@ case "(($ac_try" in +@@ -18554,21 +18485,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11263,7 +12084,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -18490,13 +18383,12 @@ if test -z "$aix_libpath"; then +@@ -18583,13 +18511,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -11278,7 +12099,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -18531,21 +18423,18 @@ case "(($ac_try" in +@@ -18624,21 +18551,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11304,7 +12125,7 @@ Index: gtk+-2.12.12/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -18560,13 +18449,12 @@ if test -z "$aix_libpath"; then +@@ -18653,13 +18577,12 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -11319,7 +12140,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -@@ -18799,7 +18687,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -18892,7 +18815,7 @@ if test -z "$aix_libpath"; then aix_libp link_all_deplibs_GCJ=yes ;; @@ -11328,7 +12149,7 @@ Index: gtk+-2.12.12/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -19018,8 +18906,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -19111,8 +19034,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi @@ -11339,7 +12160,7 @@ Index: gtk+-2.12.12/configure test "$ld_shlibs_GCJ" = no && can_build_shared=no # -@@ -19039,15 +18927,15 @@ x|xyes) +@@ -19132,15 +19055,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -11358,7 +12179,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -19065,7 +18953,7 @@ $as_echo_n "checking whether -lc should +@@ -19158,7 +19081,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -11367,7 +12188,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } then archive_cmds_need_lc_GCJ=no -@@ -19077,16 +18965,16 @@ $as_echo_n "checking whether -lc should +@@ -19170,16 +19093,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -11388,7 +12209,7 @@ Index: gtk+-2.12.12/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -19442,13 +19330,11 @@ linux* | k*bsd*-gnu) +@@ -19535,13 +19458,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -11403,7 +12224,7 @@ Index: gtk+-2.12.12/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -19460,6 +19346,18 @@ linux* | k*bsd*-gnu) +@@ -19553,6 +19474,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -11422,7 +12243,7 @@ Index: gtk+-2.12.12/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -19637,19 +19535,19 @@ uts4*) +@@ -19730,19 +19663,19 @@ uts4*) dynamic_linker=no ;; esac @@ -11446,7 +12267,7 @@ Index: gtk+-2.12.12/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -19661,8 +19559,8 @@ if test "$GCC" = yes; then +@@ -19754,8 +19687,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -11457,7 +12278,7 @@ Index: gtk+-2.12.12/configure hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ -@@ -19686,8 +19584,8 @@ else +@@ -19779,8 +19712,8 @@ else # directories. hardcode_action_GCJ=unsupported fi @@ -11468,7 +12289,7 @@ Index: gtk+-2.12.12/configure if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported -@@ -20610,8 +20508,8 @@ CC="$lt_save_CC" +@@ -20703,8 +20636,8 @@ CC="$lt_save_CC" ;; *) @@ -11479,7 +12300,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } ;; esac -@@ -20630,8 +20528,8 @@ $as_echo "$as_me: error: Unsupported tag +@@ -20723,8 +20656,8 @@ $as_echo "$as_me: error: Unsupported tag chmod +x "$ofile" else rm -f "${ofile}T" @@ -11490,7 +12311,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi fi -@@ -20674,10 +20572,10 @@ fi +@@ -20769,10 +20702,10 @@ fi if test "$enable_largefile" != no; then @@ -11504,7 +12325,7 @@ Index: gtk+-2.12.12/configure else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then -@@ -20714,21 +20612,20 @@ case "(($ac_try" in +@@ -20809,21 +20742,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11529,7 +12350,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20742,21 +20639,20 @@ case "(($ac_try" in +@@ -20837,21 +20769,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11554,7 +12375,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20769,16 +20665,16 @@ rm -f core conftest.err conftest.$ac_obj +@@ -20864,16 +20795,16 @@ rm -f core conftest.err conftest.$ac_obj rm -f conftest.$ac_ext fi fi @@ -11576,7 +12397,7 @@ Index: gtk+-2.12.12/configure else while :; do cat >conftest.$ac_ext <<_ACEOF -@@ -20810,21 +20706,20 @@ case "(($ac_try" in +@@ -20905,21 +20836,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11601,7 +12422,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20861,21 +20756,20 @@ case "(($ac_try" in +@@ -20956,21 +20886,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11626,7 +12447,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20886,8 +20780,8 @@ rm -f core conftest.err conftest.$ac_obj +@@ -20981,8 +20910,8 @@ rm -f core conftest.err conftest.$ac_obj break done fi @@ -11637,7 +12458,7 @@ Index: gtk+-2.12.12/configure case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -@@ -20896,12 +20790,12 @@ cat >>confdefs.h <<_ACEOF +@@ -20991,12 +20920,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac @@ -11654,7 +12475,7 @@ Index: gtk+-2.12.12/configure else while :; do cat >conftest.$ac_ext <<_ACEOF -@@ -20933,21 +20827,20 @@ case "(($ac_try" in +@@ -21028,21 +20957,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11679,7 +12500,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20984,21 +20877,20 @@ case "(($ac_try" in +@@ -21079,21 +21007,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11704,7 +12525,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21009,8 +20901,8 @@ rm -f core conftest.err conftest.$ac_obj +@@ -21104,8 +21031,8 @@ rm -f core conftest.err conftest.$ac_obj break done fi @@ -11715,7 +12536,7 @@ Index: gtk+-2.12.12/configure case $ac_cv_sys_large_files in #( no | unknown) ;; *) -@@ -21019,88 +20911,194 @@ cat >>confdefs.h <<_ACEOF +@@ -21114,24 +21041,132 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac @@ -11730,85 +12551,18 @@ Index: gtk+-2.12.12/configure -: ${CCAS='$(CC)'} -# Set ASFLAGS if not already set. -: ${CCASFLAGS='$(CFLAGS)'} -- -- --# Extract the first word of "nm", so it can be a program name with args. --set dummy nm; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_NM+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $NM in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_NM="$NM" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -- ;; --esac --fi --NM=$ac_cv_path_NM --if test -n "$NM"; then -- { $as_echo "$as_me:$LINENO: result: $NM" >&5 --$as_echo "$NM" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS - - --{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -- # Check whether --enable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then -- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval --else -- USE_MAINTAINER_MODE=no --fi -- -- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 --$as_echo "$USE_MAINTAINER_MODE" >&6; } - ++ ++ ++ +depcc="$CCAS" am_compiler_list= - --if test $USE_MAINTAINER_MODE = yes; then -- MAINTAINER_MODE_TRUE= -- MAINTAINER_MODE_FALSE='#' ++ +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- MAINTAINER_MODE_TRUE='#' -- MAINTAINER_MODE_FALSE= --fi -- -- MAINT=$MAINTAINER_MODE_TRUE -- -- -- --{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 --$as_echo_n "checking for some Win32 platform... " >&6; } --case "$host" in ++else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For @@ -11908,80 +12662,80 @@ Index: gtk+-2.12.12/configure + am__fastdepCCAS_TRUE='#' + am__fastdepCCAS_FALSE= +fi -+ -+ -+# Extract the first word of "nm", so it can be a program name with args. -+set dummy nm; ac_word=$2 + + + # Extract the first word of "nm", so it can be a program name with args. + set dummy nm; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_NM+set}" = set; then + if test "${ac_cv_path_NM+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $NM in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_NM="$NM" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" + else + case $NM in + [\\/]* | ?:[\\/]*) +@@ -21146,7 +21181,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -+ ;; -+esac -+fi -+NM=$ac_cv_path_NM -+if test -n "$NM"; then + break 2 + fi + done +@@ -21159,17 +21194,17 @@ esac + fi + NM=$ac_cv_path_NM + if test -n "$NM"; then +- { $as_echo "$as_me:$LINENO: result: $NM" >&5 +-$as_echo "$NM" >&6; } + { echo "$as_me:$LINENO: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ + fi + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } -+ # Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -+else -+ USE_MAINTAINER_MODE=no -+fi -+ + # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +@@ -21177,11 +21212,9 @@ else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +-$as_echo "$USE_MAINTAINER_MODE" >&6; } +- +- +-if test $USE_MAINTAINER_MODE = yes; then + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then -+ MAINTAINER_MODE_TRUE= -+ MAINTAINER_MODE_FALSE='#' -+else -+ MAINTAINER_MODE_TRUE='#' -+ MAINTAINER_MODE_FALSE= -+fi -+ -+ MAINT=$MAINTAINER_MODE_TRUE -+ -+ -+ + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -21193,8 +21226,8 @@ fi + + + +-{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +-$as_echo_n "checking for some Win32 platform... " >&6; } +{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } -+case "$host" in + case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes - ;; -@@ -21108,11 +21106,9 @@ case "$host" in +@@ -21203,11 +21236,9 @@ case "$host" in platform_win32=no ;; esac @@ -11996,7 +12750,7 @@ Index: gtk+-2.12.12/configure PLATFORM_WIN32_TRUE= PLATFORM_WIN32_FALSE='#' else -@@ -21121,9 +21117,7 @@ else +@@ -21216,9 +21247,7 @@ else fi @@ -12007,7 +12761,7 @@ Index: gtk+-2.12.12/configure OS_WIN32_TRUE= OS_WIN32_FALSE='#' else -@@ -21131,9 +21125,7 @@ else +@@ -21226,9 +21255,7 @@ else OS_WIN32_FALSE= fi @@ -12018,7 +12772,7 @@ Index: gtk+-2.12.12/configure OS_UNIX_TRUE= OS_UNIX_FALSE='#' else -@@ -21141,9 +21133,7 @@ else +@@ -21236,9 +21263,7 @@ else OS_UNIX_FALSE= fi @@ -12029,7 +12783,7 @@ Index: gtk+-2.12.12/configure OS_LINUX_TRUE= OS_LINUX_FALSE='#' else -@@ -21156,10 +21146,10 @@ if test "$os_win32" = "yes"; then +@@ -21251,10 +21276,10 @@ if test "$os_win32" = "yes"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 @@ -12043,7 +12797,7 @@ Index: gtk+-2.12.12/configure else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -@@ -21172,7 +21162,7 @@ do +@@ -21267,7 +21292,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" @@ -12052,7 +12806,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -21183,11 +21173,11 @@ fi +@@ -21278,11 +21303,11 @@ fi fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then @@ -12068,7 +12822,7 @@ Index: gtk+-2.12.12/configure fi -@@ -21196,10 +21186,10 @@ if test -z "$ac_cv_prog_WINDRES"; then +@@ -21291,10 +21316,10 @@ if test -z "$ac_cv_prog_WINDRES"; then ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 @@ -12082,7 +12836,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ac_ct_WINDRES"; then ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -@@ -21212,7 +21202,7 @@ do +@@ -21307,7 +21332,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_WINDRES="windres" @@ -12091,7 +12845,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -21223,11 +21213,11 @@ fi +@@ -21318,11 +21343,11 @@ fi fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then @@ -12107,20 +12861,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_ct_WINDRES" = x; then -@@ -21235,10 +21225,10 @@ fi +@@ -21330,8 +21355,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -21250,16 +21240,16 @@ else + esac + WINDRES=$ac_ct_WINDRES +@@ -21341,16 +21370,16 @@ else fi if test "$WINDRES" = no; then @@ -12142,7 +12898,7 @@ Index: gtk+-2.12.12/configure else if test -n "$ms_librarian"; then ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. -@@ -21272,7 +21262,7 @@ do +@@ -21363,7 +21392,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ms_librarian="yes" @@ -12151,7 +12907,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -21284,18 +21274,16 @@ fi +@@ -21375,18 +21404,16 @@ fi fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then @@ -12175,7 +12931,7 @@ Index: gtk+-2.12.12/configure MS_LIB_AVAILABLE_TRUE= MS_LIB_AVAILABLE_FALSE='#' else -@@ -21372,8 +21360,8 @@ fi +@@ -21463,8 +21490,8 @@ fi case $gdktarget in x11|win32|quartz|directfb) ;; @@ -12186,7 +12942,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; };; esac -@@ -21407,8 +21395,8 @@ _ACEOF +@@ -21499,8 +21526,8 @@ _ACEOF # Build time sanity check... @@ -12197,7 +12953,7 @@ Index: gtk+-2.12.12/configure # Just in case sleep 1 echo timestamp > conftest.file -@@ -21431,9 +21419,9 @@ if ( +@@ -21523,9 +21550,9 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -12209,7 +12965,7 @@ Index: gtk+-2.12.12/configure alias in your environment" >&2;} { (exit 1); exit 1; }; } fi -@@ -21444,20 +21432,20 @@ then +@@ -21536,20 +21563,20 @@ then # Ok. : else @@ -12237,55 +12993,56 @@ Index: gtk+-2.12.12/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -21495,73 +21483,611 @@ case "(($ac_try" in +@@ -21587,30 +21614,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ ac_cv_search_strerror=$ac_res -+else + ac_cv_search_strerror=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_strerror+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_strerror+set}" = set; then -+ : -+else -+ ac_cv_search_strerror=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then +@@ -21625,40 +21648,582 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +-$as_echo "$ac_cv_search_strerror" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -+ac_res=$ac_cv_search_strerror -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi -+ + ac_res=$ac_cv_search_strerror + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12328,7 +13085,7 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}no" >&6; } +fi + -+ + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC @@ -12356,7 +13113,7 @@ Index: gtk+-2.12.12/configure +done +done +IFS=$as_save_IFS -+ + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC @@ -12367,7 +13124,22 @@ Index: gtk+-2.12.12/configure + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ + +-{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 +-$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } +-if test "${am_cv_prog_cc_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- am_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + if test "x$ac_ct_CC" = x; then + CC="" + else @@ -12401,7 +13173,8 @@ Index: gtk+-2.12.12/configure +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH -+do + do +- CC="$ac_save_CC $ac_arg" + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do @@ -12637,12 +13410,12 @@ Index: gtk+-2.12.12/configure +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +int +main () @@ -12798,76 +13571,29 @@ Index: gtk+-2.12.12/configure +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_search_strerror=$ac_res ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes - else -- $as_echo "$as_me: failed program was:" >&5 ++else + echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext -- if test "${ac_cv_search_strerror+set}" = set; then -- break --fi --done --if test "${ac_cv_search_strerror+set}" = set; then -- : --else -- ac_cv_search_strerror=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 --$as_echo "$ac_cv_search_strerror" >&6; } --ac_res=$ac_cv_search_strerror --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -- -- -- --{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 --$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } --if test "${am_cv_prog_cc_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- am_cv_prog_cc_stdc=no --ac_save_CC="$CC" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- cat >conftest.$ac_ext <<_ACEOF ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi @@ -12896,10 +13622,15 @@ Index: gtk+-2.12.12/configure + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -21589,66 +22115,202 @@ static char *f (char * (*g) (char **, in ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> + #include <sys/types.h> +@@ -21681,66 +22246,202 @@ static char *f (char * (*g) (char **, in va_end (v); return s; } @@ -12977,8 +13708,8 @@ Index: gtk+-2.12.12/configure -CC="$ac_save_CC" +rm -f conftest.$ac_ext +CC=$ac_save_CC -+ -+fi + + fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) @@ -13085,44 +13816,44 @@ Index: gtk+-2.12.12/configure + fi + fi + done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CC_dependencies_compiler_type=none -+fi - - fi -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -if test -z "$am_cv_prog_cc_stdc"; then - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' ++ cd .. ++ rm -rf conftest.dir else - { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 -$as_echo "$am_cv_prog_cc_stdc" >&6; } -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= ++ am_cv_CC_dependencies_compiler_type=none fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac + ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ + + +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or -@@ -21663,12 +22325,11 @@ esac +@@ -21755,12 +22456,11 @@ esac # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -13138,7 +13869,7 @@ Index: gtk+-2.12.12/configure else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -21697,29 +22358,17 @@ case $as_dir/ in +@@ -21789,29 +22489,17 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else @@ -13170,7 +13901,7 @@ Index: gtk+-2.12.12/configure fi if test "${ac_cv_path_install+set}" = set; then -@@ -21732,8 +22381,8 @@ fi +@@ -21824,8 +22512,8 @@ fi INSTALL=$ac_install_sh fi fi @@ -13181,7 +13912,7 @@ Index: gtk+-2.12.12/configure # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -21743,12 +22392,11 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR +@@ -21835,12 +22523,11 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -13198,7 +13929,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.make <<\_ACEOF SHELL = /bin/sh -@@ -21765,12 +22413,12 @@ esac +@@ -21857,12 +22544,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -13215,7 +13946,7 @@ Index: gtk+-2.12.12/configure SET_MAKE="MAKE=${MAKE-make}" fi -@@ -21801,8 +22449,8 @@ fi +@@ -21895,8 +22582,8 @@ CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_I if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' @@ -13226,7 +13957,7 @@ Index: gtk+-2.12.12/configure if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" else -@@ -21821,14 +22469,14 @@ $as_echo_n "checking how to get MSVC-com +@@ -21915,14 +22602,14 @@ $as_echo_n "checking how to get MSVC-com ;; esac if test x"$msnative_struct" = x ; then @@ -13247,7 +13978,7 @@ Index: gtk+-2.12.12/configure fi fi fi -@@ -21848,10 +22496,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != +@@ -21942,10 +22629,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -13261,7 +13992,7 @@ Index: gtk+-2.12.12/configure else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -21866,7 +22514,7 @@ do +@@ -21960,7 +22647,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -13270,7 +14001,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -21878,11 +22526,11 @@ esac +@@ -21972,11 +22659,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -13286,7 +14017,7 @@ Index: gtk+-2.12.12/configure fi -@@ -21891,10 +22539,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the +@@ -21985,10 +22672,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -13300,7 +14031,7 @@ Index: gtk+-2.12.12/configure else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -21909,7 +22557,7 @@ do +@@ -22003,7 +22690,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -13309,7 +14040,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -21921,11 +22569,11 @@ esac +@@ -22015,11 +22702,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -13325,20 +14056,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -21933,10 +22581,10 @@ fi +@@ -22027,8 +22714,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -21950,54 +22598,58 @@ fi + esac + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -22040,54 +22731,58 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -13371,19 +14104,19 @@ Index: gtk+-2.12.12/configure - pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0\"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_CFLAGS"; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0" 2>/dev/null` + pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` else pkg_failed=yes fi @@ -13397,19 +14130,19 @@ Index: gtk+-2.12.12/configure - pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0\"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_LIBS"; then + pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" + else + if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0" 2>/dev/null` + pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` else pkg_failed=yes fi @@ -13421,43 +14154,45 @@ Index: gtk+-2.12.12/configure fi -@@ -22010,14 +22662,14 @@ else +@@ -22100,14 +22795,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0" 2>&1` -+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0"` +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` else -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0" 2>&1` -+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0"` +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` fi # Put the nasty error message in config.log where it belongs echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0) were not met: +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: $BASE_DEPENDENCIES_PKG_ERRORS -@@ -22028,7 +22680,7 @@ Alternatively, you may set the environme +@@ -22118,7 +22813,7 @@ Alternatively, you may set the environme and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0) were not met: -+echo "$as_me: error: Package requirements (glib-2.0 >= 2.13.5 atk >= 1.9.0 pango >= 1.17.3 cairo >= 1.2.0) were not met: +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: $BASE_DEPENDENCIES_PKG_ERRORS -@@ -22041,7 +22693,7 @@ See the pkg-config man page for more det +@@ -22131,9 +22826,7 @@ See the pkg-config man page for more det " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22051,7 +22703,7 @@ See the pkg-config man page for more det +@@ -22143,7 +22836,7 @@ See the pkg-config man page for more det To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 @@ -13466,7 +14201,12 @@ Index: gtk+-2.12.12/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22065,8 +22717,8 @@ See \`config.log' for more details." >&2 +@@ -22153,12 +22846,12 @@ See the pkg-config man page for more det + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } else BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS @@ -13477,7 +14217,7 @@ Index: gtk+-2.12.12/configure : fi -@@ -22089,8 +22741,8 @@ else +@@ -22181,8 +22874,8 @@ else fi @@ -13488,7 +14228,7 @@ Index: gtk+-2.12.12/configure case $enable_explicit_deps in auto) export SED -@@ -22103,17 +22755,15 @@ case $enable_explicit_deps in +@@ -22195,17 +22888,15 @@ case $enable_explicit_deps in ;; yes|no) ;; @@ -13501,17 +14241,17 @@ Index: gtk+-2.12.12/configure esac -{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 -$as_echo "$enable_explicit_deps" >&6; } +- +{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +echo "${ECHO_T}$enable_explicit_deps" >&6; } -- - -if test $enable_explicit_deps = no; then + if test $enable_explicit_deps = no; then DISABLE_EXPLICIT_DEPS_TRUE= DISABLE_EXPLICIT_DEPS_FALSE='#' else -@@ -22129,10 +22779,10 @@ for ac_prog in perl5 perl +@@ -22221,10 +22912,10 @@ for ac_prog in perl5 perl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -13525,7 +14265,7 @@ Index: gtk+-2.12.12/configure else case $PERL in [\\/]* | ?:[\\/]*) -@@ -22147,7 +22797,7 @@ do +@@ -22239,7 +22930,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" @@ -13534,7 +14274,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -22159,11 +22809,11 @@ esac +@@ -22251,11 +22942,11 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -13550,7 +14290,7 @@ Index: gtk+-2.12.12/configure fi -@@ -22174,10 +22824,10 @@ done +@@ -22266,10 +22957,10 @@ done # We would like indent, but don't require it. # Extract the first word of "indent", so it can be a program name with args. set dummy indent; ac_word=$2 @@ -13564,7 +14304,7 @@ Index: gtk+-2.12.12/configure else if test -n "$INDENT"; then ac_cv_prog_INDENT="$INDENT" # Let the user override the test. -@@ -22190,7 +22840,7 @@ do +@@ -22282,7 +22973,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_INDENT="indent" @@ -13573,7 +14313,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -22201,11 +22851,11 @@ fi +@@ -22293,11 +22984,11 @@ fi fi INDENT=$ac_cv_prog_INDENT if test -n "$INDENT"; then @@ -13589,7 +14329,7 @@ Index: gtk+-2.12.12/configure fi -@@ -22224,11 +22874,11 @@ fi +@@ -22316,11 +23007,11 @@ fi for ac_func in lstat mkstemp flockfile getc_unlocked do @@ -13605,7 +14345,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22281,41 +22931,35 @@ case "(($ac_try" in +@@ -22373,42 +23064,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13645,8 +14385,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -13657,7 +14398,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -22324,11 +22968,11 @@ done +@@ -22417,11 +23101,11 @@ done for ac_func in localtime_r do @@ -13673,7 +14414,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22381,41 +23025,35 @@ case "(($ac_try" in +@@ -22474,42 +23158,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13713,8 +14454,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -13725,7 +14467,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -22423,8 +23061,8 @@ done +@@ -22517,8 +23194,8 @@ done # _NL_TIME_FIRST_WEEKDAY is an enum and not a define @@ -13736,7 +14478,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22449,34 +23087,30 @@ case "(($ac_try" in +@@ -22543,34 +23220,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13778,7 +14520,7 @@ Index: gtk+-2.12.12/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22486,8 +23120,8 @@ _ACEOF +@@ -22580,8 +23253,8 @@ _ACEOF fi # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define @@ -13789,7 +14531,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22512,34 +23146,30 @@ case "(($ac_try" in +@@ -22606,34 +23279,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13831,7 +14573,7 @@ Index: gtk+-2.12.12/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22549,8 +23179,8 @@ _ACEOF +@@ -22643,8 +23312,8 @@ _ACEOF fi # _NL_PAPER_HEIGHT is an enum and not a define @@ -13842,7 +14584,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22575,34 +23205,30 @@ case "(($ac_try" in +@@ -22669,34 +23338,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13884,7 +14626,7 @@ Index: gtk+-2.12.12/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22612,8 +23238,8 @@ _ACEOF +@@ -22706,8 +23371,8 @@ _ACEOF fi # _NL_PAPER_WIDTH is an enum and not a define @@ -13895,7 +14637,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22638,34 +23264,30 @@ case "(($ac_try" in +@@ -22732,34 +23397,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13937,7 +14679,7 @@ Index: gtk+-2.12.12/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22675,8 +23297,8 @@ _ACEOF +@@ -22769,8 +23430,8 @@ _ACEOF fi # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable @@ -13948,7 +14690,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22701,34 +23323,30 @@ case "(($ac_try" in +@@ -22795,34 +23456,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13988,9 +14730,9 @@ Index: gtk+-2.12.12/configure +{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 +echo "${ECHO_T}$gtk_ok" >&6; } if test "$gtk_ok" = "yes"; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_SIGSETJMP 1 -@@ -22747,21 +23365,20 @@ ALL_LINGUAS="af am ang ar as az az_IR be + + cat >>confdefs.h <<\_ACEOF +@@ -22837,21 +23494,20 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/L for ac_header in locale.h do @@ -14021,7 +14763,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22777,33 +23394,32 @@ case "(($ac_try" in +@@ -22867,33 +23523,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14062,7 +14804,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22817,52 +23433,51 @@ case "(($ac_try" in +@@ -22907,52 +23562,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14136,7 +14878,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -22871,23 +23486,21 @@ _ASBOX +@@ -22961,24 +23615,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -14159,8 +14901,9 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -14168,7 +14911,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -22895,10 +23508,10 @@ fi +@@ -22986,10 +23637,10 @@ fi done if test $ac_cv_header_locale_h = yes; then @@ -14182,7 +14925,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22921,35 +23534,31 @@ case "(($ac_try" in +@@ -23012,35 +23663,31 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14225,7 +14968,7 @@ Index: gtk+-2.12.12/configure if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF -@@ -22968,17 +23577,17 @@ _ACEOF +@@ -23059,17 +23706,17 @@ _ACEOF INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then @@ -14250,7 +14993,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22994,33 +23603,32 @@ case "(($ac_try" in +@@ -23085,33 +23732,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14291,7 +15034,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23034,52 +23642,51 @@ case "(($ac_try" in +@@ -23125,52 +23771,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14365,7 +15108,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -23088,15 +23695,15 @@ _ASBOX +@@ -23179,28 +23824,28 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -14385,8 +15128,11 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } fi - if test $ac_cv_header_libintl_h = yes; then -@@ -23106,10 +23713,10 @@ if test $ac_cv_header_libintl_h = yes; t +-if test "x$ac_cv_header_libintl_h" = x""yes; then ++if test $ac_cv_header_libintl_h = yes; then + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + # # First check in libc # @@ -14400,7 +15146,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23134,42 +23741,38 @@ case "(($ac_try" in +@@ -23225,42 +23870,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14453,7 +15199,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23194,47 +23797,43 @@ case "(($ac_try" in +@@ -23285,47 +23926,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14512,7 +15258,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23287,41 +23886,35 @@ case "(($ac_try" in +@@ -23378,42 +24015,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14552,8 +15298,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -14564,7 +15311,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -23336,10 +23929,10 @@ done +@@ -23428,10 +24058,10 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -14578,7 +15325,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23371,41 +23964,37 @@ case "(($ac_try" in +@@ -23463,41 +24093,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14617,11 +15364,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } - if test $ac_cv_lib_intl_bindtextdomain = yes; then +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } ++if test $ac_cv_lib_intl_bindtextdomain = yes; then + { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_ngettext+set}" = set; then @@ -14630,7 +15378,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23437,41 +24026,37 @@ case "(($ac_try" in +@@ -23529,41 +24155,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14669,11 +15417,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } - if test $ac_cv_lib_intl_ngettext = yes; then +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } ++if test $ac_cv_lib_intl_ngettext = yes; then + { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_dgettext+set}" = set; then @@ -14682,7 +15431,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23503,36 +24088,32 @@ case "(($ac_try" in +@@ -23595,37 +24217,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14721,12 +15470,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } - if test $ac_cv_lib_intl_dgettext = yes; then ++if test $ac_cv_lib_intl_dgettext = yes; then gt_cv_func_dgettext_libintl=yes fi -@@ -23543,14 +24124,14 @@ fi + +@@ -23635,14 +24253,14 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -14748,7 +15499,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -23582,41 +24163,37 @@ case "(($ac_try" in +@@ -23674,41 +24292,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14787,11 +15538,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } - if test $ac_cv_lib_intl_ngettext = yes; then +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } ++if test $ac_cv_lib_intl_ngettext = yes; then + { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_dcgettext+set}" = set; then @@ -14800,7 +15552,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -23648,36 +24225,32 @@ case "(($ac_try" in +@@ -23740,37 +24354,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14839,12 +15591,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } - if test $ac_cv_lib_intl_dcgettext = yes; then ++if test $ac_cv_lib_intl_dcgettext = yes; then gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv -@@ -23703,11 +24276,11 @@ fi + else +@@ -23795,11 +24405,11 @@ fi for ac_func in bind_textdomain_codeset do @@ -14860,7 +15614,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23760,41 +24333,35 @@ case "(($ac_try" in +@@ -23852,42 +24462,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14900,8 +15654,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -14912,7 +15667,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -23830,10 +24397,10 @@ _ACEOF +@@ -23923,10 +24526,10 @@ _ACEOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -14926,7 +15681,7 @@ Index: gtk+-2.12.12/configure else case "$MSGFMT" in /*) -@@ -23857,11 +24424,11 @@ esac +@@ -23950,11 +24553,11 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -14942,7 +15697,7 @@ Index: gtk+-2.12.12/configure fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" -@@ -23869,11 +24436,11 @@ fi +@@ -23962,11 +24565,11 @@ fi for ac_func in dcgettext do @@ -14958,7 +15713,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23926,49 +24493,43 @@ case "(($ac_try" in +@@ -24019,50 +24622,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14998,8 +15753,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -15020,7 +15776,7 @@ Index: gtk+-2.12.12/configure cat >conftest.foo <<_ACEOF msgid "" -@@ -23982,25 +24543,25 @@ msgstr "" +@@ -24076,25 +24672,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -15055,7 +15811,7 @@ Index: gtk+-2.12.12/configure else case $GMSGFMT in [\\/]* | ?:[\\/]*) -@@ -24015,7 +24576,7 @@ do +@@ -24109,7 +24705,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" @@ -15064,7 +15820,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -24028,20 +24589,20 @@ esac +@@ -24122,20 +24718,20 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -15092,7 +15848,7 @@ Index: gtk+-2.12.12/configure else case "$XGETTEXT" in /*) -@@ -24065,11 +24626,11 @@ esac +@@ -24159,11 +24755,11 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -15108,7 +15864,7 @@ Index: gtk+-2.12.12/configure fi cat >conftest.$ac_ext <<_ACEOF -@@ -24094,33 +24655,30 @@ case "(($ac_try" in +@@ -24188,33 +24784,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15150,7 +15906,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24173,35 +24731,31 @@ case "(($ac_try" in +@@ -24267,36 +24860,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15188,12 +15944,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } - if test $ac_cv_func_bind_textdomain_codeset = yes; then ++if test $ac_cv_func_bind_textdomain_codeset = yes; then CATOBJEXT=.gmo DATADIRNAME=share -@@ -24218,7 +24772,6 @@ fi + else +@@ -24312,7 +24901,6 @@ fi esac fi @@ -15201,7 +15959,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" -@@ -24244,8 +24797,8 @@ _ACEOF +@@ -24338,8 +24926,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -15212,7 +15970,7 @@ Index: gtk+-2.12.12/configure XGETTEXT=":" fi fi -@@ -24277,8 +24830,8 @@ $as_echo "found xgettext program is not +@@ -24371,8 +24959,8 @@ $as_echo "found xgettext program is not if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -15223,7 +15981,7 @@ Index: gtk+-2.12.12/configure NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no -@@ -24302,8 +24855,8 @@ $as_echo_n "checking for catalogs to be +@@ -24396,8 +24984,8 @@ $as_echo_n "checking for catalogs to be fi done LINGUAS=$NEW_LINGUAS @@ -15234,7 +15992,7 @@ Index: gtk+-2.12.12/configure fi if test -n "$LINGUAS"; then -@@ -24359,14 +24912,14 @@ _ACEOF +@@ -24453,14 +25041,14 @@ _ACEOF @@ -15253,7 +16011,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF -@@ -24384,27 +24937,25 @@ case "(($ac_try" in +@@ -24478,27 +25066,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15289,7 +16047,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -@@ -24429,82 +24980,78 @@ case "(($ac_try" in +@@ -24523,82 +25109,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15398,7 +16156,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24526,22 +25073,21 @@ case "(($ac_try" in +@@ -24620,22 +25202,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15426,7 +16184,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_save_CFLAGS="$CFLAGS" -@@ -24567,29 +25113,28 @@ case "(($ac_try" in +@@ -24661,29 +25242,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15465,7 +16223,7 @@ Index: gtk+-2.12.12/configure fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -@@ -24639,10 +25184,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != +@@ -24733,10 +25313,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -15479,7 +16237,7 @@ Index: gtk+-2.12.12/configure else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -24657,7 +25202,7 @@ do +@@ -24751,7 +25331,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -15488,7 +16246,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -24669,11 +25214,11 @@ esac +@@ -24763,11 +25343,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -15504,7 +16262,7 @@ Index: gtk+-2.12.12/configure fi -@@ -24682,10 +25227,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the +@@ -24776,10 +25356,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -15518,7 +16276,7 @@ Index: gtk+-2.12.12/configure else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -24700,7 +25245,7 @@ do +@@ -24794,7 +25374,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -15527,7 +16285,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -24712,11 +25257,11 @@ esac +@@ -24806,11 +25386,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -15543,20 +16301,22 @@ Index: gtk+-2.12.12/configure fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -24724,10 +25269,10 @@ fi +@@ -24818,8 +25398,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) --{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&5 --$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools - whose name does not start with the host triplet. If you think this - configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -24741,14 +25286,14 @@ fi + esac + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -24831,14 +25415,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.16 @@ -15577,10 +16337,10 @@ Index: gtk+-2.12.12/configure PKG_CONFIG="" fi -@@ -24762,8 +25307,8 @@ fi +@@ -24852,8 +25436,8 @@ fi fi - min_glib_version=2.13.5 + min_glib_version=2.17.6 - { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 -$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } + { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 @@ -15588,7 +16348,7 @@ Index: gtk+-2.12.12/configure if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs -@@ -24886,32 +25431,29 @@ case "(($ac_try" in +@@ -24976,32 +25560,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15627,7 +16387,7 @@ Index: gtk+-2.12.12/configure rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -@@ -24921,12 +25463,12 @@ fi +@@ -25011,12 +25592,12 @@ fi fi fi if test "x$no_glib" = x ; then @@ -15644,7 +16404,7 @@ Index: gtk+-2.12.12/configure if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://www.freedesktop.org/software/pkgconfig/" -@@ -24963,21 +25505,18 @@ case "(($ac_try" in +@@ -25053,21 +25634,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15670,7 +16430,7 @@ Index: gtk+-2.12.12/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -@@ -24988,14 +25527,13 @@ $as_echo "$ac_try_echo") >&5 +@@ -25078,14 +25656,13 @@ $as_echo "$ac_try_echo") >&5 echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else @@ -15686,20 +16446,20 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" -@@ -25007,10 +25545,10 @@ rm -f core conftest.err conftest.$ac_obj +@@ -25097,10 +25674,10 @@ rm -f core conftest.err conftest.$ac_obj GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" - { { $as_echo "$as_me:$LINENO: error: + { { echo "$as_me:$LINENO: error: - *** GLIB 2.13.5 or better is required. The latest version of + *** GLIB 2.17.6 or better is required. The latest version of *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 -$as_echo "$as_me: error: +echo "$as_me: error: - *** GLIB 2.13.5 or better is required. The latest version of + *** GLIB 2.17.6 or better is required. The latest version of *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} { (exit 1); exit 1; }; } -@@ -25036,11 +25574,11 @@ LIBS="$LIBS $GLIB_LIBS" +@@ -25128,11 +25705,11 @@ LIBS="$LIBS $GLIB_LIBS" for ac_func in bind_textdomain_codeset do @@ -15715,7 +16475,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25093,41 +25631,35 @@ case "(($ac_try" in +@@ -25185,42 +25762,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15755,8 +16515,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -15767,7 +16528,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -25138,21 +25670,20 @@ LIBS=$gtk_save_LIBS +@@ -25231,21 +25801,20 @@ LIBS=$gtk_save_LIBS for ac_header in pwd.h do @@ -15798,7 +16559,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25168,33 +25699,32 @@ case "(($ac_try" in +@@ -25261,33 +25830,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15839,7 +16600,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25208,52 +25738,51 @@ case "(($ac_try" in +@@ -25301,52 +25869,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15913,7 +16674,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25262,23 +25791,21 @@ _ASBOX +@@ -25355,24 +25922,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -15936,16 +16697,17 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - cat >>confdefs.h <<\_ACEOF - #define HAVE_PWD_H 1 -@@ -25291,21 +25818,20 @@ done + + cat >>confdefs.h <<\_ACEOF +@@ -25386,21 +25950,20 @@ done for ac_header in sys/time.h do @@ -15976,7 +16738,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25321,33 +25847,32 @@ case "(($ac_try" in +@@ -25416,33 +25979,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16017,7 +16779,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25361,52 +25886,51 @@ case "(($ac_try" in +@@ -25456,52 +26018,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16091,7 +16853,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25415,23 +25939,21 @@ _ASBOX +@@ -25510,24 +26071,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16114,16 +16876,17 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - cat >>confdefs.h <<\_ACEOF - #define HAVE_SYS_TIME_H 1 -@@ -25444,21 +25966,20 @@ done + + cat >>confdefs.h <<\_ACEOF +@@ -25541,21 +26099,20 @@ done for ac_header in unistd.h do @@ -16154,7 +16917,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25474,33 +25995,32 @@ case "(($ac_try" in +@@ -25571,33 +26128,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16195,7 +16958,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25514,52 +26034,51 @@ case "(($ac_try" in +@@ -25611,52 +26167,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16269,7 +17032,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25568,23 +26087,21 @@ _ASBOX +@@ -25665,24 +26220,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16292,16 +17055,17 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - cat >>confdefs.h <<\_ACEOF - #define HAVE_UNISTD_H 1 -@@ -25597,21 +26114,20 @@ done + + cat >>confdefs.h <<\_ACEOF +@@ -25696,21 +26248,20 @@ done for ac_header in ftw.h do @@ -16332,7 +17096,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25627,33 +26143,32 @@ case "(($ac_try" in +@@ -25726,33 +26277,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16373,7 +17137,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25667,52 +26182,51 @@ case "(($ac_try" in +@@ -25766,52 +26316,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16447,7 +17211,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25721,23 +26235,21 @@ _ASBOX +@@ -25820,24 +26369,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16470,16 +17234,17 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - cat >>confdefs.h <<\_ACEOF - #define HAVE_FTW_H 1 -@@ -25748,8 +26260,8 @@ fi + + cat >>confdefs.h <<\_ACEOF +@@ -25849,8 +26395,8 @@ fi done @@ -16490,7 +17255,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25773,21 +26285,20 @@ case "(($ac_try" in +@@ -25874,21 +26420,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16515,7 +17280,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_ok=no -@@ -25795,16 +26306,16 @@ fi +@@ -25896,16 +26441,16 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gtk_ok = yes; then @@ -16536,7 +17301,7 @@ Index: gtk+-2.12.12/configure fi saved_cflags="$CFLAGS" -@@ -25812,10 +26323,10 @@ saved_ldflags="$LDFLAGS" +@@ -25913,10 +26458,10 @@ saved_ldflags="$LDFLAGS" # Checks for header files. @@ -16550,7 +17315,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25842,21 +26353,20 @@ case "(($ac_try" in +@@ -25943,21 +26488,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16575,7 +17340,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no -@@ -25948,40 +26458,37 @@ case "(($ac_try" in +@@ -26049,40 +26593,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16624,7 +17389,7 @@ Index: gtk+-2.12.12/configure if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -25992,10 +26499,10 @@ fi +@@ -26093,10 +26634,10 @@ fi # Checks for typedefs, structures, and compiler characteristics. @@ -16638,7 +17403,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26067,21 +26574,20 @@ case "(($ac_try" in +@@ -26168,21 +26709,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16663,7 +17428,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no -@@ -26089,22 +26595,22 @@ fi +@@ -26190,22 +26730,22 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -16692,7 +17457,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26129,21 +26635,20 @@ case "(($ac_try" in +@@ -26230,21 +26770,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16717,7 +17482,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -26151,8 +26656,8 @@ fi +@@ -26252,8 +26791,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -16728,7 +17493,7 @@ Index: gtk+-2.12.12/configure cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -26163,21 +26668,20 @@ _ACEOF +@@ -26264,21 +26803,20 @@ _ACEOF for ac_header in stdlib.h unistd.h do @@ -16759,7 +17524,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26193,33 +26697,32 @@ case "(($ac_try" in +@@ -26294,33 +26832,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16800,7 +17565,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26233,52 +26736,51 @@ case "(($ac_try" in +@@ -26334,52 +26871,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16874,7 +17639,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -26287,23 +26789,21 @@ _ASBOX +@@ -26388,24 +26924,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16897,8 +17662,9 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -16906,7 +17672,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -26313,11 +26813,11 @@ done +@@ -26415,11 +26948,11 @@ done for ac_func in getpagesize do @@ -16922,7 +17688,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26370,50 +26870,44 @@ case "(($ac_try" in +@@ -26472,51 +27005,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16962,8 +17728,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -16986,7 +17753,7 @@ Index: gtk+-2.12.12/configure else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no -@@ -26557,39 +27051,36 @@ case "(($ac_try" in +@@ -26660,39 +27186,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17034,7 +17801,7 @@ Index: gtk+-2.12.12/configure if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26603,11 +27094,11 @@ rm -f conftest.mmap +@@ -26706,11 +27229,11 @@ rm -f conftest.mmap for ac_func in mallinfo do @@ -17050,7 +17817,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26660,41 +27151,35 @@ case "(($ac_try" in +@@ -26763,42 +27286,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17090,8 +17857,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -17102,7 +17870,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -26703,11 +27188,11 @@ done +@@ -26807,11 +27323,11 @@ done for ac_func in getresuid do @@ -17118,7 +17886,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26760,50 +27245,44 @@ case "(($ac_try" in +@@ -26864,51 +27380,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17158,8 +17926,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -17182,7 +17951,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26823,8 +27302,8 @@ fi +@@ -26928,8 +27437,8 @@ fi rm -f conftest* fi @@ -17193,7 +17962,7 @@ Index: gtk+-2.12.12/configure if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF -@@ -26840,8 +27319,8 @@ fi +@@ -26945,8 +27454,8 @@ fi # Check if <sys/select.h> needs to be included for fd_set @@ -17204,7 +17973,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26863,21 +27342,20 @@ case "(($ac_try" in +@@ -26968,21 +27477,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17229,7 +17998,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_ok=no -@@ -26885,8 +27363,8 @@ fi +@@ -26990,8 +27498,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gtk_ok = yes; then @@ -17240,7 +18009,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26908,21 +27386,21 @@ rm -f conftest* +@@ -27014,22 +27522,22 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SELECT_H 1 _ACEOF @@ -17249,7 +18018,8 @@ Index: gtk+-2.12.12/configure + { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 +echo "${ECHO_T}yes, found in sys/select.h" >&6; } else - cat >>confdefs.h <<\_ACEOF + + cat >>confdefs.h <<\_ACEOF #define NO_FD_SET 1 _ACEOF @@ -17268,7 +18038,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26936,21 +27414,20 @@ case "(($ac_try" in +@@ -27043,21 +27551,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17293,7 +18063,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 gdk_wchar_h=no -@@ -26964,12 +27441,12 @@ cat >>confdefs.h <<\_ACEOF +@@ -27071,12 +27578,12 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -17310,7 +18080,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26983,21 +27460,20 @@ case "(($ac_try" in +@@ -27090,21 +27597,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17335,7 +18105,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 gdk_wctype_h=no -@@ -27011,15 +27487,15 @@ cat >>confdefs.h <<\_ACEOF +@@ -27118,15 +27624,15 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -17356,7 +18126,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27072,42 +27548,38 @@ case "(($ac_try" in +@@ -27179,42 +27685,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17394,9 +18164,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 -$as_echo "$ac_cv_func_iswalnum" >&6; } +-if test "x$ac_cv_func_iswalnum" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 +echo "${ECHO_T}$ac_cv_func_iswalnum" >&6; } - if test $ac_cv_func_iswalnum = yes; then ++if test $ac_cv_func_iswalnum = yes; then : else - { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 @@ -17409,7 +18180,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lw $LIBS" -@@ -27139,36 +27611,32 @@ case "(($ac_try" in +@@ -27246,37 +27748,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17448,12 +18219,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 -$as_echo "$ac_cv_lib_w_iswalnum" >&6; } +-if test "x$ac_cv_lib_w_iswalnum" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 +echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } - if test $ac_cv_lib_w_iswalnum = yes; then ++if test $ac_cv_lib_w_iswalnum = yes; then GDK_WLIBS=-lw fi -@@ -27179,8 +27647,8 @@ fi + +@@ -27286,8 +27784,8 @@ fi oLIBS="$LIBS" LIBS="$LIBS $GDK_WLIBS" # The following is necessary for Linux libc-5.4.38 @@ -17464,7 +18237,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27215,30 +27683,26 @@ case "(($ac_try" in +@@ -27322,30 +27820,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17500,7 +18273,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$oLIBS" -@@ -27251,13 +27715,13 @@ _ACEOF +@@ -27358,13 +27852,13 @@ _ACEOF GDK_WLIBS= fi @@ -17518,7 +18291,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27271,21 +27735,20 @@ case "(($ac_try" in +@@ -27378,21 +27872,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17543,7 +18316,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_uxtheme_h=no -@@ -27299,28 +27762,27 @@ cat >>confdefs.h <<\_ACEOF +@@ -27406,28 +27899,27 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -17583,7 +18356,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27336,33 +27798,32 @@ case "(($ac_try" in +@@ -27443,33 +27935,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17624,7 +18397,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27376,52 +27837,51 @@ case "(($ac_try" in +@@ -27483,52 +27974,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17698,7 +18471,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27430,23 +27890,21 @@ _ASBOX +@@ -27537,24 +28027,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -17721,8 +18494,9 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_res" >&6; } fi --if test `eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -17730,7 +18504,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -27456,11 +27914,11 @@ done +@@ -27564,11 +28051,11 @@ done for ac_func in _NSGetEnviron do @@ -17746,7 +18520,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27513,41 +27971,35 @@ case "(($ac_try" in +@@ -27621,42 +28108,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17786,8 +18560,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -17798,7 +18573,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -27574,8 +28026,8 @@ _ACEOF +@@ -27683,8 +28163,8 @@ _ACEOF fi @@ -17809,7 +18584,7 @@ Index: gtk+-2.12.12/configure # Check whether --enable-modules was given. if test "${enable_modules+set}" = set; then -@@ -27586,13 +28038,13 @@ fi +@@ -27695,13 +28175,13 @@ fi dynworks=false deps= if test x$enable_modules = xno; then @@ -17829,7 +18604,7 @@ Index: gtk+-2.12.12/configure ## for loop is to strip newline tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` for I in $tmp; do -@@ -27616,11 +28068,11 @@ $as_echo_n "checking whether dynamic mod +@@ -27726,11 +28206,11 @@ cat >>confdefs.h <<\_ACEOF #define USE_GMODULE 1 _ACEOF @@ -17845,9 +18620,20 @@ Index: gtk+-2.12.12/configure fi fi -@@ -27645,10 +28097,10 @@ fi +@@ -27766,9 +28246,7 @@ if test "${enable_gdiplus+set}" = set; t + fi +- +- +-if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then ++ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then + BUILD_GDIPLUS_LOADERS_TRUE= + BUILD_GDIPLUS_LOADERS_FALSE='#' + else +@@ -27779,10 +28257,10 @@ fi + + if test x$os_win32 = xno || test x$enable_gdiplus = xno; then if test x$with_libtiff != xno && test -z "$LIBTIFF"; then - { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 -$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } @@ -17859,7 +18645,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff -lm $LIBS" -@@ -27680,49 +28132,45 @@ case "(($ac_try" in +@@ -27814,49 +28292,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17898,9 +18684,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 -$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } +-if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } - if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then ++if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then if test "${ac_cv_header_tiffio_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 -$as_echo_n "checking for tiffio.h... " >&6; } @@ -17923,7 +18710,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27738,33 +28186,32 @@ case "(($ac_try" in +@@ -27872,33 +28346,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17964,7 +18751,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27778,52 +28225,51 @@ case "(($ac_try" in +@@ -27912,52 +28385,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18038,7 +18825,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27832,30 +28278,30 @@ _ASBOX +@@ -27966,30 +28438,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -18058,7 +18845,8 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi - if test $ac_cv_header_tiffio_h = yes; then +-if test "x$ac_cv_header_tiffio_h" = x""yes; then ++if test $ac_cv_header_tiffio_h = yes; then TIFF='tiff'; LIBTIFF='-ltiff' else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 @@ -18079,7 +18867,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff -ljpeg -lz -lm $LIBS" -@@ -27887,49 +28333,45 @@ case "(($ac_try" in +@@ -28021,49 +28493,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18118,9 +18906,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 -$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } +-if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } - if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then ++if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then if test "${ac_cv_header_tiffio_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 -$as_echo_n "checking for tiffio.h... " >&6; } @@ -18143,7 +18932,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27945,33 +28387,32 @@ case "(($ac_try" in +@@ -28079,33 +28547,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18184,7 +18973,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27985,52 +28426,51 @@ case "(($ac_try" in +@@ -28119,52 +28586,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18258,7 +19047,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28039,30 +28479,30 @@ _ASBOX +@@ -28173,30 +28639,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -18278,7 +19067,8 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi - if test $ac_cv_header_tiffio_h = yes; then +-if test "x$ac_cv_header_tiffio_h" = x""yes; then ++if test $ac_cv_header_tiffio_h = yes; then TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 @@ -18299,7 +19089,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -@@ -28094,49 +28534,45 @@ case "(($ac_try" in +@@ -28228,49 +28694,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18338,9 +19128,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 -$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } +-if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } - if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then ++if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then if test "${ac_cv_header_tiffio_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 -$as_echo_n "checking for tiffio.h... " >&6; } @@ -18363,7 +19154,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28152,33 +28588,32 @@ case "(($ac_try" in +@@ -28286,33 +28748,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18404,7 +19195,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28192,52 +28627,51 @@ case "(($ac_try" in +@@ -28326,52 +28787,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18478,7 +19269,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28246,28 +28680,28 @@ _ASBOX +@@ -28380,28 +28840,28 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -18498,7 +19289,8 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi - if test $ac_cv_header_tiffio_h = yes; then +-if test "x$ac_cv_header_tiffio_h" = x""yes; then ++if test $ac_cv_header_tiffio_h = yes; then TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' else - { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 @@ -18516,7 +19308,7 @@ Index: gtk+-2.12.12/configure fi fi -@@ -28277,11 +28711,11 @@ fi +@@ -28411,11 +28871,11 @@ fi fi if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -18530,9 +19322,9 @@ Index: gtk+-2.12.12/configure *** Checks for TIFF loader failed. You can build without it by passing *** --without-libtiff to configure but some programs using GTK+ may *** not work properly" >&2;} -@@ -28289,10 +28723,10 @@ $as_echo "$as_me: error: - fi +@@ -28425,10 +28885,10 @@ fi + if test x$os_win32 = xno || test x$enable_gdiplus = xno; then if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then - { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } @@ -18544,7 +19336,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -@@ -28324,47 +28758,43 @@ case "(($ac_try" in +@@ -28460,47 +28920,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18583,9 +19375,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } +-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } - if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then ++if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then jpeg_ok=yes else jpeg_ok=no @@ -18603,7 +19396,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28382,35 +28812,34 @@ case "(($ac_try" in +@@ -28518,35 +28974,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18647,7 +19440,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -@@ -28442,59 +28871,55 @@ case "(($ac_try" in +@@ -28578,60 +29033,56 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18686,10 +19479,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } +-if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } - if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then - cat >>confdefs.h <<\_ACEOF ++if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_PROGRESSIVE_JPEG 1 _ACEOF @@ -18720,8 +19515,8 @@ Index: gtk+-2.12.12/configure *** Checks for JPEG loader failed. You can build without it by passing *** --without-libjpeg to configure but some programs using GTK+ may *** not work properly" >&2;} -@@ -28502,21 +28927,21 @@ $as_echo "$as_me: error: - fi +@@ -28640,21 +29091,21 @@ $as_echo "$as_me: error: + fi if test x$with_libpng != xno && test -z "$LIBPNG"; then - { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 @@ -18751,7 +19546,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lpng -lz -lm $LIBS" -@@ -28548,49 +28973,45 @@ case "(($ac_try" in +@@ -28686,49 +29137,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18790,9 +19585,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 -$as_echo "$ac_cv_lib_png_png_read_info" >&6; } +-if test "x$ac_cv_lib_png_png_read_info" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } - if test $ac_cv_lib_png_png_read_info = yes; then ++if test $ac_cv_lib_png_png_read_info = yes; then if test "${ac_cv_header_png_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for png.h" >&5 -$as_echo_n "checking for png.h... " >&6; } @@ -18815,7 +19611,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28606,33 +29027,32 @@ case "(($ac_try" in +@@ -28744,33 +29191,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18856,7 +19652,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28646,52 +29066,51 @@ case "(($ac_try" in +@@ -28784,52 +29230,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18930,7 +19726,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28700,15 +29119,15 @@ _ASBOX +@@ -28838,18 +29283,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -18950,8 +19746,12 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_png_h" >&6; } fi - if test $ac_cv_header_png_h = yes; then -@@ -28719,13 +29138,13 @@ fi +-if test "x$ac_cv_header_png_h" = x""yes; then ++if test $ac_cv_header_png_h = yes; then + png_ok=yes + else + png_ok=no +@@ -28857,13 +29302,13 @@ fi else @@ -18969,7 +19769,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28747,49 +29166,48 @@ case "(($ac_try" in +@@ -28885,49 +29330,48 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19030,7 +19830,79 @@ Index: gtk+-2.12.12/configure *** Checks for PNG loader failed. You can build without it by passing *** --without-libpng to configure but many programs using GTK+ will *** not work properly. The PNG loader is also needed if you are compiling -@@ -28801,9 +29219,7 @@ $as_echo "$as_me: error: +@@ -28936,10 +29380,10 @@ $as_echo "$as_me: error: + fi + + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 +-$as_echo_n "checking for jas_init in -ljasper... " >&6; } ++ { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 ++echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } + if test "${ac_cv_lib_jasper_jas_init+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljasper -ljpeg $LIBS" +@@ -28971,47 +29415,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jasper_jas_init=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jasper_jas_init=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 +-$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } +-if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 ++echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } ++if test $ac_cv_lib_jasper_jas_init = yes; then + LIBJASPER=-ljasper + fi + + fi + + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for JPEG2000 loader failed. You can build without it by passing + *** --without-libjasper to configure" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for JPEG2000 loader failed. You can build without it by passing + *** --without-libjasper to configure" >&2;} + { (exit 1); exit 1; }; } +@@ -29022,9 +29462,7 @@ $as_echo "$as_me: error: @@ -19041,7 +19913,7 @@ Index: gtk+-2.12.12/configure BUILD_DYNAMIC_MODULES_TRUE= BUILD_DYNAMIC_MODULES_FALSE='#' else -@@ -28815,8 +29231,8 @@ fi +@@ -29036,8 +29474,8 @@ fi # # Allow building some or all gdk-pixbuf loaders included # @@ -19052,7 +19924,7 @@ Index: gtk+-2.12.12/configure # Check whether --with-included_loaders was given. -@@ -28843,8 +29259,8 @@ else +@@ -29080,8 +29518,8 @@ else included_loaders="$with_included_loaders" fi @@ -19063,7 +19935,7 @@ Index: gtk+-2.12.12/configure INCLUDED_LOADER_OBJ= INCLUDED_LOADER_DEFINE= -@@ -28854,8 +29270,8 @@ for loader in $included_loaders; do +@@ -29091,8 +29529,8 @@ for loader in $included_loaders; do if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then : else @@ -19074,7 +19946,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi -@@ -28867,9 +29283,7 @@ IFS="$gtk_save_ifs" +@@ -29117,9 +29555,7 @@ IFS="$gtk_save_ifs" @@ -19085,7 +19957,7 @@ Index: gtk+-2.12.12/configure INCLUDE_PNG_TRUE= INCLUDE_PNG_FALSE='#' else -@@ -28877,9 +29291,7 @@ else +@@ -29127,9 +29563,7 @@ else INCLUDE_PNG_FALSE= fi @@ -19096,7 +19968,7 @@ Index: gtk+-2.12.12/configure INCLUDE_BMP_TRUE= INCLUDE_BMP_FALSE='#' else -@@ -28887,9 +29299,7 @@ else +@@ -29137,9 +29571,7 @@ else INCLUDE_BMP_FALSE= fi @@ -19107,7 +19979,7 @@ Index: gtk+-2.12.12/configure INCLUDE_WBMP_TRUE= INCLUDE_WBMP_FALSE='#' else -@@ -28897,9 +29307,7 @@ else +@@ -29147,9 +29579,7 @@ else INCLUDE_WBMP_FALSE= fi @@ -19118,7 +19990,7 @@ Index: gtk+-2.12.12/configure INCLUDE_GIF_TRUE= INCLUDE_GIF_FALSE='#' else -@@ -28907,9 +29315,7 @@ else +@@ -29157,9 +29587,7 @@ else INCLUDE_GIF_FALSE= fi @@ -19129,7 +20001,7 @@ Index: gtk+-2.12.12/configure INCLUDE_ICO_TRUE= INCLUDE_ICO_FALSE='#' else -@@ -28917,9 +29323,7 @@ else +@@ -29167,9 +29595,7 @@ else INCLUDE_ICO_FALSE= fi @@ -19140,7 +20012,7 @@ Index: gtk+-2.12.12/configure INCLUDE_ANI_TRUE= INCLUDE_ANI_FALSE='#' else -@@ -28927,9 +29331,7 @@ else +@@ -29177,9 +29603,7 @@ else INCLUDE_ANI_FALSE= fi @@ -19151,7 +20023,7 @@ Index: gtk+-2.12.12/configure INCLUDE_JPEG_TRUE= INCLUDE_JPEG_FALSE='#' else -@@ -28937,9 +29339,7 @@ else +@@ -29187,9 +29611,7 @@ else INCLUDE_JPEG_FALSE= fi @@ -19162,7 +20034,7 @@ Index: gtk+-2.12.12/configure INCLUDE_PNM_TRUE= INCLUDE_PNM_FALSE='#' else -@@ -28947,9 +29347,7 @@ else +@@ -29197,9 +29619,7 @@ else INCLUDE_PNM_FALSE= fi @@ -19173,7 +20045,7 @@ Index: gtk+-2.12.12/configure INCLUDE_RAS_TRUE= INCLUDE_RAS_FALSE='#' else -@@ -28957,9 +29355,7 @@ else +@@ -29207,9 +29627,7 @@ else INCLUDE_RAS_FALSE= fi @@ -19184,7 +20056,7 @@ Index: gtk+-2.12.12/configure INCLUDE_TIFF_TRUE= INCLUDE_TIFF_FALSE='#' else -@@ -28967,9 +29363,7 @@ else +@@ -29217,9 +29635,7 @@ else INCLUDE_TIFF_FALSE= fi @@ -19195,7 +20067,7 @@ Index: gtk+-2.12.12/configure INCLUDE_XPM_TRUE= INCLUDE_XPM_FALSE='#' else -@@ -28977,9 +29371,7 @@ else +@@ -29227,9 +29643,7 @@ else INCLUDE_XPM_FALSE= fi @@ -19206,7 +20078,7 @@ Index: gtk+-2.12.12/configure INCLUDE_XBM_TRUE= INCLUDE_XBM_FALSE='#' else -@@ -28987,9 +29379,7 @@ else +@@ -29237,9 +29651,7 @@ else INCLUDE_XBM_FALSE= fi @@ -19217,7 +20089,7 @@ Index: gtk+-2.12.12/configure INCLUDE_TGA_TRUE= INCLUDE_TGA_FALSE='#' else -@@ -28997,9 +29387,7 @@ else +@@ -29247,9 +29659,7 @@ else INCLUDE_TGA_FALSE= fi @@ -19228,7 +20100,286 @@ Index: gtk+-2.12.12/configure INCLUDE_PCX_TRUE= INCLUDE_PCX_FALSE='#' else -@@ -29008,10 +29396,10 @@ else +@@ -29257,9 +29667,7 @@ else + INCLUDE_PCX_FALSE= + fi + +- +- +-if test x"$INCLUDE_icns" = xyes; then ++ if test x"$INCLUDE_icns" = xyes; then + INCLUDE_ICNS_TRUE= + INCLUDE_ICNS_FALSE='#' + else +@@ -29267,9 +29675,7 @@ else + INCLUDE_ICNS_FALSE= + fi + +- +- +-if test x"$INCLUDE_jasper" = xyes; then ++ if test x"$INCLUDE_jasper" = xyes; then + INCLUDE_JASPER_TRUE= + INCLUDE_JASPER_FALSE='#' + else +@@ -29279,9 +29685,7 @@ fi + + # As all GDI+ loaders are either built-in or not, arbitrarily just + # check one of the variables here +- +- +-if test x"$INCLUDE_gdip_ico" = xyes; then ++ if test x"$INCLUDE_gdip_ico" = xyes; then + INCLUDE_GDIPLUS_TRUE= + INCLUDE_GDIPLUS_FALSE='#' + else +@@ -29291,20 +29695,18 @@ fi + + + if test x$gio_can_sniff = x; then +- { $as_echo "$as_me:$LINENO: checking if gio can sniff png" >&5 +-$as_echo_n "checking if gio can sniff png... " >&6; } ++ { echo "$as_me:$LINENO: checking if gio can sniff png" >&5 ++echo $ECHO_N "checking if gio can sniff png... $ECHO_C" >&6; } + gtk_save_LIBS="$LIBS" + gtk_save_CFLAGS="$CFLAGS" + LIBS="`$PKG_CONFIG --libs gio-2.0`" + CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" + if test "$cross_compiling" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run test program while cross compiling ++echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29348,21 +29750,19 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gio_can_sniff=yes + +@@ -29371,20 +29771,19 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + gio_can_sniff=no + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + +- { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 +-$as_echo "$gio_can_sniff" >&6; } ++ { echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 ++echo "${ECHO_T}$gio_can_sniff" >&6; } + LIBS="$gtk_save_LIBS" + CFLAGS="$gtk_save_CFLAGS" + fi +@@ -29392,8 +29791,8 @@ fi + # + # Allow building some or all immodules included + # +-{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 +-$as_echo_n "checking immodules to build... " >&6; } ++{ echo "$as_me:$LINENO: checking immodules to build" >&5 ++echo $ECHO_N "checking immodules to build... $ECHO_C" >&6; } + + + # Check whether --with-included_immodules was given. +@@ -29428,11 +29827,9 @@ else + included_immodules="$with_included_immodules" + fi + +-{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 +-$as_echo "$included_immodules" >&6; } +- +- +-if test "x$included_immodules" != x; then ++{ echo "$as_me:$LINENO: result: $included_immodules" >&5 ++echo "${ECHO_T}$included_immodules" >&6; } ++ if test "x$included_immodules" != x; then + HAVE_INCLUDED_IMMMODULES_TRUE= + HAVE_INCLUDED_IMMMODULES_FALSE='#' + else +@@ -29450,8 +29847,8 @@ for immodule in $included_immodules; do + if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then + : + else +- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 +-$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} ++ { { echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 ++echo "$as_me: error: the specified input method $immodule does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -29463,9 +29860,7 @@ IFS="$gtk_save_ifs" + + + +- +- +-if test x"$INCLUDE_am_et" = xyes; then ++ if test x"$INCLUDE_am_et" = xyes; then + INCLUDE_IM_AM_ET_TRUE= + INCLUDE_IM_AM_ET_FALSE='#' + else +@@ -29473,9 +29868,7 @@ else + INCLUDE_IM_AM_ET_FALSE= + fi + +- +- +-if test x"$INCLUDE_cedilla" = xyes; then ++ if test x"$INCLUDE_cedilla" = xyes; then + INCLUDE_IM_CEDILLA_TRUE= + INCLUDE_IM_CEDILLA_FALSE='#' + else +@@ -29483,9 +29876,7 @@ else + INCLUDE_IM_CEDILLA_FALSE= + fi + +- +- +-if test x"$INCLUDE_cyrillic_translit" = xyes; then ++ if test x"$INCLUDE_cyrillic_translit" = xyes; then + INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' + else +@@ -29493,9 +29884,7 @@ else + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= + fi + +- +- +-if test x"$INCLUDE_ime" = xyes; then ++ if test x"$INCLUDE_ime" = xyes; then + INCLUDE_IM_IME_TRUE= + INCLUDE_IM_IME_FALSE='#' + else +@@ -29503,9 +29892,7 @@ else + INCLUDE_IM_IME_FALSE= + fi + +- +- +-if test x"$INCLUDE_inuktitut" = xyes; then ++ if test x"$INCLUDE_inuktitut" = xyes; then + INCLUDE_IM_INUKTITUT_TRUE= + INCLUDE_IM_INUKTITUT_FALSE='#' + else +@@ -29513,9 +29900,7 @@ else + INCLUDE_IM_INUKTITUT_FALSE= + fi + +- +- +-if test x"$INCLUDE_ipa" = xyes; then ++ if test x"$INCLUDE_ipa" = xyes; then + INCLUDE_IM_IPA_TRUE= + INCLUDE_IM_IPA_FALSE='#' + else +@@ -29523,9 +29908,7 @@ else + INCLUDE_IM_IPA_FALSE= + fi + +- +- +-if test x"$INCLUDE_multipress" = xyes; then ++ if test x"$INCLUDE_multipress" = xyes; then + INCLUDE_IM_MULTIPRESS_TRUE= + INCLUDE_IM_MULTIPRESS_FALSE='#' + else +@@ -29533,9 +29916,7 @@ else + INCLUDE_IM_MULTIPRESS_FALSE= + fi + +- +- +-if test x"$INCLUDE_thai" = xyes; then ++ if test x"$INCLUDE_thai" = xyes; then + INCLUDE_IM_THAI_TRUE= + INCLUDE_IM_THAI_FALSE='#' + else +@@ -29543,9 +29924,7 @@ else + INCLUDE_IM_THAI_FALSE= + fi + +- +- +-if test x"$INCLUDE_ti_er" = xyes; then ++ if test x"$INCLUDE_ti_er" = xyes; then + INCLUDE_IM_TI_ER_TRUE= + INCLUDE_IM_TI_ER_FALSE='#' + else +@@ -29553,9 +29932,7 @@ else + INCLUDE_IM_TI_ER_FALSE= + fi + +- +- +-if test x"$INCLUDE_ti_et" = xyes; then ++ if test x"$INCLUDE_ti_et" = xyes; then + INCLUDE_IM_TI_ET_TRUE= + INCLUDE_IM_TI_ET_FALSE='#' + else +@@ -29563,9 +29940,7 @@ else + INCLUDE_IM_TI_ET_FALSE= + fi + +- +- +-if test x"$INCLUDE_viqr" = xyes; then ++ if test x"$INCLUDE_viqr" = xyes; then + INCLUDE_IM_VIQR_TRUE= + INCLUDE_IM_VIQR_FALSE='#' + else +@@ -29573,9 +29948,7 @@ else + INCLUDE_IM_VIQR_FALSE= + fi + +- +- +-if test x"$INCLUDE_xim" = xyes; then ++ if test x"$INCLUDE_xim" = xyes; then + INCLUDE_IM_XIM_TRUE= + INCLUDE_IM_XIM_FALSE='#' + else +@@ -29584,10 +29957,10 @@ else fi @@ -19242,7 +20393,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29044,21 +29432,20 @@ case "(($ac_try" in +@@ -29620,21 +29993,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19267,7 +20418,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_sys_wait_h=no -@@ -29066,8 +29453,8 @@ fi +@@ -29642,8 +30014,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19278,7 +20429,7 @@ Index: gtk+-2.12.12/configure if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -29077,10 +29464,10 @@ _ACEOF +@@ -29653,10 +30025,10 @@ _ACEOF fi @@ -19292,7 +20443,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29105,21 +29492,20 @@ case "(($ac_try" in +@@ -29681,21 +30053,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19317,7 +20468,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -29127,8 +29513,8 @@ fi +@@ -29703,8 +30074,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -19328,7 +20479,7 @@ Index: gtk+-2.12.12/configure cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -29136,9 +29522,7 @@ _ACEOF +@@ -29712,9 +30083,7 @@ _ACEOF @@ -19339,7 +20490,7 @@ Index: gtk+-2.12.12/configure HAVE_TIFF_TRUE= HAVE_TIFF_FALSE='#' else -@@ -29146,9 +29530,7 @@ else +@@ -29722,9 +30091,7 @@ else HAVE_TIFF_FALSE= fi @@ -19350,7 +20501,7 @@ Index: gtk+-2.12.12/configure HAVE_PNG_TRUE= HAVE_PNG_FALSE='#' else -@@ -29156,9 +29538,7 @@ else +@@ -29732,9 +30099,7 @@ else HAVE_PNG_FALSE= fi @@ -19361,7 +20512,18 @@ Index: gtk+-2.12.12/configure HAVE_JPEG_TRUE= HAVE_JPEG_FALSE='#' else -@@ -29186,17 +29566,17 @@ fi +@@ -29742,9 +30107,7 @@ else + HAVE_JPEG_FALSE= + fi + +- +- +-if test "x$LIBJASPER" != x; then ++ if test "x$LIBJASPER" != x; then + HAVE_JASPER_TRUE= + HAVE_JASPER_FALSE='#' + else +@@ -29772,17 +30135,17 @@ fi # support. # if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then @@ -19386,7 +20548,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29212,33 +29592,32 @@ case "(($ac_try" in +@@ -29798,33 +30161,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19427,7 +20589,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29252,52 +29631,51 @@ case "(($ac_try" in +@@ -29838,52 +30200,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19501,7 +20663,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -29306,15 +29684,15 @@ _ASBOX +@@ -29892,18 +30253,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -19521,8 +20683,12 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } fi - if test $ac_cv_header_sys_systeminfo_h = yes; then -@@ -29326,17 +29704,17 @@ fi +-if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then ++if test $ac_cv_header_sys_systeminfo_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SYS_SYSTEMINFO_H 1 +@@ -29913,17 +30274,17 @@ fi if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then @@ -19547,7 +20713,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29352,33 +29730,32 @@ case "(($ac_try" in +@@ -29939,33 +30300,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19588,7 +20754,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29392,52 +29769,51 @@ case "(($ac_try" in +@@ -29979,52 +30339,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19662,7 +20828,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -29446,15 +29822,15 @@ _ASBOX +@@ -30033,18 +30392,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -19682,8 +20848,12 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } fi - if test $ac_cv_header_sys_sysinfo_h = yes; then -@@ -29466,15 +29842,15 @@ fi +-if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then ++if test $ac_cv_header_sys_sysinfo_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SYS_SYSINFO_H 1 +@@ -30054,15 +30413,15 @@ fi @@ -19704,7 +20874,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lmlib $LIBS" -@@ -29506,36 +29882,32 @@ case "(($ac_try" in +@@ -30094,37 +30453,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19743,12 +20913,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 -$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } +-if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 +echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } - if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then ++if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then use_mlib=yes else -@@ -29549,14 +29921,14 @@ _ACEOF + use_mlib=no +@@ -30138,14 +30493,14 @@ _ACEOF MEDIA_LIB=-lmlib @@ -19768,7 +20940,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lmlib $LIBS" -@@ -29588,36 +29960,32 @@ case "(($ac_try" in +@@ -30177,37 +30532,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19807,12 +20979,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 -$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } +-if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 +echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } - if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then ++if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then use_mlib25=yes else -@@ -29631,9 +29999,7 @@ _ACEOF + use_mlib25=no +@@ -30221,9 +30572,7 @@ _ACEOF fi fi @@ -19823,7 +20997,7 @@ Index: gtk+-2.12.12/configure USE_MEDIALIB_TRUE= USE_MEDIALIB_FALSE='#' else -@@ -29641,9 +30007,7 @@ else +@@ -30231,9 +30580,7 @@ else USE_MEDIALIB_FALSE= fi @@ -19834,7 +21008,7 @@ Index: gtk+-2.12.12/configure USE_MEDIALIB25_TRUE= USE_MEDIALIB25_FALSE='#' else -@@ -29658,8 +30022,8 @@ fi +@@ -30248,8 +30595,8 @@ fi # # This code is partially taken from Mesa # @@ -19845,7 +21019,7 @@ Index: gtk+-2.12.12/configure case $host_cpu in i386|i486|i586|i686|i786|k6|k7) use_x86_asm=yes -@@ -29667,21 +30031,21 @@ case $host_cpu in +@@ -30257,21 +30604,21 @@ case $host_cpu in *) use_x86_asm=no esac @@ -19872,7 +21046,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); }; then use_mmx_asm=yes fi -@@ -29694,17 +30058,15 @@ $as_echo_n "checking compiler support fo +@@ -30285,17 +30632,15 @@ cat >>confdefs.h <<\_ACEOF #define USE_MMX 1 _ACEOF @@ -19895,7 +21069,7 @@ Index: gtk+-2.12.12/configure USE_MMX_TRUE= USE_MMX_FALSE='#' else -@@ -29719,9 +30081,7 @@ if test -z "$LIBPNG"; then +@@ -30310,9 +30655,7 @@ if test -z "$LIBPNG" && test x"$os_win32 fi @@ -19906,7 +21080,7 @@ Index: gtk+-2.12.12/configure CROSS_COMPILING_TRUE= CROSS_COMPILING_FALSE='#' else -@@ -29733,10 +30093,10 @@ fi +@@ -30324,10 +30667,10 @@ fi if test $cross_compiling = yes; then # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. set dummy gdk-pixbuf-csource; ac_word=$2 @@ -19920,7 +21094,7 @@ Index: gtk+-2.12.12/configure else case $GDK_PIXBUF_CSOURCE in [\\/]* | ?:[\\/]*) -@@ -29751,7 +30111,7 @@ do +@@ -30342,7 +30685,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" @@ -19929,7 +21103,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -29764,20 +30124,20 @@ esac +@@ -30355,20 +30698,20 @@ esac fi GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE if test -n "$GDK_PIXBUF_CSOURCE"; then @@ -19957,7 +21131,7 @@ Index: gtk+-2.12.12/configure else case $GTK_UPDATE_ICON_CACHE in [\\/]* | ?:[\\/]*) -@@ -29792,7 +30152,7 @@ do +@@ -30383,7 +30726,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" @@ -19966,7 +21140,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -29805,11 +30165,11 @@ esac +@@ -30396,11 +30739,11 @@ esac fi GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE if test -n "$GTK_UPDATE_ICON_CACHE"; then @@ -19982,7 +21156,7 @@ Index: gtk+-2.12.12/configure fi -@@ -29820,11 +30180,11 @@ fi +@@ -30411,11 +30754,11 @@ fi if test ! -f $srcdir/gtk/gtkbuiltincache.h && test "x$REBUILD_PNGS" = "x#" ; then @@ -19996,7 +21170,7 @@ Index: gtk+-2.12.12/configure *** gtkbuiltincache.h is not in the tree, and cannot be built *** because you don't have libpng, or (when cross-compiling) you *** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} -@@ -29861,9 +30221,9 @@ if test "x$gdktarget" = "xx11"; then +@@ -30452,9 +30795,9 @@ if test "x$gdktarget" = "xx11"; then # settings. # if $PKG_CONFIG --exists fontconfig; then : ; else @@ -20008,7 +21182,7 @@ Index: gtk+-2.12.12/configure *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} { (exit 1); exit 1; }; } fi -@@ -29891,8 +30251,8 @@ $as_echo "$as_me: error: +@@ -30482,8 +30825,8 @@ $as_echo "$as_me: error: GTK_PACKAGES_FOR_X="x11" else have_base_x_pc=false @@ -20019,12 +21193,12 @@ Index: gtk+-2.12.12/configure # Check whether --with-x was given. -@@ -29906,11 +30266,11 @@ if test "x$with_x" = xno; then +@@ -30497,11 +30840,11 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( -- *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 --$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;} +- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} { (exit 1); exit 1; }; };; #( @@ -20034,7 +21208,7 @@ Index: gtk+-2.12.12/configure else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -@@ -29931,7 +30291,7 @@ _ACEOF +@@ -30522,7 +30865,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. @@ -20043,7 +21217,16 @@ Index: gtk+-2.12.12/configure if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break -@@ -30006,14 +30366,13 @@ case "(($ac_try" in +@@ -30536,7 +30879,7 @@ _ACEOF + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; ++ /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi +@@ -30597,14 +30940,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20060,7 +21243,7 @@ Index: gtk+-2.12.12/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -30021,7 +30380,7 @@ $as_echo "$ac_try_echo") >&5 +@@ -30612,7 +30954,7 @@ $as_echo "$ac_try_echo") >&5 # We can compile using X headers with no special include directory. ac_x_includes= else @@ -20069,7 +21252,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do -@@ -30062,33 +30421,30 @@ case "(($ac_try" in +@@ -30653,33 +30995,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20110,7 +21293,7 @@ Index: gtk+-2.12.12/configure if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 -@@ -30097,7 +30453,6 @@ do +@@ -30688,7 +31027,6 @@ do done fi @@ -20118,7 +21301,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -@@ -30120,8 +30475,8 @@ fi +@@ -30711,8 +31049,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then @@ -20129,7 +21312,7 @@ Index: gtk+-2.12.12/configure no_x=yes else # If each of the values was on the command line, it overrides each guess. -@@ -30131,8 +30486,8 @@ else +@@ -30722,8 +31060,8 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" @@ -20140,7 +21323,7 @@ Index: gtk+-2.12.12/configure fi if test "$no_x" = yes; then -@@ -30153,8 +30508,8 @@ else +@@ -30744,8 +31082,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . @@ -20151,7 +21334,7 @@ Index: gtk+-2.12.12/configure ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -30179,26 +30534,23 @@ case "(($ac_try" in +@@ -30770,26 +31108,23 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20185,7 +21368,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -30223,38 +30575,33 @@ case "(($ac_try" in +@@ -30814,38 +31149,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20233,7 +21416,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag -@@ -30300,30 +30647,27 @@ case "(($ac_try" in +@@ -30891,30 +31221,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20272,7 +21455,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -@@ -30355,45 +30699,41 @@ case "(($ac_try" in +@@ -30946,45 +31273,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20311,9 +21494,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } - if test $ac_cv_lib_dnet_dnet_ntoa = yes; then ++if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi @@ -20328,7 +21512,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -@@ -30425,36 +30765,32 @@ case "(($ac_try" in +@@ -31016,44 +31339,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20367,12 +21551,13 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } - if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then ++if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi -@@ -30462,7 +30798,6 @@ fi + fi fi @@ -20380,7 +21565,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" -@@ -30475,10 +30810,10 @@ rm -f core conftest.err conftest.$ac_obj +@@ -31066,10 +31384,10 @@ rm -f core conftest.err conftest.$ac_obj # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. @@ -20394,7 +21579,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30531,41 +30866,37 @@ case "(($ac_try" in +@@ -31122,41 +31440,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20446,7 +21631,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -30597,45 +30928,41 @@ case "(($ac_try" in +@@ -31188,45 +31502,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20485,9 +21670,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } - if test $ac_cv_lib_nsl_gethostbyname = yes; then ++if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi @@ -20502,7 +21688,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -@@ -30667,36 +30994,32 @@ case "(($ac_try" in +@@ -31258,37 +31568,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20541,12 +21727,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } - if test $ac_cv_lib_bsd_gethostbyname = yes; then ++if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -@@ -30711,10 +31034,10 @@ fi + +@@ -31302,10 +31608,10 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. @@ -20560,7 +21748,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30767,41 +31090,37 @@ case "(($ac_try" in +@@ -31358,41 +31664,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20612,7 +21800,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -30833,36 +31152,32 @@ case "(($ac_try" in +@@ -31424,47 +31726,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20651,12 +21839,13 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } - if test $ac_cv_lib_socket_connect = yes; then ++if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi -@@ -30870,10 +31185,10 @@ fi + fi # Guillermo Gomez says -lposix is necessary on A/UX. @@ -20670,7 +21859,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30926,41 +31241,37 @@ case "(($ac_try" in +@@ -31517,41 +31815,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20722,7 +21911,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -@@ -30992,36 +31303,32 @@ case "(($ac_try" in +@@ -31583,47 +31877,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20761,12 +21950,13 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } - if test $ac_cv_lib_posix_remove = yes; then ++if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi -@@ -31029,10 +31336,10 @@ fi + fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. @@ -20780,7 +21970,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31085,41 +31392,37 @@ case "(($ac_try" in +@@ -31676,41 +31966,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20832,7 +22022,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -@@ -31151,36 +31454,32 @@ case "(($ac_try" in +@@ -31742,37 +32028,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20871,12 +22061,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } - if test $ac_cv_lib_ipc_shmat = yes; then ++if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -@@ -31197,10 +31496,10 @@ fi + +@@ -31788,10 +32070,10 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry @@ -20890,7 +22082,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -31232,36 +31531,32 @@ case "(($ac_try" in +@@ -31823,37 +32105,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20929,12 +22121,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } - if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then ++if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -@@ -31271,8 +31566,8 @@ fi + +@@ -31862,8 +32140,8 @@ fi fi if test x$no_x = xyes ; then @@ -20945,7 +22139,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi -@@ -31296,10 +31591,10 @@ $as_echo "$as_me: error: X development l +@@ -31887,10 +32165,10 @@ $as_echo "$as_me: error: X development l # Sanity check for the X11 and Xext libraries. While everything we need from # Xext is optional, the chances a system has *none* of these things is so # small that we just unconditionally require it. @@ -20959,7 +22153,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31352,47 +31647,43 @@ case "(($ac_try" in +@@ -31943,47 +32221,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20997,9 +22191,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 -$as_echo "$ac_cv_func_XOpenDisplay" >&6; } +-if test "x$ac_cv_func_XOpenDisplay" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } - if test $ac_cv_func_XOpenDisplay = yes; then ++if test $ac_cv_func_XOpenDisplay = yes; then : else - { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 @@ -21019,7 +22214,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31445,47 +31736,43 @@ case "(($ac_try" in +@@ -32036,47 +32310,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21057,9 +22252,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 -$as_echo "$ac_cv_func_XextFindDisplay" >&6; } +-if test "x$ac_cv_func_XextFindDisplay" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 +echo "${ECHO_T}$ac_cv_func_XextFindDisplay" >&6; } - if test $ac_cv_func_XextFindDisplay = yes; then ++if test $ac_cv_func_XextFindDisplay = yes; then : else - { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 @@ -21079,7 +22275,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31538,48 +31825,44 @@ case "(($ac_try" in +@@ -32129,48 +32399,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21117,9 +22313,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 -$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } +-if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } - if test $ac_cv_func_XRenderQueryExtension = yes; then ++if test $ac_cv_func_XRenderQueryExtension = yes; then : else - { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 @@ -21139,7 +22336,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -31601,22 +31884,21 @@ case "(($ac_try" in +@@ -32192,22 +32458,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21167,7 +22364,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -31641,33 +31923,32 @@ case "(($ac_try" in +@@ -32232,33 +32497,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21210,7 +22407,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } fi -@@ -31682,11 +31963,11 @@ rm -f core conftest.err conftest.$ac_obj +@@ -32273,11 +32537,11 @@ rm -f core conftest.err conftest.$ac_obj for ac_func in XConvertCase XInternAtoms do @@ -21226,7 +22423,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31739,41 +32020,35 @@ case "(($ac_try" in +@@ -32330,42 +32594,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21266,8 +22463,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -21278,7 +22476,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -31786,10 +32061,10 @@ done +@@ -32378,10 +32635,10 @@ done # for clarity have_x11r6=false @@ -21292,7 +22490,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31842,35 +32117,31 @@ case "(($ac_try" in +@@ -32434,36 +32691,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21330,12 +22528,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 -$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } +-if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 +echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } - if test $ac_cv_func_XAddConnectionWatch = yes; then ++if test $ac_cv_func_XAddConnectionWatch = yes; then have_x11r6=true fi -@@ -31883,9 +32154,7 @@ cat >>confdefs.h <<\_ACEOF + +@@ -32475,9 +32728,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -21346,7 +22546,7 @@ Index: gtk+-2.12.12/configure HAVE_X11R6_TRUE= HAVE_X11R6_FALSE='#' else -@@ -31897,17 +32166,17 @@ fi +@@ -32489,18 +32740,18 @@ fi # Check for XKB support. if test "x$enable_xkb" = "xyes"; then @@ -21354,7 +22554,8 @@ Index: gtk+-2.12.12/configure -$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} + { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 +echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} - cat >>confdefs.h <<\_ACEOF + + cat >>confdefs.h <<\_ACEOF #define HAVE_XKB 1 _ACEOF @@ -21369,7 +22570,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31960,35 +32229,31 @@ case "(($ac_try" in +@@ -32553,36 +32804,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21407,12 +22608,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 -$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } +-if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } - if test $ac_cv_func_XkbQueryExtension = yes; then - cat >>confdefs.h <<\_ACEOF ++if test $ac_cv_func_XkbQueryExtension = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_XKB 1 -@@ -31997,16 +32262,16 @@ _ACEOF +@@ -32591,16 +32838,16 @@ _ACEOF fi else @@ -21434,7 +22637,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32059,35 +32324,31 @@ case "(($ac_try" in +@@ -32653,36 +32900,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21472,12 +22675,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 -$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } +-if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 +echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } - if test $ac_cv_func_XShapeCombineMask = yes; then - cat >>confdefs.h <<\_ACEOF ++if test $ac_cv_func_XShapeCombineMask = yes; then + + cat >>confdefs.h <<\_ACEOF #define HAVE_SHAPE_EXT 1 -@@ -32100,10 +32361,10 @@ fi +@@ -32695,10 +32938,10 @@ fi gtk_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $x_cflags" @@ -21491,7 +22696,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32156,40 +32417,36 @@ case "(($ac_try" in +@@ -32751,40 +32994,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21529,11 +22734,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } - if test $ac_cv_func_XSyncQueryExtension = yes; then +-if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 -$as_echo_n "checking for X11/extensions/sync.h... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } ++if test $ac_cv_func_XSyncQueryExtension = yes; then + { echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 +echo $ECHO_N "checking for X11/extensions/sync.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then @@ -21542,7 +22748,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32207,21 +32464,20 @@ case "(($ac_try" in +@@ -32802,21 +33041,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21567,18 +22773,20 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_sync_h=no -@@ -32229,8 +32485,8 @@ fi +@@ -32824,9 +33062,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } - if test $ac_cv_header_X11_extensions_sync_h = yes; then ++if test $ac_cv_header_X11_extensions_sync_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -32251,10 +32507,10 @@ fi + #define HAVE_XSYNC 1 +@@ -32846,10 +33084,10 @@ fi if test "x$enable_shm" = "xyes"; then # Check for the XShm extension, normally in Xext @@ -21592,7 +22800,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32307,43 +32563,39 @@ case "(($ac_try" in +@@ -32902,43 +33140,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21630,9 +22838,10 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 -$as_echo "$ac_cv_func_XShmAttach" >&6; } +-if test "x$ac_cv_func_XShmAttach" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 +echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } - if test $ac_cv_func_XShmAttach = yes; then ++if test $ac_cv_func_XShmAttach = yes; then : else # On AIX, it is in XextSam instead @@ -21646,7 +22855,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lXextSam $LIBS" -@@ -32375,36 +32627,32 @@ case "(($ac_try" in +@@ -32970,37 +33204,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21685,12 +22894,14 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 -$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } +-if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 +echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } - if test $ac_cv_lib_XextSam_XShmAttach = yes; then ++if test $ac_cv_lib_XextSam_XShmAttach = yes; then case "$x_extra_libs " in *-lXextSam[\ \ ]*) ;; -@@ -32420,17 +32668,17 @@ fi + *) x_extra_libs="-lXextSam $x_extra_libs" ;; +@@ -33015,17 +33245,17 @@ fi if test "x$enable_shm" = "xyes"; then # Check for shared memory if test "${ac_cv_header_sys_ipc_h+set}" = set; then @@ -21715,7 +22926,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32446,33 +32694,32 @@ case "(($ac_try" in +@@ -33041,33 +33271,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21756,7 +22967,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32486,52 +32733,51 @@ case "(($ac_try" in +@@ -33081,52 +33310,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21830,7 +23041,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -32540,15 +32786,15 @@ _ASBOX +@@ -33135,18 +33363,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -21850,8 +23061,12 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } fi - if test $ac_cv_header_sys_ipc_h = yes; then -@@ -32562,17 +32808,17 @@ fi +-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then ++if test $ac_cv_header_sys_ipc_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_IPC_H 1 +@@ -33158,17 +33386,17 @@ fi if test "${ac_cv_header_sys_shm_h+set}" = set; then @@ -21876,7 +23091,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32588,33 +32834,32 @@ case "(($ac_try" in +@@ -33184,33 +33412,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21917,7 +23132,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32628,52 +32873,51 @@ case "(($ac_try" in +@@ -33224,52 +33451,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21991,7 +23206,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -32682,15 +32926,15 @@ _ASBOX +@@ -33278,18 +33504,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -22011,8 +23226,12 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } fi - if test $ac_cv_header_sys_shm_h = yes; then -@@ -32706,8 +32950,8 @@ fi +-if test "x$ac_cv_header_sys_shm_h" = x""yes; then ++if test $ac_cv_header_sys_shm_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SHM_H 1 +@@ -33303,8 +33529,8 @@ fi # Check for the X shared memory extension header file have_xshm=no @@ -22023,7 +23242,7 @@ Index: gtk+-2.12.12/configure if test "x$no_xext_lib" = "xyes"; then : else -@@ -32742,21 +32986,20 @@ case "(($ac_try" in +@@ -33339,21 +33565,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22048,7 +23267,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -32765,8 +33008,8 @@ fi +@@ -33362,8 +33587,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gtk_save_CFLAGS" fi @@ -22057,9 +23276,9 @@ Index: gtk+-2.12.12/configure + { echo "$as_me:$LINENO: result: $have_xshm" >&5 +echo "${ECHO_T}$have_xshm" >&6; } if test $have_xshm = yes ; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_XSHM_H 1 -@@ -32783,14 +33026,14 @@ _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -33381,14 +33606,14 @@ _ACEOF case "$host" in *-*-solaris*) # Check for solaris @@ -22079,7 +23298,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32843,40 +33086,36 @@ case "(($ac_try" in +@@ -33441,40 +33666,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22117,11 +23336,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 -$as_echo "$ac_cv_func_XineramaGetInfo" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 -+echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } - if test $ac_cv_func_XineramaGetInfo = yes; then +-if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 -$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 ++echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } ++if test $ac_cv_func_XineramaGetInfo = yes; then + { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then @@ -22130,7 +23350,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32894,21 +33133,20 @@ case "(($ac_try" in +@@ -33492,21 +33713,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22155,18 +23375,20 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_xinerama_h=no -@@ -32916,8 +33154,8 @@ fi +@@ -33514,9 +33734,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } - if test $ac_cv_header_X11_extensions_xinerama_h = yes; then ++if test $ac_cv_header_X11_extensions_xinerama_h = yes; then have_solaris_xinerama=true else -@@ -32937,27 +33175,27 @@ _ACEOF + : +@@ -33537,27 +33757,27 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_XINERAMA 1 _ACEOF @@ -22203,7 +23425,7 @@ Index: gtk+-2.12.12/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $LIBS" -@@ -32989,41 +33227,37 @@ case "(($ac_try" in +@@ -33589,41 +33809,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22242,11 +23464,12 @@ Index: gtk+-2.12.12/configure fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } - if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then +-if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } ++if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then + { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then @@ -22255,7 +23478,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33041,21 +33275,20 @@ case "(($ac_try" in +@@ -33641,21 +33857,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22280,18 +23503,20 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_Xinerama_h=no -@@ -33063,8 +33296,8 @@ fi +@@ -33663,9 +33878,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } - if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then ++if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then case "$x_extra_libs " in *-lXinerama[\ \ ]*) ;; -@@ -33090,11 +33323,11 @@ _ACEOF + *) x_extra_libs="-lXinerama $x_extra_libs" ;; +@@ -33692,11 +33907,11 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_XINERAMA 1 _ACEOF @@ -22307,7 +23532,7 @@ Index: gtk+-2.12.12/configure fi ;; esac -@@ -33124,9 +33357,7 @@ _ACEOF +@@ -33728,9 +33943,7 @@ _ACEOF fi @@ -22318,109 +23543,7 @@ Index: gtk+-2.12.12/configure XINPUT_XFREE_TRUE= XINPUT_XFREE_FALSE='#' else -@@ -33142,10 +33373,10 @@ fi - have_randr=true - X_PACKAGES="$X_PACKAGES xrandr" - else -- { $as_echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5 --$as_echo_n "checking for XRRUpdateConfiguration in -lXrandr... " >&6; } -+ { echo "$as_me:$LINENO: checking for XRRUpdateConfiguration in -lXrandr" >&5 -+echo $ECHO_N "checking for XRRUpdateConfiguration in -lXrandr... $ECHO_C" >&6; } - if test "${ac_cv_lib_Xrandr_XRRUpdateConfiguration+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lXrandr $LIBS" -@@ -33177,41 +33408,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xrandr_XRRUpdateConfiguration=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5 --$as_echo "$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRUpdateConfiguration" >&6; } - if test $ac_cv_lib_Xrandr_XRRUpdateConfiguration = yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 --$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -+echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; } - if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -33229,21 +33456,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_X11_extensions_Xrandr_h=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_X11_extensions_Xrandr_h=no -@@ -33251,8 +33477,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; } - if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then - # RANDR requires RENDER - have_randr=true -@@ -33343,9 +33569,7 @@ _ACEOF +@@ -33810,9 +34023,7 @@ _ACEOF CPPFLAGS="$gtk_save_cppflags" LIBS="$gtk_save_libs" @@ -22431,7 +23554,7 @@ Index: gtk+-2.12.12/configure USE_X11_TRUE= USE_X11_FALSE='#' else -@@ -33354,9 +33578,7 @@ else +@@ -33821,9 +34032,7 @@ else fi else @@ -22442,7 +23565,7 @@ Index: gtk+-2.12.12/configure XINPUT_XFREE_TRUE= XINPUT_XFREE_FALSE='#' else -@@ -33364,9 +33586,7 @@ else +@@ -33831,9 +34040,7 @@ else XINPUT_XFREE_FALSE= fi @@ -22453,7 +23576,7 @@ Index: gtk+-2.12.12/configure USE_X11_TRUE= USE_X11_FALSE='#' else -@@ -33374,9 +33594,7 @@ else +@@ -33841,9 +34048,7 @@ else USE_X11_FALSE= fi @@ -22464,7 +23587,7 @@ Index: gtk+-2.12.12/configure HAVE_X11R6_TRUE= HAVE_X11R6_FALSE='#' else -@@ -33388,9 +33606,7 @@ fi +@@ -33855,9 +34060,7 @@ fi if test "x$gdktarget" = "xwin32"; then GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" @@ -22475,7 +23598,7 @@ Index: gtk+-2.12.12/configure USE_WIN32_TRUE= USE_WIN32_FALSE='#' else -@@ -33399,9 +33615,7 @@ else +@@ -33866,9 +34069,7 @@ else fi else @@ -22486,7 +23609,7 @@ Index: gtk+-2.12.12/configure USE_WIN32_TRUE= USE_WIN32_FALSE='#' else -@@ -33413,9 +33627,7 @@ fi +@@ -33880,9 +34081,7 @@ fi if test "x$gdktarget" = "xquartz"; then GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" @@ -22497,7 +23620,7 @@ Index: gtk+-2.12.12/configure USE_QUARTZ_TRUE= USE_QUARTZ_FALSE='#' else -@@ -33424,9 +33636,7 @@ else +@@ -33891,9 +34090,7 @@ else fi else @@ -22508,14 +23631,14 @@ Index: gtk+-2.12.12/configure USE_QUARTZ_TRUE= USE_QUARTZ_FALSE='#' else -@@ -33446,22 +33656,22 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG +@@ -33913,22 +34110,22 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG if test "x$gdktarget" = "xdirectfb"; then - DIRECTFB_REQUIRED_VERSION=0.9.24 - { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 -$as_echo_n "checking for DirectFB... " >&6; } -+ DIRECTFB_REQUIRED_VERSION=0.9.26 ++ DIRECTFB_REQUIRED_VERSION=1.0.0 + { echo "$as_me:$LINENO: checking for DirectFB" >&5 +echo $ECHO_N "checking for DirectFB... $ECHO_C" >&6; } @@ -22538,7 +23661,7 @@ Index: gtk+-2.12.12/configure *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend *** are required. The latest version of DirectFB is always available *** from http://www.directfb.org/. -@@ -33469,9 +33679,7 @@ $as_echo "$as_me: error: +@@ -33936,9 +34133,7 @@ $as_echo "$as_me: error: { (exit 1); exit 1; }; } fi @@ -22549,7 +23672,7 @@ Index: gtk+-2.12.12/configure USE_DIRECTFB_TRUE= USE_DIRECTFB_FALSE='#' else -@@ -33480,9 +33688,7 @@ else +@@ -33947,9 +34142,7 @@ else fi else @@ -22560,7 +23683,7 @@ Index: gtk+-2.12.12/configure USE_DIRECTFB_TRUE= USE_DIRECTFB_FALSE='#' else -@@ -33501,20 +33707,20 @@ else +@@ -33968,20 +34161,20 @@ else PANGO_PACKAGES="pango pangocairo" fi @@ -22587,7 +23710,7 @@ Index: gtk+-2.12.12/configure *** Pango not found. Pango built with Cairo support is required *** to build GTK+. See http://www.pango.org for Pango information. " >&2;} -@@ -33556,36 +33762,32 @@ case "(($ac_try" in +@@ -34023,36 +34216,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22631,9 +23754,9 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" -@@ -33596,18 +33798,19 @@ LDFLAGS="$saved_ldflags" +@@ -34063,18 +34252,19 @@ LDFLAGS="$saved_ldflags" - GDK_PACKAGES="$PANGO_PACKAGES" + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + GDK_PRIVATE_PACKAGES="$X_PACKAGES" @@ -22655,7 +23778,7 @@ Index: gtk+-2.12.12/configure fi -@@ -33617,25 +33820,26 @@ fi +@@ -34084,25 +34274,26 @@ fi @@ -22688,7 +23811,7 @@ Index: gtk+-2.12.12/configure *** Accessibility Toolkit not found. Accessibility Toolkit is required *** to build GTK+. " >&2;} -@@ -33675,36 +33879,32 @@ case "(($ac_try" in +@@ -34142,36 +34333,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22732,7 +23855,7 @@ Index: gtk+-2.12.12/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" -@@ -33726,7 +33926,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr +@@ -34196,7 +34383,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -22741,7 +23864,265 @@ Index: gtk+-2.12.12/configure fi -@@ -33765,10 +33965,10 @@ if test "x$enable_cups" = "xauto" +@@ -34224,10 +34411,10 @@ fi + ######################## + + old_LIBS="$LIBS" +-{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 +-$as_echo_n "checking for library containing gethostent... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 ++echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } + if test "${ac_cv_search_gethostent+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34265,30 +34452,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_gethostent=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_gethostent+set}" = set; then +@@ -34303,18 +34486,18 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 +-$as_echo "$ac_cv_search_gethostent" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 ++echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } + ac_res=$ac_cv_search_gethostent + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 +-$as_echo_n "checking for library containing setsockopt... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 ++echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } + if test "${ac_cv_search_setsockopt+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34352,30 +34535,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_setsockopt=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_setsockopt+set}" = set; then +@@ -34390,18 +34569,18 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +-$as_echo "$ac_cv_search_setsockopt" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 ++echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } + ac_res=$ac_cv_search_setsockopt + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 +-$as_echo_n "checking for library containing connect... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing connect" >&5 ++echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } + if test "${ac_cv_search_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34439,30 +34618,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_connect=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_connect+set}" = set; then +@@ -34477,8 +34652,8 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 +-$as_echo "$ac_cv_search_connect" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 ++echo "${ECHO_T}$ac_cv_search_connect" >&6; } + ac_res=$ac_cv_search_connect + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +@@ -34486,10 +34661,10 @@ if test "$ac_res" != no; then + fi + + +-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 +-$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; } ++{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 ++echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } + if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -34517,21 +34692,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_sockaddr_un_sun_len=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +@@ -34560,21 +34734,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_sockaddr_un_sun_len=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_sockaddr_un_sun_len=no +@@ -34585,9 +34758,9 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 +-$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } +-if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } ++if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then + struct_sockaddr_un_sun_len=true + else + struct_sockaddr_un_suin_len=false +@@ -34626,10 +34799,10 @@ if test "x$enable_cups" = "xauto" then # Extract the first word of "cups-config", so it can be a program name with args. set dummy cups-config; ac_word=$2 @@ -22755,7 +24136,7 @@ Index: gtk+-2.12.12/configure else case $CUPS_CONFIG in [\\/]* | ?:[\\/]*) -@@ -33783,7 +33983,7 @@ do +@@ -34644,7 +34817,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -22764,7 +24145,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -33796,11 +33996,11 @@ esac +@@ -34657,11 +34830,11 @@ esac fi CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG if test -n "$CUPS_CONFIG"; then @@ -22780,7 +24161,7 @@ Index: gtk+-2.12.12/configure fi -@@ -33826,17 +34026,17 @@ _ACEOF +@@ -34688,17 +34861,17 @@ _ACEOF if test "${ac_cv_header_cups_cups_h+set}" = set; then @@ -22805,7 +24186,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33852,33 +34052,32 @@ case "(($ac_try" in +@@ -34714,33 +34887,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22846,7 +24227,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33892,52 +34091,51 @@ case "(($ac_try" in +@@ -34754,52 +34926,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22920,7 +24301,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33946,30 +34144,28 @@ _ASBOX +@@ -34808,30 +34979,28 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -22940,7 +24321,8 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } fi - if test $ac_cv_header_cups_cups_h = yes; then +-if test "x$ac_cv_header_cups_cups_h" = x""yes; then ++if test $ac_cv_header_cups_cups_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 @@ -22959,7 +24341,7 @@ Index: gtk+-2.12.12/configure HAVE_CUPS_TRUE= HAVE_CUPS_FALSE='#' else -@@ -34001,25 +34197,24 @@ case "(($ac_try" in +@@ -34863,25 +35032,24 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22989,7 +24371,7 @@ Index: gtk+-2.12.12/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -34035,11 +34230,11 @@ rm -f core conftest.err conftest.$ac_obj +@@ -34897,11 +35065,11 @@ rm -f core conftest.err conftest.$ac_obj for ac_func in httpGetAuthString do @@ -23005,7 +24387,7 @@ Index: gtk+-2.12.12/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -34092,41 +34287,35 @@ case "(($ac_try" in +@@ -34954,42 +35122,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23045,8 +24427,9 @@ Index: gtk+-2.12.12/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --if test `eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` = yes; then +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -23057,7 +24440,7 @@ Index: gtk+-2.12.12/configure _ACEOF fi -@@ -34135,9 +34324,7 @@ done +@@ -34998,9 +35159,7 @@ done LIBS="$gtk_save_libs" else @@ -23068,7 +24451,7 @@ Index: gtk+-2.12.12/configure HAVE_CUPS_TRUE= HAVE_CUPS_FALSE='#' else -@@ -34151,17 +34338,17 @@ gtk_save_cppflags="$CPPFLAGS" +@@ -35014,17 +35173,17 @@ gtk_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" if test "${ac_cv_header_cairo_pdf_h+set}" = set; then @@ -23093,7 +24476,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34177,33 +34364,32 @@ case "(($ac_try" in +@@ -35040,33 +35199,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23134,7 +24517,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34217,52 +34403,51 @@ case "(($ac_try" in +@@ -35080,52 +35238,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23208,7 +24591,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -34271,24 +34456,24 @@ _ASBOX +@@ -35134,24 +35291,24 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -23228,7 +24611,8 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } fi - if test $ac_cv_header_cairo_pdf_h = yes; then +-if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then ++if test $ac_cv_header_cairo_pdf_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: @@ -23240,7 +24624,7 @@ Index: gtk+-2.12.12/configure *** Can't find cairo-pdf.h. You must build Cairo with the pdf *** backend enabled." >&2;} { (exit 1); exit 1; }; } -@@ -34298,17 +34483,17 @@ fi +@@ -35161,17 +35318,17 @@ fi if test "$os_win32" != "yes"; then if test "${ac_cv_header_cairo_ps_h+set}" = set; then @@ -23265,7 +24649,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34324,33 +34509,32 @@ case "(($ac_try" in +@@ -35187,33 +35344,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23306,7 +24690,7 @@ Index: gtk+-2.12.12/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34364,52 +34548,51 @@ case "(($ac_try" in +@@ -35227,52 +35383,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23380,7 +24764,7 @@ Index: gtk+-2.12.12/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -34418,24 +34601,24 @@ _ASBOX +@@ -35281,24 +35436,24 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -23400,7 +24784,8 @@ Index: gtk+-2.12.12/configure +echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } fi - if test $ac_cv_header_cairo_ps_h = yes; then +-if test "x$ac_cv_header_cairo_ps_h" = x""yes; then ++if test $ac_cv_header_cairo_ps_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: @@ -23412,7 +24797,7 @@ Index: gtk+-2.12.12/configure *** Can't find cairo-ps.h. You must build Cairo with the *** postscript backend enabled." >&2;} { (exit 1); exit 1; }; } -@@ -34454,9 +34637,7 @@ else +@@ -35317,9 +35472,7 @@ else enable_test_print_backend=no fi @@ -23423,23 +24808,23 @@ Index: gtk+-2.12.12/configure TEST_PRINT_BACKEND_TRUE= TEST_PRINT_BACKEND_FALSE='#' else -@@ -34515,32 +34696,32 @@ fi +@@ -35378,32 +35531,32 @@ fi if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\"") >&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.6") 2>&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then : else -- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&5 --$as_echo "$as_me: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&2;} -+ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&5 -+echo "$as_me: error: You need to have gtk-doc >= 1.6 installed to build gtk-doc" >&2;} +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} ++ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 ++echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} { (exit 1); exit 1; }; } fi fi @@ -23467,7 +24852,7 @@ Index: gtk+-2.12.12/configure else case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) -@@ -34555,7 +34736,7 @@ do +@@ -35418,7 +35571,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" @@ -23476,7 +24861,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -34567,11 +34748,11 @@ esac +@@ -35430,11 +35583,11 @@ esac fi GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then @@ -23492,7 +24877,7 @@ Index: gtk+-2.12.12/configure fi -@@ -34579,9 +34760,7 @@ fi +@@ -35442,9 +35595,7 @@ fi done @@ -23503,7 +24888,7 @@ Index: gtk+-2.12.12/configure ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' else -@@ -34589,9 +34768,7 @@ else +@@ -35452,9 +35603,7 @@ else ENABLE_GTK_DOC_FALSE= fi @@ -23514,7 +24899,7 @@ Index: gtk+-2.12.12/configure GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' else -@@ -34603,10 +34780,10 @@ fi +@@ -35466,10 +35615,10 @@ fi # Extract the first word of "db2html", so it can be a program name with args. set dummy db2html; ac_word=$2 @@ -23528,7 +24913,7 @@ Index: gtk+-2.12.12/configure else if test -n "$DB2HTML"; then ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. -@@ -34619,7 +34796,7 @@ do +@@ -35482,7 +35631,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DB2HTML="true" @@ -23537,7 +24922,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -34631,17 +34808,15 @@ fi +@@ -35494,17 +35643,15 @@ fi fi DB2HTML=$ac_cv_prog_DB2HTML if test -n "$DB2HTML"; then @@ -23560,7 +24945,7 @@ Index: gtk+-2.12.12/configure HAVE_DOCBOOK_TRUE= HAVE_DOCBOOK_FALSE='#' else -@@ -34661,10 +34836,10 @@ fi +@@ -35524,10 +35671,10 @@ fi if test "${enable_man}" != no; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -23574,7 +24959,7 @@ Index: gtk+-2.12.12/configure else case $XSLTPROC in [\\/]* | ?:[\\/]*) -@@ -34679,7 +34854,7 @@ do +@@ -35542,7 +35689,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" @@ -23583,7 +24968,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -34691,11 +34866,11 @@ esac +@@ -35554,11 +35701,11 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -23599,7 +24984,7 @@ Index: gtk+-2.12.12/configure fi -@@ -34716,24 +34891,24 @@ fi +@@ -35579,24 +35726,24 @@ fi jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -23633,7 +25018,7 @@ Index: gtk+-2.12.12/configure else case $XMLCATALOG in [\\/]* | ?:[\\/]*) -@@ -34748,7 +34923,7 @@ do +@@ -35611,7 +35758,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" @@ -23642,7 +25027,7 @@ Index: gtk+-2.12.12/configure break 2 fi done -@@ -34761,11 +34936,11 @@ esac +@@ -35624,11 +35771,11 @@ esac fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -23658,7 +25043,7 @@ Index: gtk+-2.12.12/configure fi -@@ -34780,44 +34955,42 @@ fi +@@ -35643,44 +35790,42 @@ fi fi @@ -23720,12 +25105,12 @@ Index: gtk+-2.12.12/configure ENABLE_MAN_TRUE= ENABLE_MAN_FALSE='#' else -@@ -34864,12 +35037,11 @@ _ACEOF +@@ -35727,12 +35872,11 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac @@ -23735,7 +25120,7 @@ Index: gtk+-2.12.12/configure *) $as_unset $ac_var ;; esac ;; esac -@@ -34902,12 +35074,12 @@ $as_echo "$as_me: WARNING: Cache variabl +@@ -35765,12 +35909,12 @@ $as_echo "$as_me: WARNING: cache variabl if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -23752,7 +25137,7 @@ Index: gtk+-2.12.12/configure fi fi rm -f confcache -@@ -34923,7 +35095,7 @@ ac_ltlibobjs= +@@ -35786,7 +35930,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -23761,7 +25146,7 @@ Index: gtk+-2.12.12/configure # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -34935,384 +35107,404 @@ LTLIBOBJS=$ac_ltlibobjs +@@ -35798,510 +35942,530 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -23890,6 +25275,15 @@ Index: gtk+-2.12.12/configure Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. +echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -24025,6 +25419,150 @@ Index: gtk+-2.12.12/configure Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. +echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -24052,6 +25590,15 @@ Index: gtk+-2.12.12/configure Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. +echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. ++echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -24276,7 +25823,7 @@ Index: gtk+-2.12.12/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -35325,7 +35517,7 @@ ac_cs_silent=false +@@ -36314,7 +36478,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -24285,7 +25832,7 @@ Index: gtk+-2.12.12/configure ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -@@ -35335,7 +35527,7 @@ DUALCASE=1; export DUALCASE # for MKS sh +@@ -36324,7 +36488,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -24294,7 +25841,7 @@ Index: gtk+-2.12.12/configure # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -35357,45 +35549,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE +@@ -36346,45 +36510,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -24349,7 +25896,7 @@ Index: gtk+-2.12.12/configure fi # Support unset when possible. -@@ -35411,6 +35575,8 @@ fi +@@ -36400,6 +36536,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) @@ -24358,7 +25905,7 @@ Index: gtk+-2.12.12/configure IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -@@ -35433,7 +35599,7 @@ if test "x$as_myself" = x; then +@@ -36422,7 +36560,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then @@ -24367,7 +25914,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; } fi -@@ -35446,10 +35612,17 @@ PS2='> ' +@@ -36435,10 +36573,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. @@ -24389,7 +25936,7 @@ Index: gtk+-2.12.12/configure # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -35471,7 +35644,7 @@ as_me=`$as_basename -- "$0" || +@@ -36460,7 +36605,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || @@ -24398,7 +25945,7 @@ Index: gtk+-2.12.12/configure sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q -@@ -35522,7 +35695,7 @@ $as_unset CDPATH +@@ -36511,7 +36656,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -24407,7 +25954,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems -@@ -35550,6 +35723,7 @@ case `echo -n x` in +@@ -36539,6 +36684,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac @@ -24415,7 +25962,7 @@ Index: gtk+-2.12.12/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -35562,22 +35736,19 @@ if test -d conf$$.dir; then +@@ -36551,22 +36697,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir @@ -24449,7 +25996,7 @@ Index: gtk+-2.12.12/configure else as_ln_s='cp -p' fi -@@ -35602,10 +35773,10 @@ else +@@ -36591,10 +36734,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then @@ -24462,28 +26009,34 @@ Index: gtk+-2.12.12/configure esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -35628,7 +35799,7 @@ exec 6>&1 +@@ -36617,7 +36760,7 @@ exec 6>&1 # values after options handling. ac_log=" - This file was extended by gtk+ $as_me 2.12.12, which was --generated by GNU Autoconf 2.62. Invocation command line was + This file was extended by gtk+ $as_me 2.14.7, which was +-generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -35641,15 +35812,15 @@ on `(hostname || uname -n) 2>/dev/null | +@@ -36630,16 +36773,7 @@ on `(hostname || uname -n) 2>/dev/null | _ACEOF +-case $ac_config_files in *" +-"*) set x $ac_config_files; shift; ac_config_files=$*;; +-esac +- +-case $ac_config_headers in *" +-"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +-esac +- +- -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. --config_files="`echo $ac_config_files`" --config_headers="`echo $ac_config_headers`" --config_commands="`echo $ac_config_commands`" -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" + config_files="$ac_config_files" + config_headers="$ac_config_headers" +@@ -36647,23 +36781,22 @@ config_commands="$ac_config_commands" _ACEOF @@ -24492,27 +26045,37 @@ Index: gtk+-2.12.12/configure ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -@@ -35662,9 +35833,9 @@ Usage: $0 [OPTIONS] [FILE]... + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +- -q, --quiet, --silent +- do not print progress messages ++ -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] +- --file=FILE[:TEMPLATE] - instantiate the configuration file FILE -+ instantiate the configuration file FILE - --header=FILE[:TEMPLATE] +- --header=FILE[:TEMPLATE] - instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files -@@ -35678,25 +35849,25 @@ $config_commands +@@ -36677,25 +36810,25 @@ $config_commands Report bugs to <bug-autoconf@gnu.org>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ - gtk+ config.status 2.12.12 --configured by $0, generated by GNU Autoconf 2.62, + gtk+ config.status 2.14.7 +-configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -24538,7 +26101,7 @@ Index: gtk+-2.12.12/configure ac_need_defaults=: while test $# != 0 do -@@ -35718,36 +35889,30 @@ do +@@ -36717,36 +36850,30 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) @@ -24581,7 +26144,7 @@ Index: gtk+-2.12.12/configure Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -35766,29 +35931,27 @@ if $ac_cs_silent; then +@@ -36765,29 +36892,27 @@ if $ac_cs_silent; then fi _ACEOF @@ -24618,7 +26181,7 @@ Index: gtk+-2.12.12/configure # # INIT-COMMANDS # -@@ -35828,7 +35991,7 @@ fi +@@ -36829,7 +36954,7 @@ fi _ACEOF @@ -24627,7 +26190,7 @@ Index: gtk+-2.12.12/configure # Handling of arguments. for ac_config_target in $ac_config_targets -@@ -35901,8 +36064,8 @@ do +@@ -36910,8 +37035,8 @@ do "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; @@ -24638,7 +26201,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; };; esac done -@@ -35943,143 +36106,493 @@ $debug || +@@ -36952,144 +37077,536 @@ $debug || (umask 077 && mkdir "$tmp") } || { @@ -24740,6 +26303,8 @@ Index: gtk+-2.12.12/configure +GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim +LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim +LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim ++GAIL_LT_VERSION_INFO!$GAIL_LT_VERSION_INFO$ac_delim ++GAIL_LT_CURRENT_MINUS_AGE!$GAIL_LT_CURRENT_MINUS_AGE$ac_delim +GDK_PIXBUF_MAJOR!$GDK_PIXBUF_MAJOR$ac_delim +GDK_PIXBUF_MINOR!$GDK_PIXBUF_MINOR$ac_delim +GDK_PIXBUF_MICRO!$GDK_PIXBUF_MICRO$ac_delim @@ -24753,6 +26318,7 @@ Index: gtk+-2.12.12/configure +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim ++LIB_EXE_MACHINE_FLAG!$LIB_EXE_MACHINE_FLAG$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim @@ -24765,9 +26331,6 @@ Index: gtk+-2.12.12/configure +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -24823,12 +26386,15 @@ Index: gtk+-2.12.12/configure -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + cat >conf$$subs.sed <<_ACEOF ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim +ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim +CXX!$CXX$ac_delim -+CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim @@ -24909,20 +26475,18 @@ Index: gtk+-2.12.12/configure +GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim +GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim +GDK_WLIBS!$GDK_WLIBS$ac_delim ++BUILD_GDIPLUS_LOADERS_TRUE!$BUILD_GDIPLUS_LOADERS_TRUE$ac_delim ++BUILD_GDIPLUS_LOADERS_FALSE!$BUILD_GDIPLUS_LOADERS_FALSE$ac_delim +LIBTIFF!$LIBTIFF$ac_delim +LIBJPEG!$LIBJPEG$ac_delim +LIBPNG!$LIBPNG$ac_delim ++LIBJASPER!$LIBJASPER$ac_delim +BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim +BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim -+INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim -+INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim -+INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim -+INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim -+INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim -+INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim +_ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then +- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` +- if test $ac_delim_n = $ac_delim_num; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then break elif $ac_last_try; then @@ -25035,6 +26599,12 @@ Index: gtk+-2.12.12/configure +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim +INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim +INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim @@ -25059,12 +26629,48 @@ Index: gtk+-2.12.12/configure +INCLUDE_TGA_FALSE!$INCLUDE_TGA_FALSE$ac_delim +INCLUDE_PCX_TRUE!$INCLUDE_PCX_TRUE$ac_delim +INCLUDE_PCX_FALSE!$INCLUDE_PCX_FALSE$ac_delim ++INCLUDE_ICNS_TRUE!$INCLUDE_ICNS_TRUE$ac_delim ++INCLUDE_ICNS_FALSE!$INCLUDE_ICNS_FALSE$ac_delim ++INCLUDE_JASPER_TRUE!$INCLUDE_JASPER_TRUE$ac_delim ++INCLUDE_JASPER_FALSE!$INCLUDE_JASPER_FALSE$ac_delim ++INCLUDE_GDIPLUS_TRUE!$INCLUDE_GDIPLUS_TRUE$ac_delim ++INCLUDE_GDIPLUS_FALSE!$INCLUDE_GDIPLUS_FALSE$ac_delim ++HAVE_INCLUDED_IMMMODULES_TRUE!$HAVE_INCLUDED_IMMMODULES_TRUE$ac_delim ++HAVE_INCLUDED_IMMMODULES_FALSE!$HAVE_INCLUDED_IMMMODULES_FALSE$ac_delim ++INCLUDED_IMMODULE_OBJ!$INCLUDED_IMMODULE_OBJ$ac_delim ++INCLUDED_IMMODULE_DEFINE!$INCLUDED_IMMODULE_DEFINE$ac_delim ++INCLUDE_IM_AM_ET_TRUE!$INCLUDE_IM_AM_ET_TRUE$ac_delim ++INCLUDE_IM_AM_ET_FALSE!$INCLUDE_IM_AM_ET_FALSE$ac_delim ++INCLUDE_IM_CEDILLA_TRUE!$INCLUDE_IM_CEDILLA_TRUE$ac_delim ++INCLUDE_IM_CEDILLA_FALSE!$INCLUDE_IM_CEDILLA_FALSE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE!$INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE!$INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$ac_delim ++INCLUDE_IM_IME_TRUE!$INCLUDE_IM_IME_TRUE$ac_delim ++INCLUDE_IM_IME_FALSE!$INCLUDE_IM_IME_FALSE$ac_delim ++INCLUDE_IM_INUKTITUT_TRUE!$INCLUDE_IM_INUKTITUT_TRUE$ac_delim ++INCLUDE_IM_INUKTITUT_FALSE!$INCLUDE_IM_INUKTITUT_FALSE$ac_delim ++INCLUDE_IM_IPA_TRUE!$INCLUDE_IM_IPA_TRUE$ac_delim ++INCLUDE_IM_IPA_FALSE!$INCLUDE_IM_IPA_FALSE$ac_delim ++INCLUDE_IM_MULTIPRESS_TRUE!$INCLUDE_IM_MULTIPRESS_TRUE$ac_delim ++INCLUDE_IM_MULTIPRESS_FALSE!$INCLUDE_IM_MULTIPRESS_FALSE$ac_delim ++INCLUDE_IM_THAI_TRUE!$INCLUDE_IM_THAI_TRUE$ac_delim ++INCLUDE_IM_THAI_FALSE!$INCLUDE_IM_THAI_FALSE$ac_delim ++INCLUDE_IM_TI_ER_TRUE!$INCLUDE_IM_TI_ER_TRUE$ac_delim ++INCLUDE_IM_TI_ER_FALSE!$INCLUDE_IM_TI_ER_FALSE$ac_delim ++INCLUDE_IM_TI_ET_TRUE!$INCLUDE_IM_TI_ET_TRUE$ac_delim ++INCLUDE_IM_TI_ET_FALSE!$INCLUDE_IM_TI_ET_FALSE$ac_delim ++INCLUDE_IM_VIQR_TRUE!$INCLUDE_IM_VIQR_TRUE$ac_delim ++INCLUDE_IM_VIQR_FALSE!$INCLUDE_IM_VIQR_FALSE$ac_delim ++INCLUDE_IM_XIM_TRUE!$INCLUDE_IM_XIM_TRUE$ac_delim ++INCLUDE_IM_XIM_FALSE!$INCLUDE_IM_XIM_FALSE$ac_delim +HAVE_TIFF_TRUE!$HAVE_TIFF_TRUE$ac_delim +HAVE_TIFF_FALSE!$HAVE_TIFF_FALSE$ac_delim +HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim +HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim +HAVE_JPEG_TRUE!$HAVE_JPEG_TRUE$ac_delim +HAVE_JPEG_FALSE!$HAVE_JPEG_FALSE$ac_delim ++HAVE_JASPER_TRUE!$HAVE_JASPER_TRUE$ac_delim ++HAVE_JASPER_FALSE!$HAVE_JASPER_FALSE$ac_delim +USE_MEDIALIB_TRUE!$USE_MEDIALIB_TRUE$ac_delim +USE_MEDIALIB_FALSE!$USE_MEDIALIB_FALSE$ac_delim +USE_MEDIALIB25_TRUE!$USE_MEDIALIB25_TRUE$ac_delim @@ -25090,48 +26696,6 @@ Index: gtk+-2.12.12/configure +USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim +USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim +USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim -+USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim -+GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim -+GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim -+USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim -+USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim -+GDK_PACKAGES!$GDK_PACKAGES$ac_delim -+GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim -+GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim -+GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim -+GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim -+GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim -+GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim -+GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim -+GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim -+GTK_PACKAGES!$GTK_PACKAGES$ac_delim -+GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim -+GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim -+GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim -+GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim -+GLIB_PREFIX!$GLIB_PREFIX$ac_delim -+ATK_PREFIX!$ATK_PREFIX$ac_delim -+PANGO_PREFIX!$PANGO_PREFIX$ac_delim -+CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim -+GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim -+GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim -+CUPS_CONFIG!$CUPS_CONFIG$ac_delim -+CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim -+CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim -+CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim -+CUPS_LIBS!$CUPS_LIBS$ac_delim -+HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim -+HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim -+HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim -+TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim -+TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim -+HTML_DIR!$HTML_DIR$ac_delim -+GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim +_ACEOF -_ACAWK @@ -25182,6 +26746,49 @@ Index: gtk+-2.12.12/configure +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim ++USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim ++GDK_PACKAGES!$GDK_PACKAGES$ac_delim ++GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim ++GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim ++GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim ++GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim ++GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim ++GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim ++GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim ++GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim ++GTK_PACKAGES!$GTK_PACKAGES$ac_delim ++GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim ++GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim ++GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim ++GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim ++GLIB_PREFIX!$GLIB_PREFIX$ac_delim ++ATK_PREFIX!$ATK_PREFIX$ac_delim ++PANGO_PREFIX!$PANGO_PREFIX$ac_delim ++CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim ++GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim ++GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim ++GAIL_INET_LIBS!$GAIL_INET_LIBS$ac_delim ++CUPS_CONFIG!$CUPS_CONFIG$ac_delim ++CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim ++CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim ++CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim ++CUPS_LIBS!$CUPS_LIBS$ac_delim ++HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim ++HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim ++HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim ++TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim ++TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim ++HTML_DIR!$HTML_DIR$ac_delim ++GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim +ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim +ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim +GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim @@ -25198,7 +26805,7 @@ Index: gtk+-2.12.12/configure +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -25239,7 +26846,7 @@ Index: gtk+-2.12.12/configure # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty -@@ -36095,133 +36608,19 @@ s/^[^=]*=[ ]*$// +@@ -37105,133 +37622,19 @@ s/^[^=]*=[ ]*$// }' fi @@ -25370,14 +26977,14 @@ Index: gtk+-2.12.12/configure esac case $ac_mode$ac_tag in :[FHL]*:*);; -- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 --$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;} +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -36250,38 +36649,26 @@ $as_echo "$as_me: error: Invalid tag $ac +@@ -37260,38 +37663,26 @@ $as_echo "$as_me: error: invalid tag $ac [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -25424,7 +27031,7 @@ Index: gtk+-2.12.12/configure esac ;; esac -@@ -36291,7 +36678,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ +@@ -37301,7 +37692,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || @@ -25433,7 +27040,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -36317,7 +36704,7 @@ $as_echo X"$ac_file" | +@@ -37327,7 +37718,7 @@ $as_echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( @@ -25442,7 +27049,7 @@ Index: gtk+-2.12.12/configure *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -36326,7 +36713,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ +@@ -37336,7 +37727,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -25451,7 +27058,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -36347,17 +36734,17 @@ $as_echo X"$as_dir" | +@@ -37357,17 +37748,17 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -25473,7 +27080,7 @@ Index: gtk+-2.12.12/configure case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -36395,15 +36782,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ +@@ -37405,15 +37796,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac @@ -25496,7 +27103,7 @@ Index: gtk+-2.12.12/configure p q } -@@ -36412,14 +36803,13 @@ ac_sed_dataroot=' +@@ -37422,14 +37817,13 @@ ac_sed_dataroot=' /@infodir@/p /@localedir@/p /@mandir@/p @@ -25515,7 +27122,7 @@ Index: gtk+-2.12.12/configure ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g -@@ -36433,16 +36823,15 @@ _ACEOF +@@ -37443,16 +37837,15 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? @@ -25536,7 +27143,7 @@ Index: gtk+-2.12.12/configure s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -36451,75 +36840,138 @@ s&@builddir@&$ac_builddir&;t t +@@ -37461,75 +37854,138 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t @@ -25716,7 +27323,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -36539,8 +36991,8 @@ $as_echo X"$ac_file" | +@@ -37549,8 +38005,8 @@ $as_echo X"$ac_file" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -25727,7 +27334,7 @@ Index: gtk+-2.12.12/configure ;; esac -@@ -36554,14 +37006,15 @@ $as_echo "$as_me: executing $ac_file com +@@ -37564,14 +38020,15 @@ $as_echo "$as_me: executing $ac_file com # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -25746,7 +27353,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -36582,27 +37035,21 @@ $as_echo X"$mf" | +@@ -37592,27 +38049,21 @@ $as_echo X"$mf" | else continue fi @@ -25787,7 +27394,7 @@ Index: gtk+-2.12.12/configure sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue -@@ -36611,7 +37058,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ +@@ -37621,7 +38072,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || @@ -25796,7 +27403,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -36637,7 +37084,7 @@ $as_echo X"$file" | +@@ -37647,7 +38098,7 @@ $as_echo X"$file" | as_dirs= while :; do case $as_dir in #( @@ -25805,7 +27412,7 @@ Index: gtk+-2.12.12/configure *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -36646,7 +37093,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ +@@ -37656,7 +38107,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -25814,7 +27421,7 @@ Index: gtk+-2.12.12/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -36667,8 +37114,8 @@ $as_echo X"$as_dir" | +@@ -37677,8 +38128,8 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -25825,7 +27432,7 @@ Index: gtk+-2.12.12/configure { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" -@@ -36714,8 +37161,8 @@ _______EOF +@@ -37733,8 +38184,8 @@ _______EOF if cmp -s $outfile gdk/gdkconfig.h; then @@ -25836,7 +27443,7 @@ Index: gtk+-2.12.12/configure rm -f $outfile else mv $outfile gdk/gdkconfig.h -@@ -36731,11 +37178,6 @@ _ACEOF +@@ -37750,11 +38201,6 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save @@ -25848,21 +27455,21 @@ Index: gtk+-2.12.12/configure # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -36757,10 +37199,6 @@ if test "$no_create" != yes; then +@@ -37776,10 +38222,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -- { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 --$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi echo "configuration: -Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in +Index: gtk+-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in 2008-12-09 21:03:24.169214522 +0100 +--- gtk+-2.14.7.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2009-02-17 23:15:21.951084263 +0100 ++++ gtk+-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in 2009-02-21 14:58:40.582582121 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -25875,9 +27482,9 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,13 @@ +@@ -16,16 +16,13 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -25894,16 +27501,17 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +32,64 @@ POST_INSTALL = : +@@ -37,10 +34,65 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = contrib/gdk-pixbuf-xlib +DIST_COMMON = $(libgdk_pixbuf_xlibinclude_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/gdk-pixbuf-xlib-2.0.pc.in ChangeLog ++ $(srcdir)/gdk-pixbuf-xlib-2.0.pc.in \ ++ $(top_srcdir)/Makefile.decl ChangeLog ++subdir = contrib/gdk-pixbuf-xlib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -25961,12 +27569,14 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +100,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -25983,7 +27593,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +125,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -25992,7 +27602,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +132,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -26003,7 +27613,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -26011,7 +27621,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -26020,7 +27630,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +184,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -26031,6 +27641,10 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -26042,16 +27656,48 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -26077,7 +27723,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -26103,7 +27749,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -26112,7 +27758,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +239,10 @@ SED = @SED@ +@@ -297,28 +249,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -26141,7 +27787,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -26171,7 +27817,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +292,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -26179,15 +27825,24 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,12 +301,13 @@ program_transform_name = @program_transf +@@ -373,9 +311,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,29 +346,23 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - lib_LTLIBRARIES = libgdk_pixbuf_xlib-2.0.la @@ -26195,8 +27850,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in INCLUDES = \ -I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir)/gdk-pixbuf \ -@@ -341,18 +315,15 @@ INCLUDES = \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -I$(top_srcdir)/contrib \ $(GDK_PIXBUF_XLIB_DEP_CFLAGS) - @@ -26214,7 +27868,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ gdk-pixbuf-xlib.c \ -@@ -360,101 +331,81 @@ libgdk_pixbuf_xlib_2_0_la_SOURCES = \ +@@ -436,99 +370,80 @@ libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-drawable.c \ gdk-pixbuf-xlibrgb.c @@ -26228,8 +27882,6 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc -- - EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in -subdir = contrib/gdk-pixbuf-xlib -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -26265,16 +27917,16 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in -HEADERS = $(libgdk_pixbuf_xlibinclude_HEADERS) - -DIST_COMMON = $(libgdk_pixbuf_xlibinclude_HEADERS) \ -- $(srcdir)/Makefile.in ChangeLog Makefile.am \ -- gdk-pixbuf-xlib-2.0.pc.in +- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog \ +- Makefile.am gdk-pixbuf-xlib-2.0.pc.in -SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -26354,7 +28006,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -465,100 +416,75 @@ distclean-compile: +@@ -539,100 +454,75 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo@am__quote@ .c.o: @@ -26484,7 +28136,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -568,23 +494,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -642,23 +532,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -26517,7 +28169,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -596,28 +522,23 @@ GTAGS: +@@ -670,29 +560,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -26527,6 +28179,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -26559,8 +28212,8 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -631,9 +552,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -707,9 +591,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - @@ -26572,7 +28225,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -653,7 +575,7 @@ mostlyclean-generic: +@@ -729,7 +614,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -26581,7 +28234,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -667,12 +589,14 @@ distclean: distclean-am +@@ -743,12 +628,14 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -26597,7 +28250,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in info: info-am info-am: -@@ -680,12 +604,20 @@ info-am: +@@ -756,12 +643,20 @@ info-am: install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \ install-pkgconfigDATA @@ -26618,7 +28271,7 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -706,23 +638,27 @@ ps: ps-am +@@ -782,23 +677,27 @@ ps: ps-am ps-am: @@ -26629,9 +28282,9 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in +.MAKE: install-am install-strip + - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ @@ -26642,11 +28295,12 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libLTLIBRARIES \ + install-libgdk_pixbuf_xlibincludeHEADERS install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ @@ -26657,10 +28311,10 @@ Index: gtk+-2.12.12/contrib/gdk-pixbuf-xlib/Makefile.in uninstall-libgdk_pixbuf_xlibincludeHEADERS \ uninstall-pkgconfigDATA -Index: gtk+-2.12.12/contrib/Makefile.in +Index: gtk+-2.14.7/contrib/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/contrib/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/contrib/Makefile.in 2008-12-09 21:03:23.993217433 +0100 +--- gtk+-2.14.7.orig/contrib/Makefile.in 2009-02-17 23:15:21.935083906 +0100 ++++ gtk+-2.14.7/contrib/Makefile.in 2009-02-21 14:58:40.374581872 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -26673,10 +28327,10 @@ Index: gtk+-2.12.12/contrib/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -26691,15 +28345,16 @@ Index: gtk+-2.12.12/contrib/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,11 +29,35 @@ POST_INSTALL = : +@@ -37,11 +31,36 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl @USE_X11_TRUE@am__append_1 = gdk-pixbuf-xlib +subdir = contrib -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -26729,12 +28384,14 @@ Index: gtk+-2.12.12/contrib/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -50,20 +68,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -26751,7 +28408,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -78,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -26760,7 +28417,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -87,10 +100,6 @@ ECHO_C = @ECHO_C@ +@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -26771,7 +28428,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -114,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -26779,7 +28436,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -132,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -26788,7 +28445,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -144,55 +152,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -26799,6 +28456,10 @@ Index: gtk+-2.12.12/contrib/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -26810,16 +28471,48 @@ Index: gtk+-2.12.12/contrib/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -26845,7 +28538,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -212,24 +177,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -26871,7 +28564,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -240,8 +196,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -26880,7 +28573,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -253,28 +207,10 @@ SED = @SED@ +@@ -298,28 +217,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -26909,7 +28602,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -283,22 +219,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -26939,7 +28632,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -321,6 +260,7 @@ libexecdir = @libexecdir@ +@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -26947,7 +28640,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -329,32 +269,44 @@ program_transform_name = @program_transf +@@ -374,9 +279,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -26957,6 +28650,14 @@ Index: gtk+-2.12.12/contrib/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -407,31 +314,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- SUBDIRS = $(am__append_1) -subdir = contrib -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -26970,13 +28671,14 @@ Index: gtk+-2.12.12/contrib/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -DIST_SUBDIRS = gdk-pixbuf-xlib all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -27010,7 +28712,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -362,10 +314,6 @@ mostlyclean-libtool: +@@ -439,10 +354,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -27021,7 +28723,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -373,7 +321,13 @@ uninstall-info-am: +@@ -450,7 +361,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -27036,7 +28738,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -385,15 +339,20 @@ $(RECURSIVE_TARGETS): +@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -27061,7 +28763,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -414,7 +373,7 @@ maintainer-clean-recursive: +@@ -491,7 +413,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -27070,7 +28772,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -425,35 +384,30 @@ ctags-recursive: +@@ -502,35 +424,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -27113,7 +28815,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -461,23 +415,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -27146,7 +28848,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -489,28 +443,23 @@ GTAGS: +@@ -566,29 +483,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -27156,6 +28858,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -27188,7 +28891,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -523,13 +472,17 @@ distdir: $(DISTFILES) +@@ -601,13 +512,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -27210,7 +28913,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -539,7 +492,6 @@ check: check-recursive +@@ -618,7 +533,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -27218,7 +28921,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -559,7 +511,7 @@ mostlyclean-generic: +@@ -638,7 +552,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -27227,7 +28930,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -570,25 +522,34 @@ clean-am: clean-generic clean-libtool mo +@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -27264,7 +28967,7 @@ Index: gtk+-2.12.12/contrib/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -607,26 +568,24 @@ ps: ps-recursive +@@ -686,26 +609,24 @@ ps: ps-recursive ps-am: @@ -27275,12 +28978,12 @@ Index: gtk+-2.12.12/contrib/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -27292,25 +28995,25 @@ Index: gtk+-2.12.12/contrib/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/demos/gtk-demo/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/demos/gtk-demo/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/demos/gtk-demo/Makefile.in 2008-12-09 21:03:24.473215450 +0100 +--- gtk+-2.14.7.orig/demos/gtk-demo/Makefile.in 2009-02-17 23:15:21.927082260 +0100 ++++ gtk+-2.14.7/demos/gtk-demo/Makefile.in 2009-02-21 14:58:40.950582034 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -27323,9 +29026,9 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -27341,16 +29044,16 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,65 @@ POST_INSTALL = : +@@ -37,10 +33,65 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl +bin_PROGRAMS = gtk-demo$(EXEEXT) +subdir = demos/gtk-demo -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/geninclude.pl.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -27409,12 +29112,14 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +100,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +102,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -27431,7 +29136,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +125,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +127,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -27440,7 +29145,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +132,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +134,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -27451,7 +29156,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +160,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -27459,7 +29164,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +179,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -27468,7 +29173,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +184,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +189,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -27479,6 +29184,10 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -27490,16 +29199,48 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -27525,7 +29266,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +218,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -27551,7 +29292,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +237,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -27560,7 +29301,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +239,10 @@ SED = @SED@ +@@ -297,28 +248,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -27589,7 +29330,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +260,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -27619,7 +29360,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +292,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +301,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -27627,7 +29368,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,11 +301,12 @@ program_transform_name = @program_transf +@@ -373,17 +310,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -27637,21 +29378,38 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- $(IMAGEFILES) \ +- demo.ui +- ++EXTRA_DIST = $(IMAGEFILES) demo.ui + TEST_PROGS = + + ### testing rules +@@ -409,9 +345,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- democodedir = $(datadir)/gtk-2.0/demo - demos = \ appwindow.c \ assistant.c \ -@@ -365,7 +339,6 @@ demos = \ +@@ -444,7 +378,6 @@ demos = \ tree_store.c \ ui_manager.c - INCLUDES = \ - -DDEMOCODEDIR="\"$(democodedir)\"" \ - -I$(top_srcdir) \ -@@ -376,39 +349,30 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ + -DDEMOCODEDIR="\"$(democodedir)\"" \ + -I$(top_srcdir) \ +@@ -454,34 +387,26 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) - @@ -27670,11 +29428,6 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in -bin_PROGRAMS = gtk-demo - BUILT_SOURCES = demos.h -- - EXTRA_DIST = \ - $(IMAGEFILES) \ - demo.ui - - gtk_demo_SOURCES = \ $(demos) \ @@ -27690,7 +29443,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in IMAGEFILES = alphatest.png \ apple-red.png \ background.jpg \ -@@ -424,92 +388,55 @@ IMAGEFILES = alphatest.png \ +@@ -497,93 +422,55 @@ IMAGEFILES = alphatest.png \ gnu-keys.png \ gtk-logo-rgb.gif @@ -27753,7 +29506,8 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in -DIST_SOURCES = $(gtk_demo_SOURCES) -DATA = $(democode_DATA) - --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am geninclude.pl.in +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am geninclude.pl.in -SOURCES = $(gtk_demo_SOURCES) - all: $(BUILT_SOURCES) @@ -27761,8 +29515,8 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -27814,7 +29568,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in else :; fi; \ done -@@ -517,8 +444,8 @@ uninstall-binPROGRAMS: +@@ -591,8 +478,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -27825,7 +29579,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in done clean-binPROGRAMS: -@@ -529,10 +456,10 @@ clean-binPROGRAMS: +@@ -603,10 +490,10 @@ clean-binPROGRAMS: done gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES) @rm -f gtk-demo$(EXEEXT) @@ -27838,7 +29592,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -570,82 +497,58 @@ distclean-compile: +@@ -644,82 +531,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_manager.Po@am__quote@ .c.o: @@ -27943,7 +29697,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -655,23 +558,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -729,23 +592,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -27976,7 +29730,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -683,28 +586,23 @@ GTAGS: +@@ -757,29 +620,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -27986,6 +29740,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -28018,7 +29773,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -719,9 +617,10 @@ check-am: all-am +@@ -795,9 +652,10 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(DATA) @@ -28031,7 +29786,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am -@@ -742,7 +641,7 @@ mostlyclean-generic: +@@ -818,7 +676,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -28040,7 +29795,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -757,24 +656,34 @@ distclean: distclean-am +@@ -833,24 +691,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -28076,7 +29831,7 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -795,20 +704,24 @@ ps: ps-am +@@ -871,21 +739,24 @@ ps: ps-am ps-am: @@ -28086,35 +29841,36 @@ Index: gtk+-2.12.12/demos/gtk-demo/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ -- dvi-am info info-am install install-am install-binPROGRAMS \ -- install-data install-data-am install-democodeDATA install-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -- pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-democodeDATA uninstall-info-am -+ dvi-am html html-am info info-am install install-am \ -+ install-binPROGRAMS install-data install-data-am \ -+ install-democodeDATA install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am uninstall-binPROGRAMS \ -+ uninstall-democodeDATA + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-binPROGRAMS clean-generic clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-binPROGRAMS install-data install-data-am \ +- install-democodeDATA install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-democodeDATA uninstall-info-am ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binPROGRAMS install-data \ ++ install-data-am install-democodeDATA install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-democodeDATA + # call as: $(XVFB_START) && someprogram - demos.h: @REBUILD@ $(demos) geninclude.pl -Index: gtk+-2.12.12/demos/Makefile.in +Index: gtk+-2.14.7/demos/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/demos/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/demos/Makefile.in 2008-12-09 21:03:24.325214587 +0100 +--- gtk+-2.14.7.orig/demos/Makefile.in 2009-02-17 23:15:21.915084436 +0100 ++++ gtk+-2.14.7/demos/Makefile.in 2009-02-21 14:58:40.779083701 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -28127,9 +29883,9 @@ Index: gtk+-2.12.12/demos/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -28144,12 +29900,14 @@ Index: gtk+-2.12.12/demos/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,11 +30,73 @@ POST_INSTALL = : +@@ -37,11 +32,74 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \ + testpixbuf-save$(EXEEXT) testpixbuf-scale$(EXEEXT) \ + pixbuf-demo$(EXEEXT) $(am__EXEEXT_1) @@ -28157,7 +29915,6 @@ Index: gtk+-2.12.12/demos/Makefile.in +# Need to build test-inline-pixbufs.h for testpixbuf @HAVE_PNG_TRUE@am__append_1 = testpixbuf +subdir = demos -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -28220,12 +29977,14 @@ Index: gtk+-2.12.12/demos/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -50,20 +107,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +110,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -28242,7 +30001,7 @@ Index: gtk+-2.12.12/demos/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -78,8 +132,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,8 +135,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -28251,7 +30010,7 @@ Index: gtk+-2.12.12/demos/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -87,10 +139,6 @@ ECHO_C = @ECHO_C@ +@@ -91,10 +142,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -28262,7 +30021,7 @@ Index: gtk+-2.12.12/demos/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -114,6 +162,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -121,6 +168,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -28270,7 +30029,7 @@ Index: gtk+-2.12.12/demos/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -132,8 +181,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +187,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -28279,7 +30038,7 @@ Index: gtk+-2.12.12/demos/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -144,55 +191,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,91 +197,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -28290,6 +30049,10 @@ Index: gtk+-2.12.12/demos/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -28301,16 +30064,48 @@ Index: gtk+-2.12.12/demos/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -28336,7 +30131,7 @@ Index: gtk+-2.12.12/demos/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -212,24 +216,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +226,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -28362,7 +30157,7 @@ Index: gtk+-2.12.12/demos/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -240,8 +235,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -285,8 +245,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -28371,7 +30166,7 @@ Index: gtk+-2.12.12/demos/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -253,28 +246,10 @@ SED = @SED@ +@@ -298,28 +256,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -28400,7 +30195,7 @@ Index: gtk+-2.12.12/demos/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -283,22 +258,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -328,22 +268,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -28430,7 +30225,7 @@ Index: gtk+-2.12.12/demos/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -321,6 +299,7 @@ libexecdir = @libexecdir@ +@@ -366,6 +309,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -28438,7 +30233,7 @@ Index: gtk+-2.12.12/demos/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -329,11 +308,12 @@ program_transform_name = @program_transf +@@ -374,24 +318,18 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -28448,13 +30243,39 @@ Index: gtk+-2.12.12/demos/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- apple-red.png \ +- background.jpg \ +- gnome-applets.png \ +- gnome-calendar.png \ +- gnome-foot.png \ +- gnome-gimp.png \ +- gnome-gmush.png \ +- gnome-gsame.png \ +- gnu-keys.png +- ++EXTRA_DIST = apple-red.png background.jpg gnome-applets.png \ ++ gnome-calendar.png gnome-foot.png gnome-gimp.png \ ++ gnome-gmush.png gnome-gsame.png gnu-keys.png + TEST_PROGS = + + ### testing rules +@@ -417,9 +355,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- SUBDIRS = gtk-demo - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -343,54 +323,39 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -428,131 +364,74 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) - @@ -28506,14 +30327,6 @@ Index: gtk+-2.12.12/demos/Makefile.in testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c testanimation_SOURCES = testanimation.c pixbuf-init.c pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c -- - EXTRA_DIST = \ - apple-red.png \ - background.jpg \ -@@ -402,83 +367,41 @@ EXTRA_DIST = \ - gnome-gsame.png \ - gnu-keys.png - - DISTCLEANFILES = test-inline-pixbufs.h -subdir = demos @@ -28577,7 +30390,8 @@ Index: gtk+-2.12.12/demos/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) - @@ -28586,8 +30400,8 @@ Index: gtk+-2.12.12/demos/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -28621,7 +30435,7 @@ Index: gtk+-2.12.12/demos/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -488,25 +411,25 @@ clean-noinstPROGRAMS: +@@ -562,25 +441,25 @@ clean-noinstPROGRAMS: done pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES) @rm -f pixbuf-demo$(EXEEXT) @@ -28654,7 +30468,7 @@ Index: gtk+-2.12.12/demos/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -520,37 +443,25 @@ distclean-compile: +@@ -594,37 +473,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpixbuf.Po@am__quote@ .c.o: @@ -28704,7 +30518,7 @@ Index: gtk+-2.12.12/demos/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -558,10 +469,6 @@ mostlyclean-libtool: +@@ -632,10 +499,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -28715,7 +30529,7 @@ Index: gtk+-2.12.12/demos/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -569,7 +476,13 @@ uninstall-info-am: +@@ -643,7 +506,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -28730,7 +30544,7 @@ Index: gtk+-2.12.12/demos/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -581,15 +494,20 @@ $(RECURSIVE_TARGETS): +@@ -655,15 +524,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -28755,7 +30569,7 @@ Index: gtk+-2.12.12/demos/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -610,7 +528,7 @@ maintainer-clean-recursive: +@@ -684,7 +558,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -28764,7 +30578,7 @@ Index: gtk+-2.12.12/demos/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -621,35 +539,30 @@ ctags-recursive: +@@ -695,35 +569,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -28807,7 +30621,7 @@ Index: gtk+-2.12.12/demos/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -657,23 +570,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -731,23 +600,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -28840,7 +30654,7 @@ Index: gtk+-2.12.12/demos/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -685,28 +598,23 @@ GTAGS: +@@ -759,29 +628,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -28850,6 +30664,7 @@ Index: gtk+-2.12.12/demos/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -28882,7 +30697,7 @@ Index: gtk+-2.12.12/demos/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -717,15 +625,19 @@ distdir: $(DISTFILES) +@@ -792,15 +655,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -28907,7 +30722,7 @@ Index: gtk+-2.12.12/demos/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -736,7 +648,6 @@ check: $(BUILT_SOURCES) +@@ -812,7 +679,6 @@ check: $(BUILT_SOURCES) all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: @@ -28915,7 +30730,7 @@ Index: gtk+-2.12.12/demos/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -757,7 +668,7 @@ mostlyclean-generic: +@@ -833,7 +699,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -28924,7 +30739,7 @@ Index: gtk+-2.12.12/demos/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -773,24 +684,34 @@ distclean: distclean-recursive +@@ -849,24 +715,34 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -28960,7 +30775,7 @@ Index: gtk+-2.12.12/demos/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -811,27 +732,25 @@ ps: ps-recursive +@@ -887,27 +763,25 @@ ps: ps-recursive ps-am: @@ -28971,13 +30786,10 @@ Index: gtk+-2.12.12/demos/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-noinstPROGRAMS \ -- clean-recursive ctags ctags-recursive distclean \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ clean-noinstPROGRAMS ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool \ +- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ @@ -28991,23 +30803,310 @@ Index: gtk+-2.12.12/demos/Makefile.in - pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ - tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + # call as: $(XVFB_START) && someprogram - test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png -Index: gtk+-2.12.12/docs/faq/Makefile.in +Index: gtk+-2.14.7/depcomp =================================================================== ---- gtk+-2.12.12.orig/docs/faq/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/docs/faq/Makefile.in 2008-12-09 21:03:24.689217343 +0100 +--- gtk+-2.14.7.orig/depcomp 2009-02-17 23:15:21.903082213 +0100 ++++ gtk+-2.14.7/depcomp 2009-02-21 14:58:49.771084221 +0100 +@@ -1,7 +1,10 @@ + #! /bin/sh +- + # depcomp - compile a program generating dependencies as side-effects +-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. ++ ++scriptversion=2007-03-29.01 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software ++# Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -15,8 +18,8 @@ + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -25,22 +28,45 @@ + + # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. + ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to <bug-automake@gnu.org>. ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ + if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 + fi +-# `libtool' can also be set to `yes' or `no'. +- +-if test -z "$depfile"; then +- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` +- dir=`echo "$object" | sed 's,/.*$,/,'` +- if test "$dir" = "$object"; then +- dir= +- fi +- # FIXME: should be _deps on DOS. +- depfile="$dir.deps/$base" +-fi + ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -66,7 +92,20 @@ gcc3) + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" + stat=$? + if test $stat -eq 0; then : + else +@@ -176,34 +215,39 @@ aix) + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -251,6 +295,46 @@ icc) + rm -f "$tmpdepfile" + ;; + ++hp2) ++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 ++ # compilers, which have integrated preprocessors. The correct option ++ # to use with these is +Maked; it writes dependencies to a file named ++ # 'foo.d', which lands next to the object file, wherever that ++ # happens to be. ++ # Much of this is similar to the tru64 case; see comments there. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir.libs/$base.d ++ "$@" -Wc,+Maked ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ "$@" +Maked ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add `dependent.h:' lines. ++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" "$tmpdepfile2" ++ ;; ++ + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -262,27 +346,43 @@ tru64) + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then +- tmpdepfile1="$dir.libs/$base.lo.d" +- tmpdepfile2="$dir.libs/$base.d" ++ # With Tru64 cc, shared objects can also be used to make a ++ # static library. This mechanism is used in libtool 1.4 series to ++ # handle both shared and static libraries in a single compilation. ++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ++ # ++ # With libtool 1.5 this exception was removed, and libtool now ++ # generates 2 separate objects for the 2 libraries. These two ++ # compilations output dependencies in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ++ tmpdepfile2=$dir$base.o.d # libtool 1.5 ++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else +- tmpdepfile1="$dir$base.o.d" +- tmpdepfile2="$dir$base.d" ++ tmpdepfile1=$dir$base.o.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile1" "$tmpdepfile2" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + +- if test -f "$tmpdepfile1"; then +- tmpdepfile="$tmpdepfile1" +- else +- tmpdepfile="$tmpdepfile2" +- fi ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. +@@ -426,7 +526,8 @@ cpp) + done + + "$@" -E | +- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +@@ -477,3 +578,12 @@ none) + esac + + exit 0 ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +Index: gtk+-2.14.7/docs/faq/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/faq/Makefile.in 2009-02-17 23:15:21.895088878 +0100 ++++ gtk+-2.14.7/docs/faq/Makefile.in 2009-02-21 14:58:41.234583493 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -29020,10 +31119,10 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -29038,14 +31137,15 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,22 @@ POST_INSTALL = : +@@ -37,10 +31,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = docs/faq -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -29063,12 +31163,14 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +55,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -29085,7 +31187,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +80,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -29094,7 +31196,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +87,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -29105,7 +31207,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +110,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -29113,7 +31215,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +129,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -29122,7 +31224,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +139,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -29133,6 +31235,10 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -29144,16 +31250,48 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -29179,7 +31317,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +164,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -29205,7 +31343,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +183,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -29214,7 +31352,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +194,10 @@ SED = @SED@ +@@ -297,28 +204,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -29243,7 +31381,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +206,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -29273,7 +31411,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +247,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -29281,17 +31419,30 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,64 +256,75 @@ program_transform_name = @program_transf +@@ -373,16 +266,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - EXTRA_DIST = \ - gtk-faq.sgml + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gtk-faq.sgml +- ++EXTRA_DIST = gtk-faq.sgml + TEST_PROGS = + + ### testing rules +@@ -408,61 +301,67 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY -subdir = docs/faq -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -29299,12 +31450,13 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -29357,6 +31509,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -29389,15 +31542,15 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -402,7 +341,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -480,7 +379,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am -@@ -423,7 +361,7 @@ mostlyclean-generic: +@@ -501,7 +399,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -29406,7 +31559,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -434,7 +372,7 @@ clean-am: clean-generic clean-libtool mo +@@ -512,7 +410,7 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -29415,7 +31568,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in dvi: dvi-am -@@ -446,12 +384,20 @@ info-am: +@@ -524,12 +422,20 @@ info-am: install-data-am: @@ -29436,7 +31589,7 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -462,25 +408,27 @@ mostlyclean: mostlyclean-am +@@ -540,25 +446,27 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -29453,18 +31606,18 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in + +.MAKE: install-am install-strip - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -- distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am info info-am install install-am install-data \ + .PHONY: all all-am check check-am check-local clean clean-generic \ +- clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am -+ dist-hook distclean distclean-generic distclean-libtool \ -+ distdir dvi dvi-am html html-am info info-am install \ -+ install-am install-data install-data-am install-dvi \ ++ clean-libtool dist-hook distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ @@ -29473,12 +31626,12 @@ Index: gtk+-2.12.12/docs/faq/Makefile.in + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am + # call as: $(XVFB_START) && someprogram - @HAVE_DOCBOOK_TRUE@html: -Index: gtk+-2.12.12/docs/Makefile.in +Index: gtk+-2.14.7/docs/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/docs/Makefile.in 2008-12-09 21:03:24.577213863 +0100 +--- gtk+-2.14.7.orig/docs/Makefile.in 2009-02-17 23:15:21.863086696 +0100 ++++ gtk+-2.14.7/docs/Makefile.in 2009-02-21 14:58:41.090582230 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -29491,10 +31644,10 @@ Index: gtk+-2.12.12/docs/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -29509,14 +31662,15 @@ Index: gtk+-2.12.12/docs/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,34 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = docs -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -29546,12 +31700,14 @@ Index: gtk+-2.12.12/docs/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +67,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -29568,7 +31724,7 @@ Index: gtk+-2.12.12/docs/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +92,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -29577,7 +31733,7 @@ Index: gtk+-2.12.12/docs/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +99,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -29588,7 +31744,7 @@ Index: gtk+-2.12.12/docs/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -29596,7 +31752,7 @@ Index: gtk+-2.12.12/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -29605,7 +31761,7 @@ Index: gtk+-2.12.12/docs/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +151,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -29616,6 +31772,10 @@ Index: gtk+-2.12.12/docs/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -29627,16 +31787,48 @@ Index: gtk+-2.12.12/docs/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -29662,7 +31854,7 @@ Index: gtk+-2.12.12/docs/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -29688,7 +31880,7 @@ Index: gtk+-2.12.12/docs/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -29697,7 +31889,7 @@ Index: gtk+-2.12.12/docs/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +206,10 @@ SED = @SED@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -29726,7 +31918,7 @@ Index: gtk+-2.12.12/docs/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -29756,7 +31948,7 @@ Index: gtk+-2.12.12/docs/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +259,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -29764,7 +31956,7 @@ Index: gtk+-2.12.12/docs/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,11 +268,12 @@ program_transform_name = @program_transf +@@ -373,30 +278,20 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -29774,15 +31966,41 @@ Index: gtk+-2.12.12/docs/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - SUBDIRS = tutorial faq reference tools -- - EXTRA_DIST = \ - defsformat.txt \ - developers.txt \ -@@ -350,28 +291,38 @@ EXTRA_DIST = \ - gtkdocs_fix \ - RELEASE-HOWTO + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- defsformat.txt \ +- developers.txt \ +- dnd_internals.txt \ +- make-todo \ +- refcounting.txt \ +- sizing-test.txt \ +- styles.txt \ +- text_widget.txt \ +- text_widget_internals.txt \ +- tree-column-sizing.txt \ +- widget_geometry.txt \ +- widget_system.txt \ +- generation.txt \ +- gtkdocs_fix \ +- RELEASE-HOWTO +- ++EXTRA_DIST = defsformat.txt developers.txt dnd_internals.txt make-todo \ ++ refcounting.txt sizing-test.txt styles.txt text_widget.txt \ ++ text_widget_internals.txt tree-column-sizing.txt \ ++ widget_geometry.txt widget_system.txt generation.txt \ ++ gtkdocs_fix RELEASE-HOWTO + TEST_PROGS = + + ### testing rules +@@ -422,31 +317,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = tutorial faq reference tools -subdir = docs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -29795,13 +32013,14 @@ Index: gtk+-2.12.12/docs/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -29835,7 +32054,7 @@ Index: gtk+-2.12.12/docs/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -379,10 +330,6 @@ mostlyclean-libtool: +@@ -454,10 +357,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -29846,7 +32065,7 @@ Index: gtk+-2.12.12/docs/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -390,7 +337,13 @@ uninstall-info-am: +@@ -465,7 +364,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -29861,7 +32080,7 @@ Index: gtk+-2.12.12/docs/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -402,15 +355,20 @@ $(RECURSIVE_TARGETS): +@@ -477,15 +382,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -29886,7 +32105,7 @@ Index: gtk+-2.12.12/docs/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -431,7 +389,7 @@ maintainer-clean-recursive: +@@ -506,7 +416,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -29895,7 +32114,7 @@ Index: gtk+-2.12.12/docs/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -442,35 +400,30 @@ ctags-recursive: +@@ -517,35 +427,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -29938,7 +32157,7 @@ Index: gtk+-2.12.12/docs/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -478,23 +431,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -553,23 +458,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -29971,7 +32190,7 @@ Index: gtk+-2.12.12/docs/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -506,28 +459,23 @@ GTAGS: +@@ -581,29 +486,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -29981,6 +32200,7 @@ Index: gtk+-2.12.12/docs/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -30013,7 +32233,7 @@ Index: gtk+-2.12.12/docs/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -538,15 +486,19 @@ distdir: $(DISTFILES) +@@ -614,15 +513,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -30038,7 +32258,7 @@ Index: gtk+-2.12.12/docs/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -556,7 +508,6 @@ check: check-recursive +@@ -633,7 +536,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -30046,7 +32266,7 @@ Index: gtk+-2.12.12/docs/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -576,7 +527,7 @@ mostlyclean-generic: +@@ -653,7 +555,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -30055,7 +32275,7 @@ Index: gtk+-2.12.12/docs/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -587,25 +538,34 @@ clean-am: clean-generic clean-libtool mo +@@ -664,25 +566,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -30092,7 +32312,7 @@ Index: gtk+-2.12.12/docs/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -624,26 +584,24 @@ ps: ps-recursive +@@ -701,26 +612,24 @@ ps: ps-recursive ps-am: @@ -30103,12 +32323,12 @@ Index: gtk+-2.12.12/docs/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -30120,25 +32340,25 @@ Index: gtk+-2.12.12/docs/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/docs/reference/gdk/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/reference/gdk/Makefile.in 2008-09-13 02:03:25.000000000 +0200 -+++ gtk+-2.12.12/docs/reference/gdk/Makefile.in 2008-12-09 21:03:25.053214723 +0100 +--- gtk+-2.14.7.orig/docs/reference/gdk/Makefile.in 2009-02-17 23:15:21.843084294 +0100 ++++ gtk+-2.14.7/docs/reference/gdk/Makefile.in 2009-02-21 14:58:41.730582844 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -30151,7 +32371,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -19,17 +19,11 @@ +@@ -21,17 +21,11 @@ #################################### # Everything below here is generic # #################################### @@ -30169,14 +32389,15 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -41,10 +35,23 @@ POST_INSTALL = : +@@ -43,10 +37,24 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make ++ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ ++ $(top_srcdir)/gtk-doc.make +subdir = docs/reference/gdk +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -30195,12 +32416,14 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -55,20 +62,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,22 +65,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -30217,7 +32440,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +87,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -87,8 +90,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -30226,7 +32449,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -92,10 +94,6 @@ ECHO_C = @ECHO_C@ +@@ -96,10 +97,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -30237,7 +32460,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -119,6 +117,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -126,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -30245,7 +32468,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +136,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -144,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -30254,7 +32477,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,55 +146,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -156,91 +152,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -30265,6 +32488,10 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -30276,16 +32503,48 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -30311,7 +32570,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -217,24 +171,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -262,24 +181,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -30337,7 +32596,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -245,8 +190,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -290,8 +200,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -30346,7 +32605,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -258,28 +201,10 @@ SED = @SED@ +@@ -303,28 +211,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -30375,7 +32634,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -288,22 +213,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -333,22 +223,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -30405,7 +32664,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -326,6 +254,7 @@ libexecdir = @libexecdir@ +@@ -371,6 +264,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -30413,7 +32672,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -334,9 +263,11 @@ program_transform_name = @program_transf +@@ -379,22 +273,18 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -30423,32 +32682,10 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. -@@ -388,7 +319,6 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -- - GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) - - # Extra options to supply to gtkdoc-mkdb -@@ -490,7 +420,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -501,23 +430,15 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix - # searched for in VPATH/GPATH. - # - GPATH = $(srcdir) -- - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +-# initialize variables for unconditional += appending - # Other files to distribute -EXTRA_DIST = \ @@ -30458,10 +32695,43 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt\ -version.xml.in -- +EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ + version.xml.in + TEST_PROGS = + + ### testing rules +@@ -420,7 +310,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +@@ -470,7 +359,6 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_DEP_CFLAGS) + +- + GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) + + # Extra options to supply to gtkdoc-mkdb +@@ -572,7 +460,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -585,13 +472,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp @@ -30469,7 +32739,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -525,31 +446,45 @@ SCANOBJ_FILES = \ +@@ -599,31 +483,45 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -30487,13 +32757,13 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = version.xml -DIST_SOURCES = --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make \ -- Makefile.am version.xml.in +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -30529,7 +32799,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -557,39 +492,29 @@ mostlyclean-libtool: +@@ -631,39 +529,29 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -30582,15 +32852,15 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -606,7 +531,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -681,7 +569,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local - installdirs: install: install-am install-exec: install-exec-am -@@ -628,7 +552,7 @@ clean-generic: +@@ -703,7 +590,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -30599,7 +32869,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -639,25 +563,34 @@ clean-am: clean-generic clean-libtool cl +@@ -714,25 +601,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -30636,7 +32906,7 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -677,18 +610,23 @@ ps: ps-am +@@ -752,18 +648,23 @@ ps: ps-am ps-am: @@ -30645,17 +32915,17 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in + +.MAKE: install-am install-strip - .PHONY: all all-am all-local check check-am clean clean-generic \ -- clean-libtool clean-local distclean distclean-generic \ -- distclean-libtool distclean-local distdir dvi dvi-am info \ -- info-am install install-am install-data install-data-am \ -- install-data-local install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-local -+ clean-libtool clean-local dist-hook distclean \ ++ clean-generic clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ @@ -30668,12 +32938,12 @@ Index: gtk+-2.12.12/docs/reference/gdk/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-local + # call as: $(XVFB_START) && someprogram - @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp -Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in +Index: gtk+-2.14.7/docs/reference/gdk-pixbuf/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-09-13 02:03:25.000000000 +0200 -+++ gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in 2008-12-09 21:03:24.929214396 +0100 +--- gtk+-2.14.7.orig/docs/reference/gdk-pixbuf/Makefile.in 2009-02-17 23:15:21.799084777 +0100 ++++ gtk+-2.14.7/docs/reference/gdk-pixbuf/Makefile.in 2009-02-21 14:58:41.559081578 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -30686,7 +32956,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -19,17 +19,11 @@ +@@ -21,17 +21,11 @@ #################################### # Everything below here is generic # #################################### @@ -30704,14 +32974,15 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -41,10 +35,27 @@ POST_INSTALL = : +@@ -43,10 +37,28 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make ++ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ ++ $(top_srcdir)/gtk-doc.make +subdir = docs/reference/gdk-pixbuf +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -30734,12 +33005,14 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -55,20 +66,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,22 +69,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -30756,7 +33029,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +91,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -87,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -30765,7 +33038,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -92,10 +98,6 @@ ECHO_C = @ECHO_C@ +@@ -96,10 +101,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -30776,7 +33049,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -119,6 +121,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -126,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -30784,7 +33057,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +140,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -144,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -30793,7 +33066,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,55 +150,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -156,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -30804,6 +33077,10 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -30815,16 +33092,48 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -30850,7 +33159,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -217,24 +175,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -262,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -30876,7 +33185,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -245,8 +194,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -290,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -30885,7 +33194,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -258,28 +205,10 @@ SED = @SED@ +@@ -303,28 +215,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -30914,7 +33223,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -288,22 +217,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -333,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -30944,7 +33253,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -326,6 +258,7 @@ libexecdir = @libexecdir@ +@@ -371,6 +268,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -30952,7 +33261,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -334,9 +267,11 @@ program_transform_name = @program_transf +@@ -379,28 +277,19 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -30962,40 +33271,10 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. -@@ -368,7 +303,6 @@ IGNORE_HFILES = \ - xpm-color-table.h \ - test-images.h - -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -@@ -376,7 +310,6 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - GTKDOC_LIBS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -406,7 +339,6 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -417,29 +349,16 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE - # searched for in VPATH/GPATH. - # - GPATH = $(srcdir) -- - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +-# initialize variables for unconditional += appending - # Other files to distribute -EXTRA_DIST = \ @@ -31011,11 +33290,52 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in - apple-red-2c.png \ - gnome-gmush-1.png - -- +EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ + version.xml.in composite.png composite.dia apple-red-1a.png \ + apple-red-2c.png gnome-gmush-1.png + TEST_PROGS = + + ### testing rules +@@ -426,7 +315,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +@@ -458,7 +346,6 @@ IGNORE_HFILES = \ + xpm-color-table.h \ + test-images.h + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +@@ -466,7 +353,6 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + GTKDOC_LIBS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ +@@ -496,7 +382,6 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -509,13 +394,10 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp @@ -31023,7 +33343,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -447,40 +366,49 @@ SCANOBJ_FILES = \ +@@ -523,40 +405,49 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -31050,13 +33370,13 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in - -NROFF = nroff -MANS = $(man_MANS) --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make \ -- Makefile.am version.xml.in +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -31092,7 +33412,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -488,15 +416,9 @@ mostlyclean-libtool: +@@ -564,15 +455,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -31109,7 +33429,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -515,8 +437,8 @@ install-man1: $(man1_MANS) $(man_MANS) +@@ -591,8 +476,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -31120,7 +33440,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -536,8 +458,8 @@ uninstall-man1: +@@ -612,8 +497,8 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -31131,7 +33451,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in done tags: TAGS TAGS: -@@ -545,29 +467,23 @@ TAGS: +@@ -621,29 +506,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -31174,8 +33494,8 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -584,9 +500,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -661,9 +540,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local - @@ -31187,7 +33507,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -607,7 +524,7 @@ clean-generic: +@@ -684,7 +564,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -31196,7 +33516,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -618,25 +535,34 @@ clean-am: clean-generic clean-libtool cl +@@ -695,25 +575,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -31233,7 +33553,7 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -656,21 +582,25 @@ ps: ps-am +@@ -733,21 +622,25 @@ ps: ps-am ps-am: @@ -31244,18 +33564,15 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in +.MAKE: install-am install-strip + - .PHONY: all all-am all-local check check-am clean clean-generic \ -- clean-libtool clean-local distclean distclean-generic \ -- distclean-libtool distclean-local distdir dvi dvi-am info \ -- info-am install install-am install-data install-data-am \ -- install-data-local install-exec install-exec-am install-info \ -- install-info-am install-man install-man1 install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic maintainer-clean-local mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-info-am uninstall-local \ -- uninstall-man uninstall-man1 -+ clean-libtool clean-local dist-hook distclean \ + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-man1 \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ ++ clean-generic clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ @@ -31264,16 +33581,17 @@ Index: gtk+-2.12.12/docs/reference/gdk-pixbuf/Makefile.in + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-local mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-local uninstall-man uninstall-man1 + uninstall-local uninstall-man uninstall-man1 + # call as: $(XVFB_START) && someprogram - @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp -Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in +Index: gtk+-2.14.7/docs/reference/gtk/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/reference/gtk/Makefile.in 2008-09-13 02:03:25.000000000 +0200 -+++ gtk+-2.12.12/docs/reference/gtk/Makefile.in 2008-12-09 21:03:25.201213631 +0100 +--- gtk+-2.14.7.orig/docs/reference/gtk/Makefile.in 2009-02-17 23:15:21.739087836 +0100 ++++ gtk+-2.14.7/docs/reference/gtk/Makefile.in 2009-02-21 14:58:41.894586021 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -31286,7 +33604,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -19,17 +19,11 @@ +@@ -21,17 +21,11 @@ #################################### # Everything below here is generic # #################################### @@ -31304,14 +33622,15 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -41,10 +35,27 @@ POST_INSTALL = : +@@ -43,10 +37,28 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make ++ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ ++ $(top_srcdir)/gtk-doc.make +subdir = docs/reference/gtk +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -31334,12 +33653,14 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -55,20 +66,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,25 +69,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -31350,13 +33671,17 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ +- +-CPPFLAGS = @CPPFLAGS@ \ +- -UGTK_DISABLE_SINGLE_INCLUDES +- -CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ -CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ ++CPPFLAGS = @CPPFLAGS@ -UGTK_DISABLE_SINGLE_INCLUDES CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +91,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -90,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -31365,7 +33690,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -92,10 +98,6 @@ ECHO_C = @ECHO_C@ +@@ -99,10 +101,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -31376,7 +33701,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -119,6 +121,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -129,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31384,7 +33709,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +140,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -147,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -31393,7 +33718,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,55 +150,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -159,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -31404,6 +33729,10 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -31415,16 +33744,48 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -31450,7 +33811,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -217,24 +175,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -265,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -31476,7 +33837,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -245,8 +194,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -293,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -31485,7 +33846,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -258,28 +205,10 @@ SED = @SED@ +@@ -306,28 +215,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -31514,7 +33875,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -288,22 +217,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -336,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -31544,7 +33905,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -326,6 +258,7 @@ libexecdir = @libexecdir@ +@@ -374,6 +268,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -31552,7 +33913,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -334,9 +267,11 @@ program_transform_name = @program_transf +@@ -382,22 +277,18 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -31562,40 +33923,10 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. -@@ -444,7 +379,6 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - GTKDOC_LIBS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -489,7 +423,6 @@ content_files = \ - gtk-builder-convert.xml \ - visual_index.xml - -- - expand_content_files = \ - glossary.xml \ - migrating-checklist.sgml \ -@@ -675,7 +608,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -686,23 +618,15 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix - # searched for in VPATH/GPATH. - # - GPATH = $(srcdir) -- - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +-# initialize variables for unconditional += appending - # Other files to distribute -EXTRA_DIST = \ @@ -31605,10 +33936,51 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt\ -version.xml.in -- +EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ + version.xml.in + TEST_PROGS = + + ### testing rules +@@ -423,7 +314,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +@@ -531,7 +421,6 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + GTKDOC_LIBS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ +@@ -576,7 +465,6 @@ content_files = \ + gtk-builder-convert.xml \ + visual_index.xml + +- + expand_content_files = \ + glossary.xml \ + migrating-checklist.sgml \ +@@ -766,7 +654,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -779,13 +666,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp @@ -31616,7 +33988,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -710,40 +634,49 @@ SCANOBJ_FILES = \ +@@ -793,40 +677,49 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -31643,13 +34015,13 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in - -NROFF = nroff -MANS = $(man_MANS) --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make \ -- Makefile.am version.xml.in +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -31685,7 +34057,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -751,15 +684,9 @@ mostlyclean-libtool: +@@ -834,15 +727,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -31702,7 +34074,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -778,8 +705,8 @@ install-man1: $(man1_MANS) $(man_MANS) +@@ -861,8 +748,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -31713,7 +34085,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -799,8 +726,8 @@ uninstall-man1: +@@ -882,8 +769,8 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -31724,7 +34096,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in done tags: TAGS TAGS: -@@ -808,29 +735,23 @@ TAGS: +@@ -891,29 +778,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -31767,8 +34139,8 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -847,9 +768,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -931,9 +812,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local - @@ -31780,7 +34152,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -870,7 +792,7 @@ clean-generic: +@@ -954,7 +836,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -31789,7 +34161,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -881,25 +803,34 @@ clean-am: clean-generic clean-libtool cl +@@ -965,25 +847,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -31826,7 +34198,7 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -919,21 +850,25 @@ ps: ps-am +@@ -1003,21 +894,25 @@ ps: ps-am ps-am: @@ -31837,18 +34209,15 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in +.MAKE: install-am install-strip + - .PHONY: all all-am all-local check check-am clean clean-generic \ -- clean-libtool clean-local distclean distclean-generic \ -- distclean-libtool distclean-local distdir dvi dvi-am info \ -- info-am install install-am install-data install-data-am \ -- install-data-local install-exec install-exec-am install-info \ -- install-info-am install-man install-man1 install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic maintainer-clean-local mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-info-am uninstall-local \ -- uninstall-man uninstall-man1 -+ clean-libtool clean-local dist-hook distclean \ + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-man1 \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ ++ clean-generic clean-libtool clean-local dist-hook distclean \ + distclean-generic distclean-libtool distclean-local distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ @@ -31857,16 +34226,17 @@ Index: gtk+-2.12.12/docs/reference/gtk/Makefile.in + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-local mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-local uninstall-man uninstall-man1 + uninstall-local uninstall-man uninstall-man1 + # call as: $(XVFB_START) && someprogram - @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp -Index: gtk+-2.12.12/docs/reference/Makefile.in +Index: gtk+-2.14.7/docs/reference/libgail-util/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/reference/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/docs/reference/Makefile.in 2008-12-09 21:03:24.793213801 +0100 +--- gtk+-2.14.7.orig/docs/reference/libgail-util/Makefile.in 2009-02-17 23:15:21.703090454 +0100 ++++ gtk+-2.14.7/docs/reference/libgail-util/Makefile.in 2009-02-21 14:58:42.043082129 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -31879,10 +34249,10 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - - @SET_MAKE@ +@@ -21,17 +21,11 @@ + #################################### + # Everything below here is generic # + #################################### - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -31890,22 +34260,22 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. +-top_builddir = ../../.. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,35 @@ POST_INSTALL = : +@@ -43,10 +37,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = docs/reference -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ AUTHORS COPYING ChangeLog ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make ++subdir = docs/reference/libgail-util +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -31916,18 +34286,6 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ @@ -31935,12 +34293,14 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +68,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,22 +64,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -31957,7 +34317,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -87,8 +89,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -31966,7 +34326,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +100,6 @@ ECHO_C = @ECHO_C@ +@@ -96,10 +96,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -31977,7 +34337,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -126,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31985,7 +34345,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -144,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -31994,7 +34354,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +152,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -156,91 +151,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -32005,6 +34365,10 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -32016,16 +34380,48 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -32051,7 +34447,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +177,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -262,24 +180,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -32077,7 +34473,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +196,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -290,8 +199,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -32086,7 +34482,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +207,10 @@ SED = @SED@ +@@ -303,28 +210,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -32115,7 +34511,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +219,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -333,22 +222,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -32145,7 +34541,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +260,7 @@ libexecdir = @libexecdir@ +@@ -371,6 +263,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -32153,7 +34549,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,33 +269,44 @@ program_transform_name = @program_transf +@@ -379,13 +272,13 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -32163,7 +34559,597 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - SUBDIRS = gdk-pixbuf gdk gtk + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +- +-# initialize variables for unconditional += appending + EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ +@@ -418,7 +311,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.7 + + # The name of the module. +@@ -441,16 +333,13 @@ INCLUDES = \ + -I$(top_builddir) \ + $(DEP_CFLAGS) + +- + GTKDOC_LIBS = $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la + + # gtkdoc-mkdb related varaibles + MKDB_OPTIONS = + content_files = +- + HTML_IMAGES = + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -463,13 +352,10 @@ HTML_IMAGES = + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +- + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ +@@ -477,69 +363,73 @@ SCANOBJ_FILES = \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +- + REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +- + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-subdir = docs/reference/libgail-util +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libgail-util/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/libgail-util/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -557,7 +447,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile all-local +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -579,7 +468,7 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -590,25 +479,34 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -628,18 +526,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic maintainer-clean-local mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-generic clean-libtool clean-local dist-hook distclean \ ++ distclean-generic distclean-libtool distclean-local distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-local mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/docs/reference/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/reference/Makefile.in 2009-02-17 23:15:21.659088492 +0100 ++++ gtk+-2.14.7/docs/reference/Makefile.in 2009-02-21 14:58:41.370585065 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog ++subdir = docs/reference ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,31 +313,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = gdk-pixbuf gdk gtk libgail-util -subdir = docs/reference -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -32176,14 +35162,14 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = README $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \ -- Makefile.am +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- AUTHORS COPYING ChangeLog Makefile.am -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -32217,7 +35203,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -362,10 +314,6 @@ mostlyclean-libtool: +@@ -438,10 +353,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -32228,7 +35214,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -373,7 +321,13 @@ uninstall-info-am: +@@ -449,7 +360,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -32243,7 +35229,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -385,15 +339,20 @@ $(RECURSIVE_TARGETS): +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -32268,7 +35254,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -414,7 +373,7 @@ maintainer-clean-recursive: +@@ -490,7 +412,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -32277,7 +35263,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -425,35 +384,30 @@ ctags-recursive: +@@ -501,35 +423,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -32320,7 +35306,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -461,23 +415,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -32353,7 +35339,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -489,28 +443,23 @@ GTAGS: +@@ -565,29 +482,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -32363,6 +35349,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -32395,7 +35382,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -521,15 +470,19 @@ distdir: $(DISTFILES) +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -32420,7 +35407,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -539,7 +492,6 @@ check: check-recursive +@@ -617,7 +532,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -32428,7 +35415,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -559,7 +511,7 @@ mostlyclean-generic: +@@ -637,7 +551,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -32437,7 +35424,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -570,25 +522,34 @@ clean-am: clean-generic clean-libtool mo +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -32474,7 +35461,7 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -607,26 +568,24 @@ ps: ps-recursive +@@ -685,26 +608,24 @@ ps: ps-recursive ps-am: @@ -32485,12 +35472,12 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -32502,25 +35489,25 @@ Index: gtk+-2.12.12/docs/reference/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/docs/tools/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/docs/tools/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/tools/Makefile.in 2008-09-13 02:03:25.000000000 +0200 -+++ gtk+-2.12.12/docs/tools/Makefile.in 2008-12-09 21:03:25.329213559 +0100 +--- gtk+-2.14.7.orig/docs/tools/Makefile.in 2009-02-17 23:15:21.627087777 +0100 ++++ gtk+-2.14.7/docs/tools/Makefile.in 2009-02-21 14:58:42.199082193 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -32533,9 +35520,9 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -32550,15 +35537,16 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,45 @@ POST_INSTALL = : +@@ -37,10 +32,46 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +@USE_X11_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) +subdir = docs/tools -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -32598,12 +35586,14 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +79,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -32620,7 +35610,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +104,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -32629,7 +35619,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +111,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -32640,7 +35630,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +134,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32648,7 +35638,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +153,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -32657,7 +35647,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +163,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -32668,6 +35658,10 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -32679,16 +35673,48 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -32714,7 +35740,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +188,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -32740,7 +35766,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +207,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -32749,7 +35775,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +218,10 @@ SED = @SED@ +@@ -297,28 +228,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -32778,7 +35804,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +230,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -32808,7 +35834,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +271,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -32816,19 +35842,28 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,8 +280,11 @@ program_transform_name = @program_transf +@@ -373,9 +290,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,7 +325,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -338,24 +293,17 @@ INCLUDES = \ +@@ -415,24 +333,17 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -32853,7 +35888,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in doc_shooter_DEPENDENCIES = $(DEPS) doc_shooter_LDADD = $(LDADDS) doc_shooter_SOURCES = \ -@@ -365,45 +313,39 @@ doc_shooter_SOURCES = \ +@@ -442,46 +353,39 @@ doc_shooter_SOURCES = \ widgets.c \ widgets.h @@ -32884,15 +35919,16 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(doc_shooter_SOURCES) --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -SOURCES = $(doc_shooter_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -32926,7 +35962,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -413,10 +355,10 @@ clean-noinstPROGRAMS: +@@ -491,10 +395,10 @@ clean-noinstPROGRAMS: done doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) @rm -f doc-shooter$(EXEEXT) @@ -32939,7 +35975,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -426,37 +368,25 @@ distclean-compile: +@@ -504,37 +408,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@ .c.o: @@ -32989,7 +36025,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -464,26 +394,15 @@ mostlyclean-libtool: +@@ -542,26 +434,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -33019,7 +36055,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -493,23 +412,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -571,23 +452,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -33052,7 +36088,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -521,28 +440,23 @@ GTAGS: +@@ -599,29 +480,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -33062,6 +36098,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -33094,15 +36131,15 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -556,7 +470,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -636,7 +511,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) - installdirs: install: install-am install-exec: install-exec-am -@@ -577,7 +490,7 @@ mostlyclean-generic: +@@ -657,7 +531,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -33111,7 +36148,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -591,24 +504,34 @@ distclean: distclean-am +@@ -671,24 +545,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -33147,7 +36184,7 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -629,18 +552,22 @@ ps: ps-am +@@ -709,19 +593,23 @@ ps: ps-am ps-am: @@ -33156,30 +36193,34 @@ Index: gtk+-2.12.12/docs/tools/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-local clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + ctags distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am info \ +- info-am install install-am install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + # call as: $(XVFB_START) && someprogram - clean-local: -Index: gtk+-2.12.12/docs/tutorial/Makefile.in +Index: gtk+-2.14.7/docs/tutorial/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/docs/tutorial/Makefile.in 2008-09-13 02:03:25.000000000 +0200 -+++ gtk+-2.12.12/docs/tutorial/Makefile.in 2008-12-09 21:03:25.445216152 +0100 +--- gtk+-2.14.7.orig/docs/tutorial/Makefile.in 2009-02-17 23:15:21.591089417 +0100 ++++ gtk+-2.14.7/docs/tutorial/Makefile.in 2009-02-21 14:58:42.331086609 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -33192,10 +36233,10 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -33210,14 +36251,15 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,22 @@ POST_INSTALL = : +@@ -37,10 +31,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = docs/tutorial -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -33235,12 +36277,14 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +55,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -33257,7 +36301,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +80,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -33266,7 +36310,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +87,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -33277,7 +36321,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +110,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33285,7 +36329,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +129,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -33294,7 +36338,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +139,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -33305,6 +36349,10 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -33316,16 +36364,48 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -33351,7 +36431,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +164,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -33377,7 +36457,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +183,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -33386,7 +36466,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +194,10 @@ SED = @SED@ +@@ -297,28 +204,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -33415,7 +36495,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +206,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -33445,7 +36525,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +247,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -33453,7 +36533,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,9 +256,11 @@ program_transform_name = @program_transf +@@ -373,47 +266,27 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -33463,12 +36543,61 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - EXTRA_DIST = \ - gtk-tut.sgml \ - images/arrow.png \ -@@ -365,60 +295,67 @@ EXTRA_DIST = \ - images/table.png \ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gtk-tut.sgml \ +- images/arrow.png \ +- images/aspectframe.png \ +- images/base.png \ +- images/buttonbox.png \ +- images/buttons.png \ +- images/calendar.png \ +- images/colorsel.png \ +- images/entry.png \ +- images/eventbox.png \ +- images/filesel.png \ +- images/fixed.png \ +- images/frame.png \ +- images/gtkdial.png \ +- images/helloworld.png \ +- images/helloworld2.png \ +- images/label.png \ +- images/menu.png \ +- images/notebook.png \ +- images/packbox1.png \ +- images/packbox2.png \ +- images/paned.png \ +- images/progressbar.png \ +- images/radiobuttons.png \ +- images/rangewidgets.png \ +- images/rulers.png \ +- images/scribble.png \ +- images/scrolledwin.png \ +- images/spinbutton.png \ +- images/statusbar.png \ +- images/table.png \ ++EXTRA_DIST = gtk-tut.sgml images/arrow.png images/aspectframe.png \ ++ images/base.png images/buttonbox.png images/buttons.png \ ++ images/calendar.png images/colorsel.png images/entry.png \ ++ images/eventbox.png images/filesel.png images/fixed.png \ ++ images/frame.png images/gtkdial.png images/helloworld.png \ ++ images/helloworld2.png images/label.png images/menu.png \ ++ images/notebook.png images/packbox1.png images/packbox2.png \ ++ images/paned.png images/progressbar.png \ ++ images/radiobuttons.png images/rangewidgets.png \ ++ images/rulers.png images/scribble.png images/scrolledwin.png \ ++ images/spinbutton.png images/statusbar.png images/table.png \ images/tictactoe.png +- + TEST_PROGS = + + ### testing rules +@@ -439,61 +312,67 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY -subdir = docs/tutorial -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -33476,12 +36605,13 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -33534,7 +36664,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/images +- $(mkinstalldirs) $(distdir)/../.. $(distdir)/images - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -33567,15 +36697,15 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -435,7 +372,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -511,7 +390,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am -@@ -456,7 +392,7 @@ mostlyclean-generic: +@@ -532,7 +410,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -33584,7 +36714,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -467,7 +403,7 @@ clean-am: clean-generic clean-libtool mo +@@ -543,7 +421,7 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -33593,7 +36723,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in dvi: dvi-am -@@ -479,12 +415,20 @@ info-am: +@@ -555,12 +433,20 @@ info-am: install-data-am: @@ -33614,7 +36744,7 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -495,25 +439,27 @@ mostlyclean: mostlyclean-am +@@ -571,25 +457,27 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -33631,18 +36761,18 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in + +.MAKE: install-am install-strip - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ -- distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am info info-am install install-am install-data \ + .PHONY: all all-am check check-am check-local clean clean-generic \ +- clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am -+ dist-hook distclean distclean-generic distclean-libtool \ -+ distdir dvi dvi-am html html-am info info-am install \ -+ install-am install-data install-data-am install-dvi \ ++ clean-libtool dist-hook distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ @@ -33651,12 +36781,12 @@ Index: gtk+-2.12.12/docs/tutorial/Makefile.in + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am - .PHONY: html pdf + # call as: $(XVFB_START) && someprogram -Index: gtk+-2.12.12/gdk/directfb/Makefile.in +Index: gtk+-2.14.7/gdk/directfb/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk/directfb/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk/directfb/Makefile.in 2008-12-09 21:03:26.401716628 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/Makefile.in 2009-02-17 23:15:21.559089680 +0100 ++++ gtk+-2.14.7/gdk/directfb/Makefile.in 2009-02-21 14:58:43.446583063 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -33669,9 +36799,9 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -33687,15 +36817,15 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,59 @@ POST_INSTALL = : +@@ -37,10 +33,60 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = gdk/directfb +DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in AUTHORS TODO ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO ++subdir = gdk/directfb +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -33706,8 +36836,8 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgdk_directfb_la_LIBADD = -+am_libgdk_directfb_la_OBJECTS = gdkcolor-directfb.lo \ -+ gdkcursor-directfb.lo gdkdnd-directfb.lo \ ++am_libgdk_directfb_la_OBJECTS = gdkapplaunchcontext-directfb.lo \ ++ gdkcolor-directfb.lo gdkcursor-directfb.lo gdkdnd-directfb.lo \ + gdkdisplay-directfb.lo gdkdrawable-directfb.lo \ + gdkevents-directfb.lo gdkfont-directfb.lo gdkgc-directfb.lo \ + gdkgeometry-directfb.lo gdkglobals-directfb.lo \ @@ -33715,7 +36845,8 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in + gdkkeys-directfb.lo gdkmain-directfb.lo gdkpixmap-directfb.lo \ + gdkproperty-directfb.lo gdkscreen-directfb.lo \ + gdkselection-directfb.lo gdkspawn-directfb.lo \ -+ gdkvisual-directfb.lo gdkwindow-directfb.lo gdkwindowid.lo ++ gdktestutils-directfb.lo gdkvisual-directfb.lo \ ++ gdkwindow-directfb.lo gdkwindowid.lo +libgdk_directfb_la_OBJECTS = $(am_libgdk_directfb_la_OBJECTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -33749,12 +36880,14 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +94,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +97,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -33771,7 +36904,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +122,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -33780,7 +36913,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +126,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +129,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -33791,7 +36924,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +149,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33799,7 +36932,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +168,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -33808,7 +36941,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +178,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +184,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -33819,6 +36952,10 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -33830,16 +36967,48 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -33865,7 +37034,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +203,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +213,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -33891,7 +37060,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +222,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +232,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -33900,7 +37069,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +233,10 @@ SED = @SED@ +@@ -297,28 +243,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -33929,7 +37098,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +245,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +255,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -33959,7 +37128,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +286,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +296,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -33967,7 +37136,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,11 +295,12 @@ program_transform_name = @program_transf +@@ -373,14 +305,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -33977,12 +37146,26 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = AUTHORS README TODO ++EXTRA_DIST = AUTHORS README TODO + TEST_PROGS = + + ### testing rules +@@ -406,9 +340,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- libgdkincludedir = $(includedir)/gtk-2.0/gdk - INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ -DGDK_COMPILATION \ -@@ -343,13 +311,10 @@ INCLUDES = \ +@@ -419,13 +351,10 @@ INCLUDES = \ @GTK_DEBUG_FLAGS@ \ @GDK_DEP_CFLAGS@ @@ -33994,9 +37177,9 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in noinst_LTLIBRARIES = libgdk-directfb.la - libgdk_directfb_la_SOURCES = \ + gdkapplaunchcontext-directfb.c \ gdkcolor-directfb.c \ - gdkcursor-directfb.c \ -@@ -380,97 +345,58 @@ libgdk_directfb_la_SOURCES = \ +@@ -458,98 +387,57 @@ libgdk_directfb_la_SOURCES = \ gdkwindowid.c \ x-cursors.xbm @@ -34005,8 +37188,6 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in gdkdirectfb.h \ gdkprivate-directfb.h -- - EXTRA_DIST = AUTHORS README TODO -subdir = gdk/directfb -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -34016,22 +37197,24 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in - -libgdk_directfb_la_LDFLAGS = -libgdk_directfb_la_LIBADD = --am_libgdk_directfb_la_OBJECTS = gdkcolor-directfb.lo \ -- gdkcursor-directfb.lo gdkdnd-directfb.lo gdkdisplay-directfb.lo \ -- gdkdrawable-directfb.lo gdkevents-directfb.lo \ -- gdkfont-directfb.lo gdkgc-directfb.lo gdkgeometry-directfb.lo \ -- gdkglobals-directfb.lo gdkim-directfb.lo gdkimage-directfb.lo \ -- gdkinput-directfb.lo gdkkeys-directfb.lo gdkmain-directfb.lo \ -- gdkpixmap-directfb.lo gdkproperty-directfb.lo \ -- gdkscreen-directfb.lo gdkselection-directfb.lo \ -- gdkspawn-directfb.lo gdkvisual-directfb.lo \ +-am_libgdk_directfb_la_OBJECTS = gdkapplaunchcontext-directfb.lo \ +- gdkcolor-directfb.lo gdkcursor-directfb.lo gdkdnd-directfb.lo \ +- gdkdisplay-directfb.lo gdkdrawable-directfb.lo \ +- gdkevents-directfb.lo gdkfont-directfb.lo gdkgc-directfb.lo \ +- gdkgeometry-directfb.lo gdkglobals-directfb.lo \ +- gdkim-directfb.lo gdkimage-directfb.lo gdkinput-directfb.lo \ +- gdkkeys-directfb.lo gdkmain-directfb.lo gdkpixmap-directfb.lo \ +- gdkproperty-directfb.lo gdkscreen-directfb.lo \ +- gdkselection-directfb.lo gdkspawn-directfb.lo \ +- gdktestutils-directfb.lo gdkvisual-directfb.lo \ - gdkwindow-directfb.lo gdkwindowid.lo -libgdk_directfb_la_OBJECTS = $(am_libgdk_directfb_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkcolor-directfb.Plo \ +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-directfb.Plo \ @@ -34051,6 +37234,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-directfb.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowid.Plo @@ -34065,15 +37249,15 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in -HEADERS = $(libgdkinclude_HEADERS) - -DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- AUTHORS Makefile.am TODO +- $(top_srcdir)/Makefile.decl AUTHORS Makefile.am TODO -SOURCES = $(libgdk_directfb_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -34124,7 +37308,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -500,82 +426,58 @@ distclean-compile: +@@ -581,82 +469,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowid.Plo@am__quote@ .c.o: @@ -34229,7 +37413,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -585,23 +487,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -666,23 +530,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -34262,7 +37446,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -613,28 +515,23 @@ GTAGS: +@@ -694,29 +558,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -34272,6 +37456,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -34304,8 +37489,8 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -648,9 +545,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -731,9 +589,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) - @@ -34317,7 +37502,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -670,7 +568,7 @@ mostlyclean-generic: +@@ -753,7 +612,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -34326,7 +37511,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -684,24 +582,34 @@ distclean: distclean-am +@@ -767,24 +626,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -34362,7 +37547,7 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -722,20 +630,23 @@ ps: ps-am +@@ -805,19 +674,23 @@ ps: ps-am ps-am: @@ -34371,32 +37556,35 @@ Index: gtk+-2.12.12/gdk/directfb/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libgdkincludeHEADERS install-man install-strip \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libgdkincludeHEADERS install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ -- uninstall-libgdkincludeHEADERS -+ tags uninstall uninstall-am uninstall-libgdkincludeHEADERS ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgdkincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libgdkincludeHEADERS - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/gdk/Makefile.in + # call as: $(XVFB_START) && someprogram +Index: gtk+-2.14.7/gdk/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk/Makefile.in 2008-12-09 21:03:26.253716742 +0100 +--- gtk+-2.14.7.orig/gdk/Makefile.in 2009-02-17 23:15:21.507088028 +0100 ++++ gtk+-2.14.7/gdk/Makefile.in 2009-02-21 14:58:43.266582462 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -34409,9 +37597,9 @@ Index: gtk+-2.12.12/gdk/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,13 @@ +@@ -16,16 +16,13 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -34428,15 +37616,15 @@ Index: gtk+-2.12.12/gdk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +32,143 @@ POST_INSTALL = : +@@ -37,10 +34,143 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = gdk +DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in COPYING ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl COPYING ++subdir = gdk +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -34459,24 +37647,24 @@ Index: gtk+-2.12.12/gdk/Makefile.in + $(am__DEPENDENCIES_1) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -+ gdkcairo.c gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c \ -+ gdkdraw.c gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -+ gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -+ gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ -+ gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -+ gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ -+ gdkmarshalers.h ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h +@USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo -+am__objects_2 = $(am__objects_1) gdk.lo gdkcairo.lo gdkcolor.lo \ -+ gdkcursor.lo gdkdisplay.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ -+ gdkfont.lo gdkgc.lo gdkglobals.lo gdkkeys.lo gdkkeyuni.lo \ -+ gdkimage.lo gdkdisplaymanager.lo gdkpango.lo \ -+ gdkpixbuf-drawable.lo gdkpixbuf-render.lo gdkpixmap.lo \ -+ gdkpolyreg-generic.lo gdkrgb.lo gdkrectangle.lo \ -+ gdkregion-generic.lo gdkscreen.lo gdkselection.lo gdkvisual.lo \ -+ gdkwindow.lo ++am__objects_2 = $(am__objects_1) gdk.lo gdkapplaunchcontext.lo \ ++ gdkcairo.lo gdkcolor.lo gdkcursor.lo gdkdisplay.lo \ ++ gdkdisplaymanager.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ ++ gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkkeys.lo \ ++ gdkkeyuni.lo gdkpango.lo gdkpixbuf-drawable.lo \ ++ gdkpixbuf-render.lo gdkpixmap.lo gdkpolyreg-generic.lo \ ++ gdkrectangle.lo gdkregion-generic.lo gdkrgb.lo gdkscreen.lo \ ++ gdkselection.lo gdkvisual.lo gdkwindow.lo gdkwindowimpl.lo +am__objects_3 = $(am__objects_2) gdkenumtypes.lo +am_libgdk_directfb_2_0_la_OBJECTS = $(am__objects_3) +libgdk_directfb_2_0_la_OBJECTS = $(am_libgdk_directfb_2_0_la_OBJECTS) @@ -34486,31 +37674,31 @@ Index: gtk+-2.12.12/gdk/Makefile.in +libgdk_quartz_2_0_la_DEPENDENCIES = quartz/libgdk-quartz.la \ + $(am__DEPENDENCIES_1) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -+ gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -+ gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -+ gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ -+ gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -+ gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ -+ gdkmarshalers.h gdkkeynames.c ++am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h gdkkeynames.c +am_libgdk_quartz_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo +libgdk_quartz_2_0_la_OBJECTS = $(am_libgdk_quartz_2_0_la_OBJECTS) +libgdk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libgdk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -+ gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -+ gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -+ gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ -+ gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -+ gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ -+ gdkmarshalers.h gdkkeynames.c ++am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h gdkkeynames.c +am_libgdk_win32_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo +libgdk_win32_2_0_la_OBJECTS = $(am_libgdk_win32_2_0_la_OBJECTS) +libgdk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -34519,16 +37707,16 @@ Index: gtk+-2.12.12/gdk/Makefile.in +libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la \ + $(am__DEPENDENCIES_1) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -+ gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -+ gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -+ gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ -+ gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -+ gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ -+ gdkmarshalers.h ++am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h +am_libgdk_x11_2_0_la_OBJECTS = $(am__objects_3) +libgdk_x11_2_0_la_OBJECTS = $(am_libgdk_x11_2_0_la_OBJECTS) +libgdk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -34574,12 +37762,14 @@ Index: gtk+-2.12.12/gdk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +179,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +181,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -34596,7 +37786,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +204,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +206,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -34605,7 +37795,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +211,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +213,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -34616,7 +37806,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +234,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +239,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34624,7 +37814,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +253,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +258,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -34633,7 +37823,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +263,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +268,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -34644,6 +37834,10 @@ Index: gtk+-2.12.12/gdk/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -34655,16 +37849,48 @@ Index: gtk+-2.12.12/gdk/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -34690,7 +37916,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +288,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +297,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -34716,7 +37942,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +307,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +316,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -34725,7 +37951,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +318,10 @@ SED = @SED@ +@@ -297,28 +327,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -34754,7 +37980,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +330,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +339,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -34784,7 +38010,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +371,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +380,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -34792,7 +38018,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,12 +380,13 @@ program_transform_name = @program_transf +@@ -373,31 +389,21 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -34802,21 +38028,49 @@ Index: gtk+-2.12.12/gdk/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - SUBDIRS = $(gdktarget) - DIST_SUBDIRS = win32 x11 quartz directfb -- - EXTRA_DIST = \ - keynames.txt \ - keyname-table.h \ -@@ -351,7 +404,6 @@ EXTRA_DIST = \ - abicheck.sh \ - pltcheck.sh + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- keynames.txt \ +- keyname-table.h \ +- gen-keyname-table.pl \ +- gdkconfig.h.win32 \ +- gdkkeysyms-update.pl \ +- gdk.def \ +- gdkmarshalers.list \ +- gdkmedialib.h \ +- makeenums.pl \ +- makefile.msc \ +- gdk.symbols \ +- makegdkalias.pl \ +- gdkenumtypes.c.template \ +- gdkenumtypes.h.template \ +- abicheck.sh \ +- pltcheck.sh\ +-$(gdk_built_sources) ++EXTRA_DIST = keynames.txt keyname-table.h gen-keyname-table.pl \ ++ gdkconfig.h.win32 gdkkeysyms-update.pl gdk.def \ ++ gdkmarshalers.list gdkmedialib.h makeenums.pl makefile.msc \ ++ gdk.symbols makegdkalias.pl gdkenumtypes.c.template \ ++ gdkenumtypes.h.template abicheck.sh pltcheck.sh \ ++ $(gdk_built_sources) + TEST_PROGS = + + ### testing rules +@@ -423,10 +429,8 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = $(gdktarget) . tests + DIST_SUBDIRS = win32 x11 quartz directfb tests - INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -362,9 +414,7 @@ INCLUDES = \ +@@ -436,9 +440,7 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -34826,7 +38080,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined # libtool stuff: set version and export symbols for resolving -@@ -378,7 +428,6 @@ LDADD = \ +@@ -452,7 +454,6 @@ LDADD = \ $(LIBTOOL_EXPORT_OPTIONS) @USE_MEDIALIB_FALSE@medialib_sources = @@ -34834,30 +38088,41 @@ Index: gtk+-2.12.12/gdk/Makefile.in @USE_MEDIALIB_TRUE@medialib_sources = \ @USE_MEDIALIB_TRUE@ gdkmedialib.c -@@ -419,14 +468,12 @@ gdk_public_h_sources = \ +@@ -496,17 +497,14 @@ gdk_public_h_sources = \ gdkvisual.h \ gdkwindow.h - - gdk_headers = \ - $(gdk_public_h_sources) \ - gdkenumtypes.h \ - gdkprivate.h \ + gdk_built_public_sources = \ + gdkenumtypes.h + +- + gdk_built_private_headers = \ + gdkprivate.h \ + gdkwindowimpl.h \ gdkalias.h - gdk_c_sources = \ $(medialib_sources) \ gdk.c \ -@@ -462,7 +509,6 @@ gdk_c_sources = \ - gdkwindow.c +@@ -543,7 +541,6 @@ gdk_c_sources = \ + gdkwindow.c \ + gdkwindowimpl.c + +- + gdk_built_sources = \ + gdkaliasdef.c \ + gdkenumtypes.c \ +@@ -553,7 +550,6 @@ gdk_built_sources = \ + $(gdk_built_private_headers) - # # setup GDK sources and their dependencies # -@@ -475,40 +521,31 @@ common_sources = \ +@@ -566,40 +562,31 @@ common_sources = \ gdkenumtypes.c \ gdkmarshalers.h @@ -34895,11 +38160,11 @@ Index: gtk+-2.12.12/gdk/Makefile.in - EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la - - MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \ - gdkmarshalers.h gdkmarshalers.c + MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h + EXTRA_HEADERS = -@@ -529,180 +566,79 @@ BUILT_SOURCES = \ - gdkmarshalers.c \ +@@ -613,183 +600,79 @@ BUILT_SOURCES = \ + $(gdk_built_sources) \ gdkconfig.h - @@ -34913,66 +38178,66 @@ Index: gtk+-2.12.12/gdk/Makefile.in - -libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -- gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -- gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -- gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -- gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ +-am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ - gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -- gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -- gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ - gdkmarshalers.h -@USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo -@USE_MEDIALIB_FALSE@am__objects_1 = --am__objects_2 = $(am__objects_1) gdk.lo gdkcairo.lo gdkcolor.lo \ -- gdkcursor.lo gdkdisplay.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ -- gdkfont.lo gdkgc.lo gdkglobals.lo gdkkeys.lo gdkkeyuni.lo \ -- gdkimage.lo gdkdisplaymanager.lo gdkpango.lo \ -- gdkpixbuf-drawable.lo gdkpixbuf-render.lo gdkpixmap.lo \ -- gdkpolyreg-generic.lo gdkrgb.lo gdkrectangle.lo \ -- gdkregion-generic.lo gdkscreen.lo gdkselection.lo gdkvisual.lo \ -- gdkwindow.lo +-am__objects_2 = $(am__objects_1) gdk.lo gdkapplaunchcontext.lo \ +- gdkcairo.lo gdkcolor.lo gdkcursor.lo gdkdisplay.lo \ +- gdkdisplaymanager.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ +- gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkkeys.lo \ +- gdkkeyuni.lo gdkpango.lo gdkpixbuf-drawable.lo \ +- gdkpixbuf-render.lo gdkpixmap.lo gdkpolyreg-generic.lo \ +- gdkrectangle.lo gdkregion-generic.lo gdkrgb.lo gdkscreen.lo \ +- gdkselection.lo gdkvisual.lo gdkwindow.lo gdkwindowimpl.lo -am__objects_3 = $(am__objects_2) gdkenumtypes.lo -am_libgdk_directfb_2_0_la_OBJECTS = $(am__objects_3) -libgdk_directfb_2_0_la_OBJECTS = $(am_libgdk_directfb_2_0_la_OBJECTS) -libgdk_quartz_2_0_la_DEPENDENCIES = quartz/libgdk-quartz.la \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -- gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -- gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -- gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -- gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ +-am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ - gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -- gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -- gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ - gdkmarshalers.h gdkkeynames.c -am_libgdk_quartz_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo -libgdk_quartz_2_0_la_OBJECTS = $(am_libgdk_quartz_2_0_la_OBJECTS) --am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -- gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -- gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -- gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -- gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ +-am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ - gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -- gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -- gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ - gdkmarshalers.h gdkkeynames.c -am_libgdk_win32_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo -libgdk_win32_2_0_la_OBJECTS = $(am_libgdk_win32_2_0_la_OBJECTS) -libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c gdkcairo.c \ -- gdkcolor.c gdkcursor.c gdkdisplay.c gdkdnd.c gdkdraw.c \ -- gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkkeys.c \ -- gdkkeyuni.c gdkimage.c gdkinternals.h gdkintl.h \ -- gdkdisplaymanager.c gdkpango.c gdkpixbuf-drawable.c \ +-am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ - gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrgb.c gdkrectangle.c \ -- gdkregion-generic.c gdkregion-generic.h gdkscreen.c \ -- gdkselection.c gdkvisual.c gdkwindow.c gdkenumtypes.c \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ - gdkmarshalers.h -am_libgdk_x11_2_0_la_OBJECTS = $(am__objects_3) -libgdk_x11_2_0_la_OBJECTS = $(am_libgdk_x11_2_0_la_OBJECTS) @@ -34980,8 +38245,10 @@ Index: gtk+-2.12.12/gdk/Makefile.in -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk.Plo ./$(DEPDIR)/gdkcairo.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor.Plo ./$(DEPDIR)/gdkcursor.Plo \ +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcairo.Plo ./$(DEPDIR)/gdkcolor.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplaymanager.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd.Plo ./$(DEPDIR)/gdkdraw.Plo \ @@ -35001,7 +38268,8 @@ Index: gtk+-2.12.12/gdk/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gdkregion-generic.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkrgb.Plo ./$(DEPDIR)/gdkscreen.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual.Plo ./$(DEPDIR)/gdkwindow.Plo +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual.Plo ./$(DEPDIR)/gdkwindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowimpl.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -35023,8 +38291,8 @@ Index: gtk+-2.12.12/gdk/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.in COPYING \ -- Makefile.am +-DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl COPYING Makefile.am -SOURCES = $(libgdk_directfb_2_0_la_SOURCES) $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) $(libgdk_x11_2_0_la_SOURCES) - all: $(BUILT_SOURCES) @@ -35032,8 +38300,8 @@ Index: gtk+-2.12.12/gdk/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -35119,8 +38387,8 @@ Index: gtk+-2.12.12/gdk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -739,64 +675,47 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow.Plo@am__quote@ +@@ -828,64 +711,47 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowimpl.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @@ -35203,7 +38471,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -806,7 +725,13 @@ uninstall-gdkincludeHEADERS: +@@ -895,7 +761,13 @@ uninstall-gdkincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -35218,7 +38486,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -818,15 +743,20 @@ $(RECURSIVE_TARGETS): +@@ -907,15 +779,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -35243,7 +38511,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -847,7 +777,7 @@ maintainer-clean-recursive: +@@ -936,7 +813,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -35252,7 +38520,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -858,35 +788,30 @@ ctags-recursive: +@@ -947,35 +824,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -35295,7 +38563,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -894,23 +819,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -983,23 +855,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -35328,7 +38596,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -924,9 +849,9 @@ distclean-tags: +@@ -1013,9 +885,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -35340,7 +38608,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -935,25 +860,25 @@ check-TESTS: $(TESTS) +@@ -1024,25 +896,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -35376,7 +38644,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in ;; \ esac; \ else \ -@@ -978,45 +903,40 @@ check-TESTS: $(TESTS) +@@ -1067,46 +939,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -35407,6 +38675,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -35439,7 +38708,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1029,13 +949,17 @@ distdir: $(DISTFILES) +@@ -1119,13 +985,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -35461,7 +38730,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -1047,8 +971,9 @@ check: $(BUILT_SOURCES) +@@ -1137,8 +1007,9 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -35473,7 +38742,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -1069,14 +994,14 @@ mostlyclean-generic: +@@ -1159,14 +1030,14 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -35490,7 +38759,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -@@ -1086,26 +1011,36 @@ distclean: distclean-recursive +@@ -1176,26 +1047,36 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -35528,7 +38797,7 @@ Index: gtk+-2.12.12/gdk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -1126,32 +1061,30 @@ ps: ps-recursive +@@ -1216,32 +1097,30 @@ ps: ps-recursive ps-am: @@ -35542,8 +38811,8 @@ Index: gtk+-2.12.12/gdk/Makefile.in + install-exec-am install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ -- check-am clean clean-generic clean-libLTLIBRARIES clean-libtool \ -- clean-recursive ctags ctags-recursive distclean \ +- check-am check-local clean clean-generic clean-libLTLIBRARIES \ +- clean-libtool clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-local distclean-recursive distclean-tags distdir dvi \ - dvi-am dvi-recursive info info-am info-recursive install \ @@ -35563,9 +38832,9 @@ Index: gtk+-2.12.12/gdk/Makefile.in - uninstall-info-recursive uninstall-libLTLIBRARIES \ - uninstall-local uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-TESTS check-am clean clean-generic \ -+ clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ -+ distclean distclean-compile distclean-generic \ ++ all all-am check check-TESTS check-am check-local clean \ ++ clean-generic clean-libLTLIBRARIES clean-libtool ctags \ ++ ctags-recursive distclean distclean-compile distclean-generic \ + distclean-libtool distclean-local distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ @@ -35581,12 +38850,12 @@ Index: gtk+-2.12.12/gdk/Makefile.in + uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \ + uninstall-local + # call as: $(XVFB_START) && someprogram - @OS_WIN32_TRUE@install-def-file: gdk.def -Index: gtk+-2.12.12/gdk/quartz/Makefile.in +Index: gtk+-2.14.7/gdk/quartz/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk/quartz/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk/quartz/Makefile.in 2008-12-09 21:03:26.537714290 +0100 +--- gtk+-2.14.7.orig/gdk/quartz/Makefile.in 2009-02-17 23:15:21.479082514 +0100 ++++ gtk+-2.14.7/gdk/quartz/Makefile.in 2009-02-21 14:58:43.623082240 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -35599,12 +38868,13 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ ++ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35616,14 +38886,15 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,48 @@ POST_INSTALL = : +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl +subdir = gdk/quartz -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -35635,14 +38906,15 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgdk_quartz_la_LIBADD = +am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.lo \ -+ gdkcolor-quartz.lo gdkcursor-quartz.lo gdkdisplay-quartz.lo \ -+ gdkdnd-quartz.lo gdkdrawable-quartz.lo gdkevents-quartz.lo \ ++ gdkapplaunchcontext-quartz.lo gdkcolor-quartz.lo \ ++ gdkcursor-quartz.lo gdkdisplay-quartz.lo gdkdnd-quartz.lo \ ++ gdkdrawable-quartz.lo gdkevents-quartz.lo \ + gdkeventloop-quartz.lo gdkfont-quartz.lo gdkgc-quartz.lo \ + gdkgeometry-quartz.lo gdkglobals-quartz.lo gdkim-quartz.lo \ + gdkimage-quartz.lo gdkinput.lo gdkkeys-quartz.lo \ + gdkmain-quartz.lo gdkpixmap-quartz.lo gdkproperty-quartz.lo \ + gdkscreen-quartz.lo gdkselection-quartz.lo gdkspawn-quartz.lo \ -+ gdkvisual-quartz.lo gdkwindow-quartz.lo ++ gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo +libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -35658,6 +38930,15 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in + $(LDFLAGS) -o $@ +SOURCES = $(libgdk_quartz_la_SOURCES) +DIST_SOURCES = $(libgdk_quartz_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libgdkincludedir)" ++libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdkinclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -35667,12 +38948,14 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +82,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -35689,7 +38972,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -35698,7 +38981,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +114,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -35709,7 +38992,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +137,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -35717,7 +39000,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +156,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -35726,7 +39009,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +166,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -35737,6 +39020,10 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -35748,16 +39035,48 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -35783,7 +39102,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +191,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -35809,7 +39128,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +210,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -35818,7 +39137,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +221,10 @@ SED = @SED@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -35847,7 +39166,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +233,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -35877,7 +39196,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +274,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -35885,21 +39204,30 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,10 +283,12 @@ program_transform_name = @program_transf +@@ -373,9 +304,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +339,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- libgdkincludedir = $(includedir)/gtk-2.0/gdk - INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -342,11 +299,8 @@ INCLUDES = \ +@@ -419,11 +350,8 @@ INCLUDES = \ $(GDK_DEP_CFLAGS) \ "-xobjective-c" @@ -35911,10 +39239,14 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in libgdk_quartz_la_SOURCES = \ GdkQuartzView.c \ GdkQuartzView.h \ -@@ -383,88 +337,53 @@ libgdk_quartz_la_SOURCES = \ +@@ -462,98 +390,56 @@ libgdk_quartz_la_SOURCES = \ gdkwindow-quartz.h \ xcursors.h +- + libgdkinclude_HEADERS = \ + gdkquartz.h + -subdir = gdk/quartz -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -35925,14 +39257,15 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -libgdk_quartz_la_LDFLAGS = -libgdk_quartz_la_LIBADD = -am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.lo \ -- gdkcolor-quartz.lo gdkcursor-quartz.lo gdkdisplay-quartz.lo \ -- gdkdnd-quartz.lo gdkdrawable-quartz.lo gdkevents-quartz.lo \ +- gdkapplaunchcontext-quartz.lo gdkcolor-quartz.lo \ +- gdkcursor-quartz.lo gdkdisplay-quartz.lo gdkdnd-quartz.lo \ +- gdkdrawable-quartz.lo gdkevents-quartz.lo \ - gdkeventloop-quartz.lo gdkfont-quartz.lo gdkgc-quartz.lo \ - gdkgeometry-quartz.lo gdkglobals-quartz.lo gdkim-quartz.lo \ - gdkimage-quartz.lo gdkinput.lo gdkkeys-quartz.lo \ - gdkmain-quartz.lo gdkpixmap-quartz.lo gdkproperty-quartz.lo \ - gdkscreen-quartz.lo gdkselection-quartz.lo gdkspawn-quartz.lo \ -- gdkvisual-quartz.lo gdkwindow-quartz.lo +- gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo -libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -35940,6 +39273,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GdkQuartzView.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/GdkQuartzWindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-quartz.Plo \ @@ -35961,6 +39295,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-quartz.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-quartz.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -35971,15 +39306,18 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libgdk_quartz_la_SOURCES) --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-HEADERS = $(libgdkinclude_HEADERS) +- +-DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am -SOURCES = $(libgdk_quartz_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -36030,7 +39368,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -496,37 +415,25 @@ distclean-compile: +@@ -587,82 +473,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-quartz.Plo@am__quote@ .c.o: @@ -36080,14 +39418,39 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -534,26 +441,15 @@ mostlyclean-libtool: + clean-libtool: -rm -rf .libs _libs - +- -distclean-libtool: - -rm -f libtool -uninstall-info-am: -- +-libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + + uninstall-libgdkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + -ETAGS = etags -ETAGSFLAGS = - @@ -36110,7 +39473,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -563,23 +459,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -672,23 +534,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -36143,7 +39506,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -591,28 +487,23 @@ GTAGS: +@@ -700,29 +562,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -36153,6 +39516,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -36185,15 +39549,20 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -626,7 +517,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -737,9 +593,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am - all-am: Makefile $(LTLIBRARIES) + all-am: Makefile $(LTLIBRARIES) $(HEADERS) - installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done install: install-am install-exec: install-exec-am -@@ -647,7 +537,7 @@ mostlyclean-generic: + install-data: install-data-am +@@ -759,7 +616,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -36202,7 +39571,791 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -661,24 +551,34 @@ distclean: distclean-am +@@ -773,24 +630,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-libgdkincludeHEADERS + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -811,19 +678,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS ++uninstall-am: uninstall-libgdkincludeHEADERS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-libgdkincludeHEADERS install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgdkincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libgdkincludeHEADERS + + # call as: $(XVFB_START) && someprogram +Index: gtk+-2.14.7/gdk/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/tests/Makefile.in 2009-02-17 23:15:21.415087439 +0100 ++++ gtk+-2.14.7/gdk/tests/Makefile.in 2009-02-21 14:58:43.794582040 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,47 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++check_PROGRAMS = check-gdk-cairo$(EXEEXT) ++subdir = gdk/tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__objects_1 = ++am_check_gdk_cairo_OBJECTS = check-gdk-cairo.$(OBJEXT) \ ++ $(am__objects_1) ++check_gdk_cairo_OBJECTS = $(am_check_gdk_cairo_OBJECTS) ++am__DEPENDENCIES_1 = ++check_gdk_cairo_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ ++ $(am__DEPENDENCIES_1) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(check_gdk_cairo_SOURCES) ++DIST_SOURCES = $(check_gdk_cairo_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +228,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +290,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,20 +325,15 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + NULL = +- +-check_PROGRAMS = check-gdk-cairo + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +- + AM_CPPFLAGS = \ + $(GDK_DEP_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + $(NULL) + +- + check_gdk_cairo_SOURCES = \ + check-gdk-cairo.c \ + $(NULL) +@@ -430,50 +344,43 @@ check_gdk_cairo_LDADD = \ + $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ + $(NULL) + +- + CLEANFILES = \ + cairosurface.png \ + gdksurface.png + +-subdir = gdk/tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-check_PROGRAMS = check-gdk-cairo$(EXEEXT) +-am__objects_1 = +-am_check_gdk_cairo_OBJECTS = check-gdk-cairo.$(OBJEXT) $(am__objects_1) +-check_gdk_cairo_OBJECTS = $(am_check_gdk_cairo_OBJECTS) +-check_gdk_cairo_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la +-check_gdk_cairo_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/check-gdk-cairo.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(check_gdk_cairo_SOURCES) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(check_gdk_cairo_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ +@@ -483,10 +390,10 @@ clean-checkPROGRAMS: + done + check-gdk-cairo$(EXEEXT): $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_DEPENDENCIES) + @rm -f check-gdk-cairo$(EXEEXT) +- $(LINK) $(check_gdk_cairo_LDFLAGS) $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_LDADD) $(LIBS) ++ $(LINK) $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -494,37 +401,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gdk-cairo.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -532,26 +427,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -561,23 +445,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -591,9 +475,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -602,25 +486,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -645,46 +529,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -700,7 +578,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local + check: check-am + all-am: Makefile +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -722,37 +599,48 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-checkPROGRAMS clean-generic clean-libtool mostlyclean-am ++clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ ++ mostlyclean-am + + distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -36238,7 +40391,7 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -699,18 +599,22 @@ ps: ps-am +@@ -773,18 +661,23 @@ ps: ps-am ps-am: @@ -36247,30 +40400,34 @@ Index: gtk+-2.12.12/gdk/quartz/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-checkPROGRAMS clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/gdk/win32/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/gdk/win32/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk/win32/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk/win32/Makefile.in 2008-12-09 21:03:26.697714443 +0100 +--- gtk+-2.14.7.orig/gdk/win32/Makefile.in 2009-02-17 23:15:21.367089300 +0100 ++++ gtk+-2.14.7/gdk/win32/Makefile.in 2009-02-21 14:58:43.982582819 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -36283,9 +40440,9 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -36301,15 +40458,15 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,68 @@ POST_INSTALL = : +@@ -37,10 +33,69 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = gdk/win32 +DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = gdk/win32 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -36320,14 +40477,15 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgdk_win32_la_LIBADD = -+am_libgdk_win32_la_OBJECTS = gdkcolor-win32.lo gdkcursor-win32.lo \ -+ gdkdisplay-win32.lo gdkdnd-win32.lo gdkdrawable-win32.lo \ -+ gdkevents-win32.lo gdkfont-win32.lo gdkgc-win32.lo \ -+ gdkgeometry-win32.lo gdkglobals-win32.lo gdkim-win32.lo \ -+ gdkimage-win32.lo gdkinput.lo gdkinput-win32.lo \ -+ gdkkeys-win32.lo gdkmain-win32.lo gdkpixmap-win32.lo \ -+ gdkproperty-win32.lo gdkscreen-win32.lo gdkselection-win32.lo \ -+ gdkspawn-win32.lo gdkvisual-win32.lo gdkwin32id.lo \ ++am_libgdk_win32_la_OBJECTS = gdkapplaunchcontext-win32.lo \ ++ gdkcolor-win32.lo gdkcursor-win32.lo gdkdisplay-win32.lo \ ++ gdkdnd-win32.lo gdkdrawable-win32.lo gdkevents-win32.lo \ ++ gdkfont-win32.lo gdkgc-win32.lo gdkgeometry-win32.lo \ ++ gdkglobals-win32.lo gdkim-win32.lo gdkimage-win32.lo \ ++ gdkinput.lo gdkinput-win32.lo gdkkeys-win32.lo \ ++ gdkmain-win32.lo gdkpixmap-win32.lo gdkproperty-win32.lo \ ++ gdkscreen-win32.lo gdkselection-win32.lo gdkspawn-win32.lo \ ++ gdktestutils-win32.lo gdkvisual-win32.lo gdkwin32id.lo \ + gdkwindow-win32.lo +libgdk_win32_la_OBJECTS = $(am_libgdk_win32_la_OBJECTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -36372,12 +40530,14 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +103,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +106,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -36394,7 +40554,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +131,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -36403,7 +40563,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +135,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +138,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -36414,7 +40574,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +158,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +164,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -36422,7 +40582,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +177,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +183,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -36431,7 +40591,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +187,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +193,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -36442,6 +40602,10 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -36453,16 +40617,48 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -36488,7 +40684,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +222,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -36514,7 +40710,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +241,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -36523,7 +40719,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +242,10 @@ SED = @SED@ +@@ -297,28 +252,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -36552,7 +40748,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +264,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -36582,7 +40778,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +295,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +305,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -36590,7 +40786,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,11 +304,12 @@ program_transform_name = @program_transf +@@ -373,17 +314,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -36600,12 +40796,29 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- bdfcursor.c \ +- makefile.msc +- ++EXTRA_DIST = bdfcursor.c makefile.msc + TEST_PROGS = + + ### testing rules +@@ -409,9 +349,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- libgdkincludedir = $(includedir)/gtk-2.0/gdk - INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DINSIDE_GDK_WIN32 \ -@@ -344,18 +321,13 @@ INCLUDES = \ +@@ -423,13 +361,9 @@ INCLUDES = \ $(GDK_WIN32_EXTRA_CFLAGS)\ -DGDK_COMPILATION @@ -36615,16 +40828,11 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in noinst_LTLIBRARIES = libgdk-win32.la - SUBDIRS = rc -- - EXTRA_DIST = \ - bdfcursor.c \ - makefile.msc - - libgdk_win32_la_SOURCES = \ xcursors.h \ - gdkcolor-win32.c \ -@@ -391,101 +363,56 @@ libgdk_win32_la_SOURCES = \ + gdkapplaunchcontext-win32.c \ +@@ -467,103 +401,56 @@ libgdk_win32_la_SOURCES = \ wintab.h \ pktdef.h @@ -36641,21 +40849,22 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in - -libgdk_win32_la_LDFLAGS = -libgdk_win32_la_LIBADD = --am_libgdk_win32_la_OBJECTS = gdkcolor-win32.lo gdkcursor-win32.lo \ -- gdkdisplay-win32.lo gdkdnd-win32.lo gdkdrawable-win32.lo \ -- gdkevents-win32.lo gdkfont-win32.lo gdkgc-win32.lo \ -- gdkgeometry-win32.lo gdkglobals-win32.lo gdkim-win32.lo \ -- gdkimage-win32.lo gdkinput.lo gdkinput-win32.lo \ -- gdkkeys-win32.lo gdkmain-win32.lo gdkpixmap-win32.lo \ -- gdkproperty-win32.lo gdkscreen-win32.lo gdkselection-win32.lo \ -- gdkspawn-win32.lo gdkvisual-win32.lo gdkwin32id.lo \ -- gdkwindow-win32.lo +-am_libgdk_win32_la_OBJECTS = gdkapplaunchcontext-win32.lo \ +- gdkcolor-win32.lo gdkcursor-win32.lo gdkdisplay-win32.lo \ +- gdkdnd-win32.lo gdkdrawable-win32.lo gdkevents-win32.lo \ +- gdkfont-win32.lo gdkgc-win32.lo gdkgeometry-win32.lo \ +- gdkglobals-win32.lo gdkim-win32.lo gdkimage-win32.lo \ +- gdkinput.lo gdkinput-win32.lo gdkkeys-win32.lo gdkmain-win32.lo \ +- gdkpixmap-win32.lo gdkproperty-win32.lo gdkscreen-win32.lo \ +- gdkselection-win32.lo gdkspawn-win32.lo gdktestutils-win32.lo \ +- gdkvisual-win32.lo gdkwin32id.lo gdkwindow-win32.lo -libgdk_win32_la_OBJECTS = $(am_libgdk_win32_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkcolor-win32.Plo \ +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-win32.Plo \ @@ -36676,6 +40885,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-win32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkwin32id.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-win32.Plo @@ -36696,7 +40906,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- Makefile.am +- $(top_srcdir)/Makefile.decl Makefile.am -DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(libgdk_win32_la_SOURCES) - @@ -36704,8 +40914,8 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -36756,7 +40966,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -516,64 +443,47 @@ distclean-compile: +@@ -596,64 +483,47 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-win32.Plo@am__quote@ .c.o: @@ -36840,7 +41050,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -583,7 +493,13 @@ uninstall-libgdkincludeHEADERS: +@@ -663,7 +533,13 @@ uninstall-libgdkincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -36855,7 +41065,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -595,15 +511,20 @@ $(RECURSIVE_TARGETS): +@@ -675,15 +551,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -36880,7 +41090,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -624,7 +545,7 @@ maintainer-clean-recursive: +@@ -704,7 +585,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -36889,7 +41099,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -635,35 +556,30 @@ ctags-recursive: +@@ -715,35 +596,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -36932,7 +41142,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -671,23 +587,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -751,23 +627,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -36965,7 +41175,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -699,28 +615,23 @@ GTAGS: +@@ -779,29 +655,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -36975,6 +41185,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -37007,7 +41218,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -731,15 +642,19 @@ distdir: $(DISTFILES) +@@ -812,15 +682,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -37032,7 +41243,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -749,8 +664,9 @@ check: check-recursive +@@ -831,8 +705,9 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -37044,7 +41255,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -770,7 +686,7 @@ mostlyclean-generic: +@@ -852,7 +727,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -37053,7 +41264,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -784,24 +700,34 @@ distclean: distclean-recursive +@@ -866,24 +741,34 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -37089,7 +41300,7 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -822,28 +748,26 @@ ps: ps-recursive +@@ -904,28 +789,26 @@ ps: ps-recursive ps-am: @@ -37100,44 +41311,45 @@ Index: gtk+-2.12.12/gdk/win32/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-noinstLTLIBRARIES \ -- clean-recursive ctags ctags-recursive distclean \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ clean-noinstLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool \ +- clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive \ - install-libgdkincludeHEADERS install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgdkincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libgdkincludeHEADERS install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive \ - uninstall-libgdkincludeHEADERS uninstall-recursive -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-libgdkincludeHEADERS ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-libgdkincludeHEADERS - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/gdk/win32/rc/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk/win32/rc/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk/win32/rc/Makefile.in 2008-12-09 21:03:26.801715791 +0100 +--- gtk+-2.14.7.orig/gdk/win32/rc/Makefile.in 2009-02-17 23:15:21.315090582 +0100 ++++ gtk+-2.14.7/gdk/win32/rc/Makefile.in 2009-02-21 14:58:44.126582615 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -37150,9 +41362,9 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -37167,15 +41379,15 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,24 @@ POST_INSTALL = : +@@ -37,10 +32,24 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = gdk/win32/rc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/gdk.rc.in ++ $(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl ++subdir = gdk/win32/rc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -37194,12 +41406,14 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +58,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +60,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -37216,7 +41430,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +85,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -37225,7 +41439,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +90,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +92,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -37236,7 +41450,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +113,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +118,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -37244,7 +41458,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +132,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +137,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -37253,7 +41467,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +142,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +147,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -37264,6 +41478,10 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -37275,16 +41493,48 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -37310,7 +41560,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +167,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -37336,7 +41586,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +186,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -37345,7 +41595,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +197,10 @@ SED = @SED@ +@@ -297,28 +206,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -37374,7 +41624,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +209,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -37404,7 +41654,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +250,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +259,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -37412,19 +41662,32 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,33 +259,50 @@ program_transform_name = @program_transf +@@ -373,18 +268,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - EXTRA_DIST = \ - gdk.rc \ - gdk.rc.in \ - gtk.ico + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gdk.rc \ +- gdk.rc.in \ +- gtk.ico +- ++EXTRA_DIST = gdk.rc gdk.rc.in gtk.ico + TEST_PROGS = + + ### testing rules +@@ -410,27 +303,40 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY - @USE_WIN32_TRUE@noinst_DATA = gdk-win32-res.o @@ -37436,12 +41699,13 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in -DIST_SOURCES = -DATA = $(noinst_DATA) - --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am gdk.rc.in +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am gdk.rc.in all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -37477,7 +41741,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -362,38 +310,29 @@ mostlyclean-libtool: +@@ -438,39 +344,29 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -37497,6 +41761,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -37529,15 +41794,15 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -407,7 +346,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -485,7 +381,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) - installdirs: install: install-am install-exec: install-exec-am -@@ -428,7 +366,7 @@ mostlyclean-generic: +@@ -506,7 +401,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -37546,7 +41811,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -439,24 +377,34 @@ clean-am: clean-generic clean-libtool mo +@@ -517,24 +412,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -37582,7 +41847,7 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -475,17 +423,20 @@ ps: ps-am +@@ -553,17 +458,21 @@ ps: ps-am ps-am: @@ -37591,29 +41856,31 @@ Index: gtk+-2.12.12/gdk/win32/rc/Makefile.in + +.MAKE: install-am install-strip - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am info info-am install install-am install-data \ + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am + # call as: $(XVFB_START) && someprogram - gdk-win32-res.o : gdk.rc gtk.ico -Index: gtk+-2.12.12/gdk/x11/Makefile.in +Index: gtk+-2.14.7/gdk/x11/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk/x11/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk/x11/Makefile.in 2008-12-09 21:03:26.957714388 +0100 +--- gtk+-2.14.7.orig/gdk/x11/Makefile.in 2009-02-17 23:15:21.291087601 +0100 ++++ gtk+-2.14.7/gdk/x11/Makefile.in 2009-02-21 14:58:44.347082288 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -37626,9 +41893,9 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,13 @@ +@@ -16,16 +16,13 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -37645,19 +41912,19 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,12 +32,84 @@ POST_INSTALL = : +@@ -37,12 +34,86 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl @XINPUT_XFREE_TRUE@am__append_1 = gdkinput-x11.c gdkinput-xfree.c @XINPUT_XFREE_FALSE@am__append_2 = gdkinput-none.c +noinst_PROGRAMS = checksettings$(EXEEXT) +TESTS = checksettings$(EXEEXT) +subdir = gdk/x11 -+DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -37668,14 +41935,15 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgdk_x11_la_LIBADD = -+am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkasync.c gdkasync.h \ -+ gdkcolor-x11.c gdkcursor-x11.c gdkdisplay-x11.c \ -+ gdkdisplay-x11.h gdkdnd-x11.c gdkdrawable-x11.c \ -+ gdkdrawable-x11.h gdkevents-x11.c gdkfont-x11.c gdkgc-x11.c \ -+ gdkgeometry-x11.c gdkglobals-x11.c gdkim-x11.c gdkimage-x11.c \ -+ gdkinput.c gdkkeys-x11.c gdkmain-x11.c gdkpixmap-x11.c \ -+ gdkpixmap-x11.h gdkproperty-x11.c gdkscreen-x11.c \ -+ gdkscreen-x11.h gdkselection-x11.c gdkspawn-x11.c \ ++am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkapplaunchcontext-x11.c \ ++ gdkasync.c gdkasync.h gdkcolor-x11.c gdkcursor-x11.c \ ++ gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ ++ gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ ++ gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ ++ gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ ++ gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h \ ++ gdkproperty-x11.c gdkscreen-x11.c gdkscreen-x11.h \ ++ gdkselection-x11.c gdkspawn-x11.c gdktestutils-x11.c \ + gdkvisual-x11.c gdkwindow-x11.c gdkwindow-x11.h \ + gdkxftdefaults.c gdkxid.c gdkx.h gdkprivate-x11.h \ + gdkinputprivate.h xsettings-client.h xsettings-client.c \ @@ -37683,13 +41951,14 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in + gdkinput-xfree.c gdkinput-none.c +@XINPUT_XFREE_TRUE@am__objects_1 = gdkinput-x11.lo gdkinput-xfree.lo +@XINPUT_XFREE_FALSE@am__objects_2 = gdkinput-none.lo -+am_libgdk_x11_la_OBJECTS = gdkasync.lo gdkcolor-x11.lo \ -+ gdkcursor-x11.lo gdkdisplay-x11.lo gdkdnd-x11.lo \ -+ gdkdrawable-x11.lo gdkevents-x11.lo gdkfont-x11.lo \ -+ gdkgc-x11.lo gdkgeometry-x11.lo gdkglobals-x11.lo gdkim-x11.lo \ -+ gdkimage-x11.lo gdkinput.lo gdkkeys-x11.lo gdkmain-x11.lo \ -+ gdkpixmap-x11.lo gdkproperty-x11.lo gdkscreen-x11.lo \ -+ gdkselection-x11.lo gdkspawn-x11.lo gdkvisual-x11.lo \ ++am_libgdk_x11_la_OBJECTS = gdkapplaunchcontext-x11.lo gdkasync.lo \ ++ gdkcolor-x11.lo gdkcursor-x11.lo gdkdisplay-x11.lo \ ++ gdkdnd-x11.lo gdkdrawable-x11.lo gdkevents-x11.lo \ ++ gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ ++ gdkglobals-x11.lo gdkim-x11.lo gdkimage-x11.lo gdkinput.lo \ ++ gdkkeys-x11.lo gdkmain-x11.lo gdkpixmap-x11.lo \ ++ gdkproperty-x11.lo gdkscreen-x11.lo gdkselection-x11.lo \ ++ gdkspawn-x11.lo gdktestutils-x11.lo gdkvisual-x11.lo \ + gdkwindow-x11.lo gdkxftdefaults.lo gdkxid.lo \ + xsettings-client.lo xsettings-common.lo $(am__objects_1) \ + $(am__objects_2) @@ -37732,12 +42001,14 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,20 +120,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -53,22 +124,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -37754,7 +42025,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -79,8 +145,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -83,8 +149,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -37763,7 +42034,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -88,10 +152,6 @@ ECHO_C = @ECHO_C@ +@@ -92,10 +156,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -37774,7 +42045,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -115,6 +175,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -122,6 +182,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -37782,7 +42053,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -133,8 +194,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -140,8 +201,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -37791,7 +42062,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -145,55 +204,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -152,91 +211,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -37802,6 +42073,10 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -37813,16 +42088,48 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -37848,7 +42155,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -213,24 +229,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -258,24 +240,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -37874,7 +42181,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -241,8 +248,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -286,8 +259,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -37883,7 +42190,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -254,28 +259,10 @@ SED = @SED@ +@@ -299,28 +270,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -37912,7 +42219,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -284,22 +271,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -329,22 +282,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -37942,7 +42249,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -322,6 +312,7 @@ libexecdir = @libexecdir@ +@@ -367,6 +323,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -37950,7 +42257,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -330,11 +321,12 @@ program_transform_name = @program_transf +@@ -375,9 +332,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -37960,13 +42267,35 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -385,12 +344,8 @@ GTESTER_REPORT = gtester-report # in $P + + # We need to include all these C files here since the conditionals + # don't seem to be correctly expanded for the dist files. +-EXTRA_DIST = \ +- gdkinput-x11.c \ +- gdkinput-xfree.c \ +- gdkinput-none.c \ ++EXTRA_DIST = gdkinput-x11.c gdkinput-xfree.c gdkinput-none.c \ + gdksettings.c +- + TEST_PROGS = + + ### testing rules +@@ -416,9 +371,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- libgdkincludedir = $(includedir)/gtk-2.0/gdk - INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION \ -@@ -345,62 +337,25 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -DGDK_COMPILATION \ +@@ -428,178 +381,69 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) - @@ -37976,6 +42305,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in - -libgdk_x11_la_SOURCES = \ - MwmUtil.h \ +- gdkapplaunchcontext-x11.c \ - gdkasync.c \ - gdkasync.h \ - gdkcolor-x11.c \ @@ -38002,6 +42332,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in - gdkscreen-x11.h \ - gdkselection-x11.c \ - gdkspawn-x11.c \ +- gdktestutils-x11.c \ - gdkvisual-x11.c \ - gdkwindow-x11.c \ - gdkwindow-x11.h \ @@ -38016,16 +42347,17 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in - xsettings-common.c\ -$(am__append_1) $(am__append_2) - -+libgdk_x11_la_SOURCES = MwmUtil.h gdkasync.c gdkasync.h gdkcolor-x11.c \ -+ gdkcursor-x11.c gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ -+ gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ -+ gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ -+ gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ -+ gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h \ -+ gdkproperty-x11.c gdkscreen-x11.c gdkscreen-x11.h \ -+ gdkselection-x11.c gdkspawn-x11.c gdkvisual-x11.c \ -+ gdkwindow-x11.c gdkwindow-x11.h gdkxftdefaults.c gdkxid.c \ -+ gdkx.h gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ ++libgdk_x11_la_SOURCES = MwmUtil.h gdkapplaunchcontext-x11.c gdkasync.c \ ++ gdkasync.h gdkcolor-x11.c gdkcursor-x11.c gdkdisplay-x11.c \ ++ gdkdisplay-x11.h gdkdnd-x11.c gdkdrawable-x11.c \ ++ gdkdrawable-x11.h gdkevents-x11.c gdkfont-x11.c gdkgc-x11.c \ ++ gdkgeometry-x11.c gdkglobals-x11.c gdkim-x11.c gdkimage-x11.c \ ++ gdkinput.c gdkkeys-x11.c gdkmain-x11.c gdkpixmap-x11.c \ ++ gdkpixmap-x11.h gdkproperty-x11.c gdkscreen-x11.c \ ++ gdkscreen-x11.h gdkselection-x11.c gdkspawn-x11.c \ ++ gdktestutils-x11.c gdkvisual-x11.c gdkwindow-x11.c \ ++ gdkwindow-x11.h gdkxftdefaults.c gdkxid.c gdkx.h \ ++ gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ + xsettings-client.c xsettings-common.h xsettings-common.c \ + $(am__append_1) $(am__append_2) libgdkinclude_HEADERS = \ @@ -38034,16 +42366,8 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in - -noinst_PROGRAMS = checksettings checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la - --TESTS = checksettings - - # We need to include all these C files here since the conditionals - # don't seem to be correctly expanded for the dist files. - EXTRA_DIST = \ -@@ -409,117 +364,50 @@ EXTRA_DIST = \ - gdkinput-none.c \ - gdksettings.c - +-TESTS = checksettings -subdir = gdk/x11 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -38053,30 +42377,32 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in - -libgdk_x11_la_LDFLAGS = -libgdk_x11_la_LIBADD = --am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkasync.c gdkasync.h \ -- gdkcolor-x11.c gdkcursor-x11.c gdkdisplay-x11.c \ -- gdkdisplay-x11.h gdkdnd-x11.c gdkdrawable-x11.c \ -- gdkdrawable-x11.h gdkevents-x11.c gdkfont-x11.c gdkgc-x11.c \ -- gdkgeometry-x11.c gdkglobals-x11.c gdkim-x11.c gdkimage-x11.c \ -- gdkinput.c gdkkeys-x11.c gdkmain-x11.c gdkpixmap-x11.c \ -- gdkpixmap-x11.h gdkproperty-x11.c gdkscreen-x11.c \ -- gdkscreen-x11.h gdkselection-x11.c gdkspawn-x11.c \ -- gdkvisual-x11.c gdkwindow-x11.c gdkwindow-x11.h \ -- gdkxftdefaults.c gdkxid.c gdkx.h gdkprivate-x11.h \ -- gdkinputprivate.h xsettings-client.h xsettings-client.c \ -- xsettings-common.h xsettings-common.c gdkinput-x11.c \ -- gdkinput-xfree.c gdkinput-none.c +-am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkapplaunchcontext-x11.c \ +- gdkasync.c gdkasync.h gdkcolor-x11.c gdkcursor-x11.c \ +- gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ +- gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ +- gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ +- gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ +- gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h gdkproperty-x11.c \ +- gdkscreen-x11.c gdkscreen-x11.h gdkselection-x11.c \ +- gdkspawn-x11.c gdktestutils-x11.c gdkvisual-x11.c \ +- gdkwindow-x11.c gdkwindow-x11.h gdkxftdefaults.c gdkxid.c \ +- gdkx.h gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ +- xsettings-client.c xsettings-common.h xsettings-common.c \ +- gdkinput-x11.c gdkinput-xfree.c gdkinput-none.c -@XINPUT_XFREE_TRUE@am__objects_1 = gdkinput-x11.lo gdkinput-xfree.lo -@XINPUT_XFREE_FALSE@am__objects_2 = gdkinput-none.lo --am_libgdk_x11_la_OBJECTS = gdkasync.lo gdkcolor-x11.lo gdkcursor-x11.lo \ -- gdkdisplay-x11.lo gdkdnd-x11.lo gdkdrawable-x11.lo \ -- gdkevents-x11.lo gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ +-am_libgdk_x11_la_OBJECTS = gdkapplaunchcontext-x11.lo gdkasync.lo \ +- gdkcolor-x11.lo gdkcursor-x11.lo gdkdisplay-x11.lo \ +- gdkdnd-x11.lo gdkdrawable-x11.lo gdkevents-x11.lo \ +- gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ - gdkglobals-x11.lo gdkim-x11.lo gdkimage-x11.lo gdkinput.lo \ - gdkkeys-x11.lo gdkmain-x11.lo gdkpixmap-x11.lo \ - gdkproperty-x11.lo gdkscreen-x11.lo gdkselection-x11.lo \ -- gdkspawn-x11.lo gdkvisual-x11.lo gdkwindow-x11.lo \ -- gdkxftdefaults.lo gdkxid.lo xsettings-client.lo \ -- xsettings-common.lo $(am__objects_1) $(am__objects_2) +- gdkspawn-x11.lo gdktestutils-x11.lo gdkvisual-x11.lo \ +- gdkwindow-x11.lo gdkxftdefaults.lo gdkxid.lo \ +- xsettings-client.lo xsettings-common.lo $(am__objects_1) \ +- $(am__objects_2) -libgdk_x11_la_OBJECTS = $(am_libgdk_x11_la_OBJECTS) -noinst_PROGRAMS = checksettings$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) @@ -38091,6 +42417,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/checksettings.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkasync.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-x11.Plo \ @@ -38115,6 +42442,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-x11.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gdkxftdefaults.Plo \ @@ -38132,15 +42460,15 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in -HEADERS = $(libgdkinclude_HEADERS) - -DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- Makefile.am +- $(top_srcdir)/Makefile.decl Makefile.am -SOURCES = $(libgdk_x11_la_SOURCES) checksettings.c - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -38187,7 +42515,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -529,10 +417,10 @@ clean-noinstPROGRAMS: +@@ -609,10 +453,10 @@ clean-noinstPROGRAMS: done checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES) @rm -f checksettings$(EXEEXT) @@ -38200,7 +42528,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -570,82 +458,58 @@ distclean-compile: +@@ -652,82 +496,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsettings-common.Plo@am__quote@ .c.o: @@ -38305,7 +42633,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -655,23 +519,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -737,23 +557,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -38338,7 +42666,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -685,9 +549,9 @@ distclean-tags: +@@ -767,9 +587,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -38350,7 +42678,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -696,25 +560,25 @@ check-TESTS: $(TESTS) +@@ -778,25 +598,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -38386,7 +42714,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in ;; \ esac; \ else \ -@@ -739,45 +603,40 @@ check-TESTS: $(TESTS) +@@ -821,46 +641,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -38417,6 +42745,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -38449,8 +42778,8 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -792,9 +651,10 @@ check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS +@@ -875,9 +689,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) - @@ -38462,7 +42791,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -814,7 +674,7 @@ mostlyclean-generic: +@@ -897,7 +712,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -38471,7 +42800,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -828,24 +688,34 @@ distclean: distclean-am +@@ -911,24 +726,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -38507,7 +42836,7 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -866,20 +736,24 @@ ps: ps-am +@@ -949,20 +774,24 @@ ps: ps-am ps-am: @@ -38516,8 +42845,8 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-noinstPROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am info info-am install install-am install-data \ @@ -38539,12 +42868,12 @@ Index: gtk+-2.12.12/gdk/x11/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-libgdkincludeHEADERS - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/gdk-pixbuf/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/gdk-pixbuf/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gdk-pixbuf/Makefile.in 2008-09-13 02:03:25.000000000 +0200 -+++ gtk+-2.12.12/gdk-pixbuf/Makefile.in 2008-12-09 21:03:25.865216738 +0100 +--- gtk+-2.14.7.orig/gdk-pixbuf/Makefile.in 2009-02-17 23:15:21.259087375 +0100 ++++ gtk+-2.14.7/gdk-pixbuf/Makefile.in 2009-02-21 14:58:42.815082271 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -38557,9 +42886,9 @@ Index: gtk+-2.12.12/gdk-pixbuf/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,14 @@ +@@ -16,16 +16,14 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -38577,2534 +42906,12 @@ Index: gtk+-2.12.12/gdk-pixbuf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +33,351 @@ POST_INSTALL = : +@@ -37,1440 +35,1367 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) -+bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ -+ gdk-pixbuf-query-loaders$(EXEEXT) -+subdir = gdk-pixbuf -+DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ -+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/gdk-pixbuf-features.h.in $(srcdir)/gdk_pixbuf.rc.in \ -+ ChangeLog -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" \ -+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+loaderLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ -+ $(noinst_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo \ -+ gdk-pixbuf-animation.lo gdk-pixbuf-data.lo gdk-pixbuf-io.lo \ -+ gdk-pixbuf-loader.lo gdk-pixbuf-scale.lo \ -+ gdk-pixbuf-simple-anim.lo gdk-pixbuf-scaled-anim.lo \ -+ gdk-pixbuf-util.lo gdk-pixdata.lo gdk-pixbuf-enum-types.lo -+libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) -+libgdk_pixbuf_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgdk_pixbuf_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__DEPENDENCIES_2 = libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(am__DEPENDENCIES_1) -+libpixbufloader_ani_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo -+libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) -+libpixbufloader_ani_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_ani_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@am_libpixbufloader_ani_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ $(loaderdir) -+libpixbufloader_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo -+libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) -+libpixbufloader_bmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_bmp_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_BMP_FALSE@am_libpixbufloader_bmp_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_BMP_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_BMP_FALSE@ $(loaderdir) -+libpixbufloader_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo -+libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) -+libpixbufloader_gif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_gif_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_GIF_FALSE@am_libpixbufloader_gif_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_GIF_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_GIF_FALSE@ $(loaderdir) -+libpixbufloader_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_ico_la_OBJECTS = io-ico.lo -+libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) -+libpixbufloader_ico_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_ico_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICO_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICO_FALSE@ $(loaderdir) -+libpixbufloader_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo -+libpixbufloader_jpeg_la_OBJECTS = \ -+ $(am_libpixbufloader_jpeg_la_OBJECTS) -+libpixbufloader_jpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_jpeg_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@am_libpixbufloader_jpeg_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@ $(loaderdir) -+libpixbufloader_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo -+libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) -+libpixbufloader_pcx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_pcx_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@am_libpixbufloader_pcx_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ $(loaderdir) -+libpixbufloader_png_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_png_la_OBJECTS = io-png.lo -+libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) -+libpixbufloader_png_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_png_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@am_libpixbufloader_png_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@ $(loaderdir) -+libpixbufloader_pnm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo -+libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) -+libpixbufloader_pnm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_pnm_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@am_libpixbufloader_pnm_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ $(loaderdir) -+libpixbufloader_ras_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_ras_la_OBJECTS = io-ras.lo -+libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) -+libpixbufloader_ras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_ras_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@am_libpixbufloader_ras_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ $(loaderdir) -+libpixbufloader_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_tga_la_OBJECTS = io-tga.lo -+libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) -+libpixbufloader_tga_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_tga_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@am_libpixbufloader_tga_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ $(loaderdir) -+libpixbufloader_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo -+libpixbufloader_tiff_la_OBJECTS = \ -+ $(am_libpixbufloader_tiff_la_OBJECTS) -+libpixbufloader_tiff_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_tiff_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@am_libpixbufloader_tiff_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@ $(loaderdir) -+libpixbufloader_wbmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo -+libpixbufloader_wbmp_la_OBJECTS = \ -+ $(am_libpixbufloader_wbmp_la_OBJECTS) -+libpixbufloader_wbmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_wbmp_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@am_libpixbufloader_wbmp_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ $(loaderdir) -+libpixbufloader_xbm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo -+libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) -+libpixbufloader_xbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_xbm_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@am_libpixbufloader_xbm_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ $(loaderdir) -+libpixbufloader_xpm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo -+libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) -+libpixbufloader_xpm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_xpm_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@am_libpixbufloader_xpm_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ $(loaderdir) -+libstatic_pixbufloader_ani_la_LIBADD = -+am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo \ -+ io-ani-animation.lo -+libstatic_pixbufloader_ani_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_ani_la_OBJECTS) -+@INCLUDE_ANI_TRUE@am_libstatic_pixbufloader_ani_la_rpath = -+libstatic_pixbufloader_bmp_la_LIBADD = -+am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo -+libstatic_pixbufloader_bmp_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_bmp_la_OBJECTS) -+@INCLUDE_BMP_TRUE@am_libstatic_pixbufloader_bmp_la_rpath = -+libstatic_pixbufloader_gif_la_LIBADD = -+am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo \ -+ io-gif-animation.lo -+libstatic_pixbufloader_gif_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gif_la_OBJECTS) -+@INCLUDE_GIF_TRUE@am_libstatic_pixbufloader_gif_la_rpath = -+libstatic_pixbufloader_ico_la_LIBADD = -+am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo -+libstatic_pixbufloader_ico_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_ico_la_OBJECTS) -+@INCLUDE_ICO_TRUE@am_libstatic_pixbufloader_ico_la_rpath = -+libstatic_pixbufloader_jpeg_la_LIBADD = -+am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo -+libstatic_pixbufloader_jpeg_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) -+@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@am_libstatic_pixbufloader_jpeg_la_rpath = -+libstatic_pixbufloader_pcx_la_LIBADD = -+am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo -+libstatic_pixbufloader_pcx_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_pcx_la_OBJECTS) -+@INCLUDE_PCX_TRUE@am_libstatic_pixbufloader_pcx_la_rpath = -+libstatic_pixbufloader_png_la_LIBADD = -+am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo -+libstatic_pixbufloader_png_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_png_la_OBJECTS) -+@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@am_libstatic_pixbufloader_png_la_rpath = -+libstatic_pixbufloader_pnm_la_LIBADD = -+am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo -+libstatic_pixbufloader_pnm_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_pnm_la_OBJECTS) -+@INCLUDE_PNM_TRUE@am_libstatic_pixbufloader_pnm_la_rpath = -+libstatic_pixbufloader_ras_la_LIBADD = -+am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo -+libstatic_pixbufloader_ras_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_ras_la_OBJECTS) -+@INCLUDE_RAS_TRUE@am_libstatic_pixbufloader_ras_la_rpath = -+libstatic_pixbufloader_tga_la_LIBADD = -+am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo -+libstatic_pixbufloader_tga_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_tga_la_OBJECTS) -+@INCLUDE_TGA_TRUE@am_libstatic_pixbufloader_tga_la_rpath = -+libstatic_pixbufloader_tiff_la_LIBADD = -+am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo -+libstatic_pixbufloader_tiff_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_tiff_la_OBJECTS) -+@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@am_libstatic_pixbufloader_tiff_la_rpath = -+libstatic_pixbufloader_wbmp_la_LIBADD = -+am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo -+libstatic_pixbufloader_wbmp_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) -+@INCLUDE_WBMP_TRUE@am_libstatic_pixbufloader_wbmp_la_rpath = -+libstatic_pixbufloader_xbm_la_LIBADD = -+am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo -+libstatic_pixbufloader_xbm_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_xbm_la_OBJECTS) -+@INCLUDE_XBM_TRUE@am_libstatic_pixbufloader_xbm_la_rpath = -+libstatic_pixbufloader_xpm_la_LIBADD = -+am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo -+libstatic_pixbufloader_xpm_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_xpm_la_OBJECTS) -+@INCLUDE_XPM_TRUE@am_libstatic_pixbufloader_xpm_la_rpath = -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -+am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) -+gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) -+gdk_pixbuf_csource_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) -+gdk_pixbuf_query_loaders_OBJECTS = \ -+ $(am_gdk_pixbuf_query_loaders_OBJECTS) -+test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c -+test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) -+test_gdk_pixbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ -+ $(libpixbufloader_ani_la_SOURCES) \ -+ $(libpixbufloader_bmp_la_SOURCES) \ -+ $(libpixbufloader_gif_la_SOURCES) \ -+ $(libpixbufloader_ico_la_SOURCES) \ -+ $(libpixbufloader_jpeg_la_SOURCES) \ -+ $(libpixbufloader_pcx_la_SOURCES) \ -+ $(libpixbufloader_png_la_SOURCES) \ -+ $(libpixbufloader_pnm_la_SOURCES) \ -+ $(libpixbufloader_ras_la_SOURCES) \ -+ $(libpixbufloader_tga_la_SOURCES) \ -+ $(libpixbufloader_tiff_la_SOURCES) \ -+ $(libpixbufloader_wbmp_la_SOURCES) \ -+ $(libpixbufloader_xbm_la_SOURCES) \ -+ $(libpixbufloader_xpm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ani_la_SOURCES) \ -+ $(libstatic_pixbufloader_bmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_gif_la_SOURCES) \ -+ $(libstatic_pixbufloader_ico_la_SOURCES) \ -+ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ -+ $(libstatic_pixbufloader_pcx_la_SOURCES) \ -+ $(libstatic_pixbufloader_png_la_SOURCES) \ -+ $(libstatic_pixbufloader_pnm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ras_la_SOURCES) \ -+ $(libstatic_pixbufloader_tga_la_SOURCES) \ -+ $(libstatic_pixbufloader_tiff_la_SOURCES) \ -+ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_xbm_la_SOURCES) \ -+ $(libstatic_pixbufloader_xpm_la_SOURCES) \ -+ $(gdk_pixbuf_csource_SOURCES) \ -+ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c -+DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ -+ $(libpixbufloader_ani_la_SOURCES) \ -+ $(libpixbufloader_bmp_la_SOURCES) \ -+ $(libpixbufloader_gif_la_SOURCES) \ -+ $(libpixbufloader_ico_la_SOURCES) \ -+ $(libpixbufloader_jpeg_la_SOURCES) \ -+ $(libpixbufloader_pcx_la_SOURCES) \ -+ $(libpixbufloader_png_la_SOURCES) \ -+ $(libpixbufloader_pnm_la_SOURCES) \ -+ $(libpixbufloader_ras_la_SOURCES) \ -+ $(libpixbufloader_tga_la_SOURCES) \ -+ $(libpixbufloader_tiff_la_SOURCES) \ -+ $(libpixbufloader_wbmp_la_SOURCES) \ -+ $(libpixbufloader_xbm_la_SOURCES) \ -+ $(libpixbufloader_xpm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ani_la_SOURCES) \ -+ $(libstatic_pixbufloader_bmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_gif_la_SOURCES) \ -+ $(libstatic_pixbufloader_ico_la_SOURCES) \ -+ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ -+ $(libstatic_pixbufloader_pcx_la_SOURCES) \ -+ $(libstatic_pixbufloader_png_la_SOURCES) \ -+ $(libstatic_pixbufloader_pnm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ras_la_SOURCES) \ -+ $(libstatic_pixbufloader_tga_la_SOURCES) \ -+ $(libstatic_pixbufloader_tiff_la_SOURCES) \ -+ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_xbm_la_SOURCES) \ -+ $(libstatic_pixbufloader_xpm_la_SOURCES) \ -+ $(gdk_pixbuf_csource_SOURCES) \ -+ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+DATA = $(noinst_DATA) -+libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -49,20 +388,17 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +413,6 @@ DATADIRNAME = @DATADIRNAME@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -86,10 +420,6 @@ ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -113,6 +443,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +462,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +472,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +497,15 @@ LTLIBOBJS = @LTLIBOBJS@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +516,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +527,10 @@ SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +539,25 @@ X_CFLAGS = @X_CFLAGS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -320,6 +580,7 @@ libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -328,29 +589,24 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - SUBDIRS = pixops -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - @OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def - @OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def -- - @OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o - @OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o -- - @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib -- - @OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh -- - lib_LTLIBRARIES = \ - libgdk_pixbuf-2.0.la - -- - loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders -- -+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d - module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) - - # -@@ -464,49 +720,34 @@ libstatic_pixbufloader_pcx_la_SOURCES = - libpixbufloader_pcx_la_SOURCES = io-pcx.c - libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) - libpixbufloader_pcx_la_LIBADD = $(module_libs) -- - @HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la - @HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la -- - @INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la - @INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la -- - @INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la - @INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la -- - @INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la - @INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la -- - @INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la - @INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la -- - @INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la - @INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la -- - @HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la - @HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la -- - @INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la - @INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la -- - @INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la - @INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la -- - @HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la - @HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la -- - @INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la - @INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la -- - @INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la - @INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la -- - @INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la - @INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la -- - @INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la - @INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la -- - @BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ - @BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ - @BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ -@@ -523,7 +764,6 @@ libpixbufloader_pcx_la_LIBADD = $(module - @BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ - @BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) - -- - noinst_LTLIBRARIES = \ - $(STATIC_PNG_LIB) \ - $(STATIC_BMP_LIB) \ -@@ -540,9 +780,7 @@ noinst_LTLIBRARIES = \ - $(STATIC_TGA_LIB) \ - $(STATIC_PCX_LIB) - -- - builtin_objs = @INCLUDED_LOADER_OBJ@ -- - DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la - INCLUDES = \ - -DG_LOG_DOMAIN=\"GdkPixbuf\" \ -@@ -558,20 +796,13 @@ INCLUDES = \ - $(GDK_PIXBUF_DEP_CFLAGS) \ - -DGDK_PIXBUF_ENABLE_BACKEND - -- --AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" -+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" - LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS) -- --noinst_PROGRAMS = test-gdk-pixbuf - test_gdk_pixbuf_LDADD = $(LDADDS) -- --bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders - gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c - gdk_pixbuf_csource_LDADD = $(LDADDS) -- - gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) - gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -- - gdk_pixbuf_query_loaders_SOURCES = queryloaders.c - - # -@@ -592,7 +823,6 @@ libgdk_pixbuf_2_0_la_SOURCES = \ - gdk-pixdata.c \ - gdk-pixbuf-enum-types.c - -- - libgdk_pixbuf_2_0_la_LDFLAGS = \ - $(gdk_pixbuf_win32_res_ldflag) \ - -version-info $(LT_VERSION_INFO) \ -@@ -600,10 +830,8 @@ libgdk_pixbuf_2_0_la_LDFLAGS = \ - $(no_undefined) \ - $(gdk_pixbuf_symbols) - -- - libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) - libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) -- - gdk_pixbuf_headers = \ - gdk-pixbuf.h \ - gdk-pixbuf-core.h \ -@@ -613,7 +841,6 @@ gdk_pixbuf_headers = \ - gdk-pixbuf-simple-anim.h \ - gdk-pixbuf-loader.h - -- - libgdk_pixbufinclude_HEADERS = \ - $(gdk_pixbuf_headers) \ - gdk-pixbuf-enum-types.h \ -@@ -621,14 +848,12 @@ libgdk_pixbufinclude_HEADERS = \ - gdk-pixbuf-features.h \ - gdk-pixdata.h - -- - noinst_HEADERS = \ - gdk-pixbuf-alias.h \ - gdk-pixbuf-private.h \ - gdk-pixbuf-scaled-anim.h \ - xpm-color-table.h - -- - BUILT_SOURCES = \ - gdk-pixbuf-alias.h \ - gdk-pixbuf-aliasdef.c \ -@@ -637,17 +862,11 @@ BUILT_SOURCES = \ - gdk-pixbuf-marshal.h \ - gdk-pixbuf-marshal.c - -- - CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc --MAINTAINERCLEANFILES = \ -- gdk-pixbuf-aliasdef.c \ -- gdk-pixbuf-enum-types.h \ -- gdk-pixbuf-enum-types.c \ -- gdk-pixbuf-marshal.h \ -- gdk-pixbuf-marshal.c \ -- gdk-pixbuf.loaders\ --s-enum-types-h stamp-gdk-pixbuf-marshal.h -- -+MAINTAINERCLEANFILES = gdk-pixbuf-aliasdef.c gdk-pixbuf-enum-types.h \ -+ gdk-pixbuf-enum-types.c gdk-pixbuf-marshal.h \ -+ gdk-pixbuf-marshal.c gdk-pixbuf.loaders s-enum-types-h \ -+ stamp-gdk-pixbuf-marshal.h - EXTRA_DIST = \ - gdk-pixbuf-csource.1 \ - makefile.msc \ -@@ -661,314 +880,97 @@ EXTRA_DIST = \ - gdk-pixbuf-marshal.list \ - gen-color-table.pl - -- --@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false - @CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" --subdir = gdk-pixbuf --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h --LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ -- $(noinst_LTLIBRARIES) -- --am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo gdk-pixbuf-animation.lo \ -- gdk-pixbuf-data.lo gdk-pixbuf-io.lo gdk-pixbuf-loader.lo \ -- gdk-pixbuf-scale.lo gdk-pixbuf-simple-anim.lo \ -- gdk-pixbuf-scaled-anim.lo gdk-pixbuf-util.lo gdk-pixdata.lo \ -- gdk-pixbuf-enum-types.lo --libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) --libpixbufloader_ani_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo --libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) --libpixbufloader_bmp_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo --libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) --libpixbufloader_gif_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo --libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) --libpixbufloader_ico_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_ico_la_OBJECTS = io-ico.lo --libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) --libpixbufloader_jpeg_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo --libpixbufloader_jpeg_la_OBJECTS = $(am_libpixbufloader_jpeg_la_OBJECTS) --libpixbufloader_pcx_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo --libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) --libpixbufloader_png_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_png_la_OBJECTS = io-png.lo --libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) --libpixbufloader_pnm_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo --libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) --libpixbufloader_ras_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_ras_la_OBJECTS = io-ras.lo --libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) --libpixbufloader_tga_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_tga_la_OBJECTS = io-tga.lo --libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) --libpixbufloader_tiff_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo --libpixbufloader_tiff_la_OBJECTS = $(am_libpixbufloader_tiff_la_OBJECTS) --libpixbufloader_wbmp_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo --libpixbufloader_wbmp_la_OBJECTS = $(am_libpixbufloader_wbmp_la_OBJECTS) --libpixbufloader_xbm_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo --libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) --libpixbufloader_xpm_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo --libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) --libstatic_pixbufloader_ani_la_LDFLAGS = --libstatic_pixbufloader_ani_la_LIBADD = --am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo --libstatic_pixbufloader_ani_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_ani_la_OBJECTS) --libstatic_pixbufloader_bmp_la_LDFLAGS = --libstatic_pixbufloader_bmp_la_LIBADD = --am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo --libstatic_pixbufloader_bmp_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_bmp_la_OBJECTS) --libstatic_pixbufloader_gif_la_LDFLAGS = --libstatic_pixbufloader_gif_la_LIBADD = --am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo --libstatic_pixbufloader_gif_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gif_la_OBJECTS) --libstatic_pixbufloader_ico_la_LDFLAGS = --libstatic_pixbufloader_ico_la_LIBADD = --am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo --libstatic_pixbufloader_ico_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_ico_la_OBJECTS) --libstatic_pixbufloader_jpeg_la_LDFLAGS = --libstatic_pixbufloader_jpeg_la_LIBADD = --am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo --libstatic_pixbufloader_jpeg_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) --libstatic_pixbufloader_pcx_la_LDFLAGS = --libstatic_pixbufloader_pcx_la_LIBADD = --am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo --libstatic_pixbufloader_pcx_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_pcx_la_OBJECTS) --libstatic_pixbufloader_png_la_LDFLAGS = --libstatic_pixbufloader_png_la_LIBADD = --am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo --libstatic_pixbufloader_png_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_png_la_OBJECTS) --libstatic_pixbufloader_pnm_la_LDFLAGS = --libstatic_pixbufloader_pnm_la_LIBADD = --am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo --libstatic_pixbufloader_pnm_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_pnm_la_OBJECTS) --libstatic_pixbufloader_ras_la_LDFLAGS = --libstatic_pixbufloader_ras_la_LIBADD = --am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo --libstatic_pixbufloader_ras_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_ras_la_OBJECTS) --libstatic_pixbufloader_tga_la_LDFLAGS = --libstatic_pixbufloader_tga_la_LIBADD = --am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo --libstatic_pixbufloader_tga_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_tga_la_OBJECTS) --libstatic_pixbufloader_tiff_la_LDFLAGS = --libstatic_pixbufloader_tiff_la_LIBADD = --am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo --libstatic_pixbufloader_tiff_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_tiff_la_OBJECTS) --libstatic_pixbufloader_wbmp_la_LDFLAGS = --libstatic_pixbufloader_wbmp_la_LIBADD = --am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo --libstatic_pixbufloader_wbmp_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) --libstatic_pixbufloader_xbm_la_LDFLAGS = --libstatic_pixbufloader_xbm_la_LIBADD = --am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo --libstatic_pixbufloader_xbm_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_xbm_la_OBJECTS) --libstatic_pixbufloader_xpm_la_LDFLAGS = --libstatic_pixbufloader_xpm_la_LIBADD = --am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo --libstatic_pixbufloader_xpm_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_xpm_la_OBJECTS) --bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ -- gdk-pixbuf-query-loaders$(EXEEXT) --noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -- --am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) --gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) --gdk_pixbuf_csource_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la --gdk_pixbuf_csource_LDFLAGS = --am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) --gdk_pixbuf_query_loaders_OBJECTS = \ -- $(am_gdk_pixbuf_query_loaders_OBJECTS) --gdk_pixbuf_query_loaders_LDFLAGS = --test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c --test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) --test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la --test_gdk_pixbuf_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk-pixbuf-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-csource.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-data.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-enum-types.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-io.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-loader.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scale.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scaled-anim.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-simple-anim.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-util.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixdata.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ani-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ani.Plo ./$(DEPDIR)/io-bmp.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gif-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gif.Plo ./$(DEPDIR)/io-ico.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-jpeg.Plo ./$(DEPDIR)/io-pcx.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-png.Plo ./$(DEPDIR)/io-pnm.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ras.Plo ./$(DEPDIR)/io-tga.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-tiff.Plo ./$(DEPDIR)/io-wbmp.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-xbm.Plo ./$(DEPDIR)/io-xpm.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/queryloaders.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/test-gdk-pixbuf.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ -- $(libpixbufloader_ani_la_SOURCES) \ -- $(libpixbufloader_bmp_la_SOURCES) \ -- $(libpixbufloader_gif_la_SOURCES) \ -- $(libpixbufloader_ico_la_SOURCES) \ -- $(libpixbufloader_jpeg_la_SOURCES) \ -- $(libpixbufloader_pcx_la_SOURCES) \ -- $(libpixbufloader_png_la_SOURCES) \ -- $(libpixbufloader_pnm_la_SOURCES) \ -- $(libpixbufloader_ras_la_SOURCES) \ -- $(libpixbufloader_tga_la_SOURCES) \ -- $(libpixbufloader_tiff_la_SOURCES) \ -- $(libpixbufloader_wbmp_la_SOURCES) \ -- $(libpixbufloader_xbm_la_SOURCES) \ -- $(libpixbufloader_xpm_la_SOURCES) \ -- $(libstatic_pixbufloader_ani_la_SOURCES) \ -- $(libstatic_pixbufloader_bmp_la_SOURCES) \ -- $(libstatic_pixbufloader_gif_la_SOURCES) \ -- $(libstatic_pixbufloader_ico_la_SOURCES) \ -- $(libstatic_pixbufloader_jpeg_la_SOURCES) \ -- $(libstatic_pixbufloader_pcx_la_SOURCES) \ -- $(libstatic_pixbufloader_png_la_SOURCES) \ -- $(libstatic_pixbufloader_pnm_la_SOURCES) \ -- $(libstatic_pixbufloader_ras_la_SOURCES) \ -- $(libstatic_pixbufloader_tga_la_SOURCES) \ -- $(libstatic_pixbufloader_tiff_la_SOURCES) \ -- $(libstatic_pixbufloader_wbmp_la_SOURCES) \ -- $(libstatic_pixbufloader_xbm_la_SOURCES) \ -- $(libstatic_pixbufloader_xpm_la_SOURCES) \ -- $(gdk_pixbuf_csource_SOURCES) \ -- $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c --DATA = $(noinst_DATA) -- --HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) -- -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ -- $(srcdir)/Makefile.in ChangeLog Makefile.am \ -- gdk-pixbuf-features.h.in gdk_pixbuf.rc.in --DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) $(libpixbufloader_ani_la_SOURCES) $(libpixbufloader_bmp_la_SOURCES) $(libpixbufloader_gif_la_SOURCES) $(libpixbufloader_ico_la_SOURCES) $(libpixbufloader_jpeg_la_SOURCES) $(libpixbufloader_pcx_la_SOURCES) $(libpixbufloader_png_la_SOURCES) $(libpixbufloader_pnm_la_SOURCES) $(libpixbufloader_ras_la_SOURCES) $(libpixbufloader_tga_la_SOURCES) $(libpixbufloader_tiff_la_SOURCES) $(libpixbufloader_wbmp_la_SOURCES) $(libpixbufloader_xbm_la_SOURCES) $(libpixbufloader_xpm_la_SOURCES) $(libstatic_pixbufloader_ani_la_SOURCES) $(libstatic_pixbufloader_bmp_la_SOURCES) $(libstatic_pixbufloader_gif_la_SOURCES) $(libstatic_pixbufloader_ico_la_SOURCES) $(libstatic_pixbufloader_jpeg_la_SOURCES) $(libstatic_pixbufloader_pcx_la_SOURCES) $(libstatic_pixbufloader_png_la_SOURCES) $(libstatic_pixbufloader_pnm_la_SOURCES) $(libstatic_pixbufloader_ras_la_SOURCES) $(libstatic_pixbufloader_tga_la_SOURCES) $(libstatic_pixbufloader_tiff_la_SOURCES) $(libstatic_pixbufloader_wbmp_la_SOURCES) $(libstatic_pixbufloader_xbm_la_SOURCES) $(libstatic_pixbufloader_xpm_la_SOURCES) $(gdk_pixbuf_csource_SOURCES) $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c -- -+@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk-pixbuf/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --gdk_pixbuf.rc: $(top_builddir)/config.status gdk_pixbuf.rc.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+gdk_pixbuf.rc: $(top_builddir)/config.status $(srcdir)/gdk_pixbuf.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --gdk-pixbuf-features.h: $(top_builddir)/config.status gdk-pixbuf-features.h.in -+gdk-pixbuf-features.h: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-features.h.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --libLTLIBRARIES_INSTALL = $(INSTALL) - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --loaderLTLIBRARIES_INSTALL = $(INSTALL) - install-loaderLTLIBRARIES: $(loader_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(loaderdir) -+ test -z "$(loaderdir)" || $(MKDIR_P) "$(DESTDIR)$(loaderdir)" - @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(loaderdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(loaderdir)/$$f"; \ - else :; fi; \ - done - - uninstall-loaderLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(loaderdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(loaderdir)/$$p"; \ - done - - clean-loaderLTLIBRARIES: - -test -z "$(loader_LTLIBRARIES)" || rm -f $(loader_LTLIBRARIES) - @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -@@ -977,80 +979,79 @@ clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk_pixbuf-2.0.la: $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_LDFLAGS) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_pixbuf_2_0_la_LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) - libpixbufloader-ani.la: $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ani_la_LDFLAGS) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) -+ $(libpixbufloader_ani_la_LINK) $(am_libpixbufloader_ani_la_rpath) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) - libpixbufloader-bmp.la: $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_bmp_la_LDFLAGS) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) -+ $(libpixbufloader_bmp_la_LINK) $(am_libpixbufloader_bmp_la_rpath) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) - libpixbufloader-gif.la: $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gif_la_LDFLAGS) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gif_la_LINK) $(am_libpixbufloader_gif_la_rpath) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) - libpixbufloader-ico.la: $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ico_la_LDFLAGS) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) -+ $(libpixbufloader_ico_la_LINK) $(am_libpixbufloader_ico_la_rpath) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) - libpixbufloader-jpeg.la: $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jpeg_la_LDFLAGS) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) -+ $(libpixbufloader_jpeg_la_LINK) $(am_libpixbufloader_jpeg_la_rpath) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) - libpixbufloader-pcx.la: $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pcx_la_LDFLAGS) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) -+ $(libpixbufloader_pcx_la_LINK) $(am_libpixbufloader_pcx_la_rpath) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) - libpixbufloader-png.la: $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_png_la_LDFLAGS) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) -+ $(libpixbufloader_png_la_LINK) $(am_libpixbufloader_png_la_rpath) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) - libpixbufloader-pnm.la: $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pnm_la_LDFLAGS) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) -+ $(libpixbufloader_pnm_la_LINK) $(am_libpixbufloader_pnm_la_rpath) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) - libpixbufloader-ras.la: $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ras_la_LDFLAGS) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) -+ $(libpixbufloader_ras_la_LINK) $(am_libpixbufloader_ras_la_rpath) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) - libpixbufloader-tga.la: $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tga_la_LDFLAGS) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) -+ $(libpixbufloader_tga_la_LINK) $(am_libpixbufloader_tga_la_rpath) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) - libpixbufloader-tiff.la: $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tiff_la_LDFLAGS) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) -+ $(libpixbufloader_tiff_la_LINK) $(am_libpixbufloader_tiff_la_rpath) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) - libpixbufloader-wbmp.la: $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_wbmp_la_LDFLAGS) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) -+ $(libpixbufloader_wbmp_la_LINK) $(am_libpixbufloader_wbmp_la_rpath) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) - libpixbufloader-xbm.la: $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xbm_la_LDFLAGS) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) -+ $(libpixbufloader_xbm_la_LINK) $(am_libpixbufloader_xbm_la_rpath) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) - libpixbufloader-xpm.la: $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xpm_la_LDFLAGS) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) -+ $(libpixbufloader_xpm_la_LINK) $(am_libpixbufloader_xpm_la_rpath) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) - libstatic-pixbufloader-ani.la: $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_ani_la_LDFLAGS) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_ani_la_rpath) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) - libstatic-pixbufloader-bmp.la: $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_bmp_la_LDFLAGS) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_bmp_la_rpath) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gif.la: $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gif_la_LDFLAGS) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gif_la_rpath) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) - libstatic-pixbufloader-ico.la: $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_ico_la_LDFLAGS) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_ico_la_rpath) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) - libstatic-pixbufloader-jpeg.la: $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_jpeg_la_rpath) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) - libstatic-pixbufloader-pcx.la: $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_pcx_la_LDFLAGS) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_pcx_la_rpath) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) - libstatic-pixbufloader-png.la: $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_png_la_LDFLAGS) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_png_la_rpath) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) - libstatic-pixbufloader-pnm.la: $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_pnm_la_LDFLAGS) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_pnm_la_rpath) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) - libstatic-pixbufloader-ras.la: $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_ras_la_LDFLAGS) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_ras_la_rpath) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) - libstatic-pixbufloader-tga.la: $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_tga_la_LDFLAGS) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_tga_la_rpath) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) - libstatic-pixbufloader-tiff.la: $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_tiff_la_LDFLAGS) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_tiff_la_rpath) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) - libstatic-pixbufloader-wbmp.la: $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_wbmp_la_LDFLAGS) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_wbmp_la_rpath) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) - libstatic-pixbufloader-xbm.la: $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_xbm_la_LDFLAGS) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_xbm_la_rpath) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) - libstatic-pixbufloader-xpm.la: $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_xpm_la_LDFLAGS) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) --binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+ $(LINK) $(am_libstatic_pixbufloader_xpm_la_rpath) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -1058,8 +1059,8 @@ uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: -@@ -1077,16 +1078,16 @@ clean-noinstPROGRAMS: - done - gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) - @rm -f gdk-pixbuf-csource$(EXEEXT) -- $(LINK) $(gdk_pixbuf_csource_LDFLAGS) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) -+ $(LINK) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) - gdk-pixbuf-query-loaders$(EXEEXT): $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_DEPENDENCIES) - @rm -f gdk-pixbuf-query-loaders$(EXEEXT) -- $(LINK) $(gdk_pixbuf_query_loaders_LDFLAGS) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) -+ $(LINK) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) - test-gdk-pixbuf$(EXEEXT): $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_DEPENDENCIES) - @rm -f test-gdk-pixbuf$(EXEEXT) -- $(LINK) $(test_gdk_pixbuf_LDFLAGS) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) -+ $(LINK) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -1123,64 +1124,47 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdk_pixbufincludeHEADERS: $(libgdk_pixbufinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdk_pixbufincludedir) -+ test -z "$(libgdk_pixbufincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdk_pixbufincludedir)" - @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ -- $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdk_pixbufincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ -+ $(libgdk_pixbufincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ - done - - uninstall-libgdk_pixbufincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -1190,7 +1174,13 @@ uninstall-libgdk_pixbufincludeHEADERS: - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1202,15 +1192,20 @@ $(RECURSIVE_TARGETS): - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1231,7 +1226,7 @@ maintainer-clean-recursive: - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1242,35 +1237,30 @@ ctags-recursive: - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -1278,23 +1268,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -1308,9 +1298,9 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -1319,25 +1309,25 @@ check-TESTS: $(TESTS) - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xpass=`expr $$xpass + 1`; \ -- failed=`expr $$failed + 1`; \ -- echo "XPASS: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ echo "XPASS: $$tst"; \ - ;; \ - *) \ -- echo "PASS: $$tst"; \ -+ echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xfail=`expr $$xfail + 1`; \ -- echo "XFAIL: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xfail=`expr $$xfail + 1`; \ -+ echo "XFAIL: $$tst"; \ - ;; \ - *) \ -- failed=`expr $$failed + 1`; \ -- echo "FAIL: $$tst"; \ -+ failed=`expr $$failed + 1`; \ -+ echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ -@@ -1362,45 +1352,40 @@ check-TESTS: $(TESTS) - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -1411,15 +1396,19 @@ distdir: $(DISTFILES) - || exit 1; \ - fi; \ - done -- list='$(SUBDIRS)'; for subdir in $$list; do \ -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -1428,13 +1417,16 @@ check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local -+@CROSS_COMPILING_TRUE@all-local: -+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ -+ all-local - install-binPROGRAMS: install-libLTLIBRARIES - - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(loaderdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libgdk_pixbufincludedir) -- -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -1456,13 +1448,13 @@ clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - clean: clean-recursive - - clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -1473,12 +1465,14 @@ distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-local distclean-tags -+ distclean-local distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: -@@ -1488,12 +1482,20 @@ install-data-am: install-libgdk_pixbufin - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -+install-dvi: install-dvi-recursive -+ - install-exec-am: install-binPROGRAMS install-libLTLIBRARIES - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -1514,35 +1516,34 @@ ps: ps-recursive - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ -- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ -+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ -+ uninstall-libgdk_pixbufincludeHEADERS \ - uninstall-loaderLTLIBRARIES uninstall-local - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-data-am install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ -- check-TESTS check-am clean clean-binPROGRAMS clean-generic \ -- clean-libLTLIBRARIES clean-libtool clean-loaderLTLIBRARIES \ -- clean-noinstLTLIBRARIES clean-noinstPROGRAMS clean-recursive \ -- ctags ctags-recursive distclean distclean-compile \ -- distclean-generic distclean-libtool distclean-local \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-binPROGRAMS install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-libLTLIBRARIES \ -- install-libgdk_pixbufincludeHEADERS install-loaderLTLIBRARIES \ -- install-man install-recursive install-strip installcheck \ -- installcheck-am installdirs installdirs-am \ -- installdirs-recursive maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -- tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ -- uninstall-info-am uninstall-info-recursive \ -- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ -- uninstall-loaderLTLIBRARIES uninstall-local uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am all-local check check-TESTS check-am clean \ -+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -+ clean-libtool clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ -+ clean-noinstPROGRAMS ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-local distclean-tags distdir dvi dvi-am html html-am \ -+ info info-am install install-am install-binPROGRAMS \ -+ install-data install-data-am install-data-hook install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-libgdk_pixbufincludeHEADERS \ -+ install-loaderLTLIBRARIES install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ -+ uninstall-libgdk_pixbufincludeHEADERS \ -+ uninstall-loaderLTLIBRARIES uninstall-local - - - @OS_WIN32_TRUE@gdk_pixbuf-win32-res.o : gdk_pixbuf.rc -Index: gtk+-2.12.12/gdk-pixbuf/pixops/Makefile.in -=================================================================== ---- gtk+-2.12.12.orig/gdk-pixbuf/pixops/Makefile.in 2008-09-13 02:03:26.000000000 +0200 -+++ gtk+-2.12.12/gdk-pixbuf/pixops/Makefile.in 2008-12-09 21:03:26.033715737 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,58 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+noinst_PROGRAMS = timescale$(EXEEXT) -+subdir = gdk-pixbuf/pixops -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libpixops_la_LIBADD = -+am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ -+ have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ -+ composite_line_color_22_4a4_mmx.S -+@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ -+@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ -+@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo -+am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) -+libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) -+PROGRAMS = $(noinst_PROGRAMS) -+am_timescale_OBJECTS = timescale.$(OBJEXT) -+timescale_OBJECTS = $(am_timescale_OBJECTS) -+am__DEPENDENCIES_1 = -+timescale_DEPENDENCIES = libpixops.la $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_1) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -+LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) -+DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -49,20 +93,17 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +118,6 @@ DATADIRNAME = @DATADIRNAME@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -86,10 +125,6 @@ ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -113,6 +148,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +167,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +177,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +202,15 @@ LTLIBOBJS = @LTLIBOBJS@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +221,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +232,10 @@ SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +244,25 @@ X_CFLAGS = @X_CFLAGS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -320,6 +285,7 @@ libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -328,104 +294,81 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - noinst_LTLIBRARIES = libpixops.la -- - INCLUDES = \ - -I$(top_srcdir) -I$(top_builddir) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_PIXBUF_DEP_CFLAGS) \ - -DGDK_PIXBUF_DISABLE_DEPRECATED - -- --noinst_PROGRAMS = timescale -- - timescale_SOURCES = timescale.c - timescale_LDADD = libpixops.la $(GLIB_LIBS) $(GDK_PIXBUF_DEP_LIBS) -- - @USE_MMX_TRUE@mmx_sources = \ - @USE_MMX_TRUE@ have_mmx.S \ - @USE_MMX_TRUE@ scale_line_22_33_mmx.S \ - @USE_MMX_TRUE@ composite_line_22_4a4_mmx.S \ - @USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.S - -- - libpixops_la_SOURCES = \ - pixops.c \ - pixops.h \ - pixops-internal.h \ - $(mmx_sources) - -- - EXTRA_DIST = \ - DETAILS \ - pixbuf-transform-math.ltx \ - makefile.msc - --subdir = gdk-pixbuf/pixops --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libpixops_la_LDFLAGS = --libpixops_la_LIBADD = --am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ -- have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ -- composite_line_color_22_4a4_mmx.S --@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ --@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ --@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo --am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) --libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) --noinst_PROGRAMS = timescale$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am_timescale_OBJECTS = timescale.$(OBJEXT) --timescale_OBJECTS = $(am_timescale_OBJECTS) --timescale_DEPENDENCIES = libpixops.la --timescale_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixops.Plo ./$(DEPDIR)/timescale.Po --CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) --LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ -- $(CCASFLAGS) --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am --SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libpixops.la: $(libpixops_la_OBJECTS) $(libpixops_la_DEPENDENCIES) -- $(LINK) $(libpixops_la_LDFLAGS) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) -+ $(LINK) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -435,58 +378,62 @@ clean-noinstPROGRAMS: - done - timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) - @rm -f timescale$(EXEEXT) -- $(LINK) $(timescale_LDFLAGS) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) -+ $(LINK) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_22_4a4_mmx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_color_22_4a4_mmx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/have_mmx.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixops.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale_line_22_33_mmx.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timescale.Po@am__quote@ - - .S.o: -- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< - - .S.obj: -- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .S.lo: -- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -494,26 +441,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -523,23 +459,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -551,28 +487,23 @@ GTAGS: - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -586,7 +517,6 @@ distdir: $(DISTFILES) - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -607,7 +537,7 @@ mostlyclean-generic: - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -621,24 +551,34 @@ distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -659,19 +599,23 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - ctags distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am info \ -- info-am install install-am install-data install-data-am \ -- install-exec install-exec-am install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/gtk/Makefile.in -=================================================================== ---- gtk+-2.12.12.orig/gtk/Makefile.in 2008-09-13 02:03:27.000000000 +0200 -+++ gtk+-2.12.12/gtk/Makefile.in 2008-12-09 21:03:27.557713619 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,15 @@ - - # Makefile.am for gtk+/gtk - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ -+ -+ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,6 +36,7 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ - @OS_UNIX_TRUE@am__append_1 = xdgmime - @OS_LINUX_TRUE@am__append_2 = abicheck.sh pltcheck.sh -@@ -62,1309 +62,37 @@ host_triplet = @host@ - @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h - @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) - @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ @@ -41120,6 +42927,8 @@ Index: gtk+-2.12.12/gtk/Makefile.in -BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ -CAIRO_PREFIX = @CAIRO_PREFIX@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ @@ -41162,6 +42971,9 @@ Index: gtk+-2.12.12/gtk/Makefile.in -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +-GAIL_INET_LIBS = @GAIL_INET_LIBS@ +-GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +-GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ -GDK_DEP_LIBS = @GDK_DEP_LIBS@ -GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ @@ -41219,6 +43031,10 @@ Index: gtk+-2.12.12/gtk/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ -HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -41230,16 +43046,48 @@ Index: gtk+-2.12.12/gtk/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ -HTML_DIR = @HTML_DIR@ +-INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ +-INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ -INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ -INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -41268,6 +43116,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ +-LIBJASPER = @LIBJASPER@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ @@ -41275,6 +43124,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -LIBTIFF = @LIBTIFF@ -LIBTOOL = @LIBTOOL@ -LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +-LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -41400,1660 +43250,806 @@ Index: gtk+-2.12.12/gtk/Makefile.in -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ - --SUBDIRS = theme-bits $(am__append_1) --@OS_UNIX_TRUE@@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" --@OS_UNIX_TRUE@@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "/Applications/Preview.app/Contents/MacOS/Preview %f" +-GTESTER = gtester # in $PATH for non-GLIB packages +-GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - --DIST_SUBDIRS = theme-bits xdgmime --@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr +-# initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gdk-pixbuf-csource.1 \ +- makefile.msc \ +- gdk-pixbuf.symbols \ +- makegdkpixbufalias.pl \ +- abicheck.sh \ +- pltcheck.sh \ +- gdk_pixbuf.def \ +- gdk_pixbuf.rc \ +- gdk-pixbuf-marshal.c \ +- gdk-pixbuf-marshal.list \ +- gdk-pixbuf-enum-types.c.template \ +- gdk-pixbuf-enum-types.h.template \ +- gen-color-table.pl - --@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups +-TEST_PROGS = - --INCLUDES = \ -- -DG_LOG_DOMAIN=\"Gtk\" \ -- -DGTK_LIBDIR=\"$(libdir)\" \ -- -DGTK_DATADIR=\"$(datadir)\" \ -- -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -- -DGTK_VERSION=\"$(GTK_VERSION)\" \ -- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -- -DGTK_HOST=\"$(host)\" \ -- -DGTK_COMPILATION \ -- -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ -- -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ -- -I$(top_builddir)/gtk \ -- -I$(top_srcdir) -I../gdk \ -- -I$(top_srcdir)/gdk \ -- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -- -DGDK_PIXBUF_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -- $(GTK_DEBUG_FLAGS) \ -- $(GTK_DEP_CFLAGS) \ -- $(gtk_clipboard_dnd_c_sources_CFLAGS) +-### testing rules +- +-# Xvfb based test rules +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 +-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ +- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ +- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ +- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ +- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ +- 9995 9996 9997 9998 9999 +- +-SKIP_GDKTARGET = \ +- test "$(gdktarget)" != "x11" \ +- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." +- +-XVFB_START = \ +- ${XVFB} -help 2>/dev/null 1>&2 \ +- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ +- && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ +- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ +- && DISPLAY=:$$XID && export DISPLAY - - --gtarget = $(gdktarget) +-SUBDIRS = pixops - -@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - --@OS_WIN32_TRUE@gtk_def = gtk.def --@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def +-@OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def +-@OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def - --@OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o --@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o +-@OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o +-@OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o - --@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib +-@OS_WIN32_TRUE@libole32 = -lole32 - --TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" --TESTS = aliasfilescheck.sh $(am__append_2) +-@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib - --# libtool stuff: set version and export symbols for resolving --# since automake doesn't support conditionalized libsomething_la_LDFLAGS --# we use the general approach here --libgtkincludedir = $(includedir)/gtk-2.0/gtk --libadd = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(GTK_DEP_LIBS)\ --$(am__append_3) +-@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh - --# common options for the various packages. --libtool_opts = \ -- -version-info $(LT_VERSION_INFO) \ -- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ -- -rpath $(libdir) $(libgtk_target_ldflags) +-lib_LTLIBRARIES = \ +- libgdk_pixbuf-2.0.la - - +-loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders +- +-module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) +- -# --# setup source file variables +-# The PNG loader -# -- --# GTK+ header files for public installation (non-generated, or generated --# by configure) --gtk_public_h_sources = \ -- gtk.h \ -- gtkaboutdialog.h \ -- gtkaccelgroup.h \ -- gtkaccellabel.h \ -- gtkaccelmap.h \ -- gtkaccessible.h \ -- gtkaction.h \ -- gtkactiongroup.h \ -- gtkadjustment.h \ -- gtkalignment.h \ -- gtkarrow.h \ -- gtkaspectframe.h \ -- gtkassistant.h \ -- gtkbbox.h \ -- gtkbin.h \ -- gtkbindings.h \ -- gtkbox.h \ -- gtkbuilder.h \ -- gtkbuildable.h \ -- gtkbutton.h \ -- gtkcalendar.h \ -- gtkcelleditable.h \ -- gtkcelllayout.h \ -- gtkcellrenderer.h \ -- gtkcellrendereraccel.h \ -- gtkcellrenderercombo.h \ -- gtkcellrendererpixbuf.h \ -- gtkcellrendererprogress.h \ -- gtkcellrendererspin.h \ -- gtkcellrenderertext.h \ -- gtkcellrenderertoggle.h \ -- gtkcellview.h \ -- gtkcheckbutton.h \ -- gtkcheckmenuitem.h \ -- gtkclipboard.h \ -- gtkclist.h \ -- gtkcolorbutton.h \ -- gtkcolorsel.h \ -- gtkcolorseldialog.h \ -- gtkcombo.h \ -- gtkcombobox.h \ -- gtkcomboboxentry.h \ -- gtkcontainer.h \ -- gtkctree.h \ -- gtkcurve.h \ -- gtkdebug.h \ -- gtkdialog.h \ -- gtkdnd.h \ -- gtkdrawingarea.h \ -- gtkeditable.h \ -- gtkentry.h \ -- gtkentrycompletion.h \ -- gtkenums.h \ -- gtkeventbox.h \ -- gtkexpander.h \ -- gtkfilechooser.h \ -- gtkfilechooserbutton.h \ -- gtkfilechooserdialog.h \ -- gtkfilechooserwidget.h \ -- gtkfilefilter.h \ -- gtkfilesel.h \ -- gtkfixed.h \ -- gtkfontbutton.h \ -- gtkfontsel.h \ -- gtkframe.h \ -- gtkgamma.h \ -- gtkgc.h \ -- gtkhandlebox.h \ -- gtkhbbox.h \ -- gtkhbox.h \ -- gtkhpaned.h \ -- gtkhruler.h \ -- gtkhscale.h \ -- gtkhscrollbar.h \ -- gtkhseparator.h \ -- gtkiconfactory.h \ -- gtkicontheme.h \ -- gtkiconview.h \ -- gtkimage.h \ -- gtkimagemenuitem.h \ -- gtkimcontext.h \ -- gtkimcontextsimple.h \ -- gtkimmodule.h \ -- gtkimmulticontext.h \ -- gtkinputdialog.h \ -- gtkinvisible.h \ -- gtkitem.h \ -- gtkitemfactory.h \ -- gtklabel.h \ -- gtklayout.h \ -- gtklinkbutton.h \ -- gtklist.h \ -- gtklistitem.h \ -- gtkliststore.h \ -- gtkmain.h \ -- gtkmenu.h \ -- gtkmenubar.h \ -- gtkmenuitem.h \ -- gtkmenushell.h \ -- gtkmenutoolbutton.h \ -- gtkmessagedialog.h \ -- gtkmisc.h \ -- gtkmodules.h \ -- gtknotebook.h \ -- gtkobject.h \ -- gtkoldeditable.h \ -- gtkoptionmenu.h \ -- gtkpagesetup.h \ -- gtkpaned.h \ -- gtkpapersize.h \ -- gtkpixmap.h \ -- gtkplug.h \ -- gtkpreview.h \ -- gtkprintcontext.h \ -- gtkprintoperation.h \ -- gtkprintoperationpreview.h \ -- gtkprintsettings.h \ -- gtkprivate.h \ -- gtkprogress.h \ -- gtkprogressbar.h \ -- gtkradioaction.h \ -- gtkradiobutton.h \ -- gtkradiomenuitem.h \ -- gtkradiotoolbutton.h \ -- gtkrange.h \ -- gtkrc.h \ -- gtkrecentaction.h \ -- gtkrecentchooser.h \ -- gtkrecentchooserdialog.h \ -- gtkrecentchoosermenu.h \ -- gtkrecentchooserwidget.h \ -- gtkrecentfilter.h \ -- gtkrecentmanager.h \ -- gtkruler.h \ -- gtkscale.h \ -- gtkscalebutton.h \ -- gtkscrollbar.h \ -- gtkscrolledwindow.h \ -- gtkselection.h \ -- gtkseparator.h \ -- gtkseparatormenuitem.h \ -- gtkseparatortoolitem.h \ -- gtksettings.h \ -- gtksignal.h \ -- gtksizegroup.h \ -- gtksocket.h \ -- gtkspinbutton.h \ -- gtkstatusbar.h \ -- gtkstatusicon.h \ -- gtkstock.h \ -- gtkstyle.h \ -- gtktable.h \ -- gtktearoffmenuitem.h \ -- gtktext.h \ -- gtktextbuffer.h \ -- gtktextbufferrichtext.h \ -- gtktextchild.h \ -- gtktextdisplay.h \ -- gtktextiter.h \ -- gtktextmark.h \ -- gtktexttag.h \ -- gtktexttagtable.h \ -- gtktextview.h \ -- gtktipsquery.h \ -- gtktoggleaction.h \ -- gtktogglebutton.h \ -- gtktoggletoolbutton.h \ -- gtktoolbar.h \ -- gtktoolbutton.h \ -- gtktoolitem.h \ -- gtktooltip.h \ -- gtktooltips.h \ -- gtktree.h \ -- gtktreednd.h \ -- gtktreeitem.h \ -- gtktreemodel.h \ -- gtktreemodelfilter.h \ -- gtktreemodelsort.h \ -- gtktreeselection.h \ -- gtktreesortable.h \ -- gtktreestore.h \ -- gtktreeview.h \ -- gtktreeviewcolumn.h \ -- gtktypeutils.h \ -- gtkuimanager.h \ -- gtkvbbox.h \ -- gtkvbox.h \ -- gtkviewport.h \ -- gtkvolumebutton.h \ -- gtkvpaned.h \ -- gtkvruler.h \ -- gtkvscale.h \ -- gtkvscrollbar.h \ -- gtkvseparator.h \ -- gtkwidget.h \ -- gtkwindow.h -- -- --@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ --@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ --@OS_UNIX_TRUE@ gtkprintunixdialog.h \ --@OS_UNIX_TRUE@ gtkprinter.h \ --@OS_UNIX_TRUE@ gtkprintjob.h -- -- --# Installed header files without compatibility guarantees --# that are not included in gtk/gtk.h --gtk_semi_private_h_sources = \ -- gtktextlayout.h \ -- gtkfilesystem.h -- -- --# GTK+ header files that don't get installed --gtk_private_h_sources = \ -- gtkquery.h \ -- gtksearchengine.h \ -- gtksearchenginesimple.h \ -- gtkdndcursors.h \ -- gtkentryprivate.h \ -- gtkbuilderprivate.h \ -- gtkfilechooserdefault.h \ -- gtkfilechooserembed.h \ -- gtkfilechooserentry.h \ -- gtkfilechooserprivate.h \ -- gtkfilechoosersettings.h \ -- gtkfilechooserutils.h \ -- gtkfilesystemmodel.h \ -- gtkfilesystemunix.h \ -- gtkhsv.h \ -- gtkiconcache.h \ -- gtkintl.h \ -- gtkkeyhash.h \ -- gtkmnemonichash.h \ -- gtkpathbar.h \ -- gtkplugprivate.h \ -- gtkprintoperation-private.h\ -- gtkprintutils.h \ -- gtkrbtree.h \ -- gtkrecentchooserdefault.h \ -- gtkrecentchooserprivate.h \ -- gtkrecentchooserutils.h \ -- gtksocketprivate.h \ -- gtktextbtree.h \ -- gtktextbufferserialize.h\ -- gtktextchildprivate.h \ -- gtktextiterprivate.h \ -- gtktextmarkprivate.h \ -- gtktextsegment.h \ -- gtktexttagprivate.h \ -- gtktexttypes.h \ -- gtktextutil.h \ -- gtkthemes.h \ -- gtktoggleactionprivate.h\ -- gtktreedatalist.h \ -- gtktreeprivate.h \ -- gtkwindow-decorate.h\ --$(am__append_4) $(am__append_6) $(am__append_8) $(am__append_10) $(am__append_12) -- --# GTK+ C sources to build the library from --gtk_base_c_sources = \ -- gtkquery.c \ -- gtksearchengine.c \ -- gtksearchenginesimple.c \ -- fnmatch.c \ -- gtkaboutdialog.c \ -- gtkaccelgroup.c \ -- gtkaccellabel.c \ -- gtkaccelmap.c \ -- gtkaccessible.c \ -- gtkaction.c \ -- gtkactiongroup.c \ -- gtkadjustment.c \ -- gtkalignment.c \ -- gtkarrow.c \ -- gtkaspectframe.c \ -- gtkassistant.c \ -- gtkbbox.c \ -- gtkbin.c \ -- gtkbindings.c \ -- gtkbox.c \ -- gtkbuildable.c \ -- gtkbuilder.c \ -- gtkbuilderparser.c \ -- gtkbutton.c \ -- gtkcalendar.c \ -- gtkcelleditable.c \ -- gtkcelllayout.c \ -- gtkcellrenderer.c \ -- gtkcellrendereraccel.c \ -- gtkcellrenderercombo.c \ -- gtkcellrendererpixbuf.c \ -- gtkcellrendererprogress.c \ -- gtkcellrendererspin.c \ -- gtkcellrenderertext.c \ -- gtkcellrenderertoggle.c \ -- gtkcellview.c \ -- gtkcheckbutton.c \ -- gtkcheckmenuitem.c \ -- gtkclist.c \ -- gtkcolorbutton.c \ -- gtkcolorsel.c \ -- gtkcolorseldialog.c \ -- gtkcombo.c \ -- gtkcombobox.c \ -- gtkcomboboxentry.c \ -- gtkcontainer.c \ -- gtkctree.c \ -- gtkcurve.c \ -- gtkdialog.c \ -- gtkdrawingarea.c \ -- gtkeditable.c \ -- gtkentry.c \ -- gtkentrycompletion.c \ -- gtkeventbox.c \ -- gtkexpander.c \ -- gtkfilechooser.c \ -- gtkfilechooserbutton.c \ -- gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c \ -- gtkfilechooserembed.c \ -- gtkfilechooserentry.c \ -- gtkfilechoosersettings.c \ -- gtkfilechooserutils.c \ -- gtkfilechooserwidget.c \ -- gtkfilefilter.c \ -- gtkfilesel.c \ -- gtkfilesystem.c \ -- gtkfilesystemmodel.c \ -- gtkfixed.c \ -- gtkfontbutton.c \ -- gtkfontsel.c \ -- gtkframe.c \ -- gtkgamma.c \ -- gtkgc.c \ -- gtkhandlebox.c \ -- gtkhbbox.c \ -- gtkhbox.c \ -- gtkhpaned.c \ -- gtkhruler.c \ -- gtkhscale.c \ -- gtkhscrollbar.c \ -- gtkhseparator.c \ -- gtkhsv.c \ -- gtkiconcache.c \ -- gtkiconcachevalidator.c \ -- gtkiconfactory.c \ -- gtkicontheme.c \ -- gtkiconview.c \ -- gtkimage.c \ -- gtkimagemenuitem.c \ -- gtkimcontext.c \ -- gtkimcontextsimple.c \ -- gtkimmodule.c \ -- gtkimmulticontext.c \ -- gtkinputdialog.c \ -- gtkinvisible.c \ -- gtkitem.c \ -- gtkitemfactory.c \ -- gtkkeyhash.c \ -- gtklabel.c \ -- gtklayout.c \ -- gtklinkbutton.c \ -- gtklist.c \ -- gtklistitem.c \ -- gtkliststore.c \ -- gtkmain.c \ -- gtkmarshal.c \ -- gtkmarshalers.c \ -- gtkmenu.c \ -- gtkmenubar.c \ -- gtkmenuitem.c \ -- gtkmenushell.c \ -- gtkmenutoolbutton.c \ -- gtkmessagedialog.c \ -- gtkmisc.c \ -- gtkmnemonichash.c \ -- gtkmodules.c \ -- gtknotebook.c \ -- gtkobject.c \ -- gtkoldeditable.c \ -- gtkoptionmenu.c \ -- gtkpagesetup.c \ -- gtkpaned.c \ -- gtkpapersize.c \ -- gtkpathbar.c \ -- gtkpixmap.c \ -- gtkplug.c \ -- gtkpreview.c \ -- gtkprintcontext.c \ -- gtkprintoperation.c \ -- gtkprintoperationpreview.c \ -- gtkprintsettings.c \ -- gtkprintutils.c \ -- gtkprogress.c \ -- gtkprogressbar.c \ -- gtkradioaction.c \ -- gtkradiobutton.c \ -- gtkradiomenuitem.c \ -- gtkradiotoolbutton.c \ -- gtkrange.c \ -- gtkrbtree.c \ -- gtkrc.c \ -- gtkrecentaction.c \ -- gtkrecentchooserdefault.c \ -- gtkrecentchooserdialog.c \ -- gtkrecentchoosermenu.c \ -- gtkrecentchooserwidget.c \ -- gtkrecentchooserutils.c \ -- gtkrecentchooser.c \ -- gtkrecentfilter.c \ -- gtkrecentmanager.c \ -- gtkruler.c \ -- gtkscale.c \ -- gtkscalebutton.c \ -- gtkscrollbar.c \ -- gtkscrolledwindow.c \ -- gtkselection.c \ -- gtkseparator.c \ -- gtkseparatormenuitem.c \ -- gtkseparatortoolitem.c \ -- gtksettings.c \ -- gtksignal.c \ -- gtksizegroup.c \ -- gtksocket.c \ -- gtkspinbutton.c \ -- gtkstatusbar.c \ -- gtkstatusicon.c \ -- gtkstock.c \ -- gtkstyle.c \ -- gtktable.c \ -- gtktearoffmenuitem.c \ -- gtktext.c \ -- gtktextbtree.c \ -- gtktextbuffer.c \ -- gtktextbufferrichtext.c \ -- gtktextbufferserialize.c\ -- gtktextchild.c \ -- gtktextdisplay.c \ -- gtktextiter.c \ -- gtktextlayout.c \ -- gtktextmark.c \ -- gtktextsegment.c \ -- gtktexttag.c \ -- gtktexttagtable.c \ -- gtktexttypes.c \ -- gtktextutil.c \ -- gtktextview.c \ -- gtkthemes.c \ -- gtktipsquery.c \ -- gtktoggleaction.c \ -- gtktogglebutton.c \ -- gtktoggletoolbutton.c \ -- gtktoolbar.c \ -- gtktoolbutton.c \ -- gtktoolitem.c \ -- gtktooltip.c \ -- gtktooltips.c \ -- gtktree.c \ -- gtktreedatalist.c \ -- gtktreednd.c \ -- gtktreeitem.c \ -- gtktreemodel.c \ -- gtktreemodelfilter.c \ -- gtktreemodelsort.c \ -- gtktreeselection.c \ -- gtktreesortable.c \ -- gtktreestore.c \ -- gtktreeview.c \ -- gtktreeviewcolumn.c \ -- gtktypebuiltins.c \ -- gtktypeutils.c \ -- gtkuimanager.c \ -- gtkvbbox.c \ -- gtkvbox.c \ -- gtkvolumebutton.c \ -- gtkviewport.c \ -- gtkvpaned.c \ -- gtkvruler.c \ -- gtkvscale.c \ -- gtkvscrollbar.c \ -- gtkvseparator.c \ -- gtkwidget.c \ -- gtkwindow-decorate.c \ -- gtkwindow.c \ -- $(gtk_clipboard_dnd_c_sources) -- --gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) $(am__append_9) $(am__append_11) $(am__append_13) $(am__append_14) --gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources) -- --gtk_os_unix_c_sources = \ -- gtkfilesystemunix.c \ -- gtkpagesetupunixdialog.c \ -- gtkprinter.c \ -- gtkprinteroption.c \ -- gtkprinteroptionset.c \ -- gtkprinteroptionwidget.c \ -- gtkprintjob.c \ -- gtkprintoperation-unix.c \ -- gtkprintunixdialog.c \ -- gtkprintbackend.c \ -- gtksearchenginebeagle.c \ -- gtksearchenginetracker.c -- -- --gtk_os_win32_c_sources = \ -- gtkfilesystemwin32.c \ -- gtkprint-win32.c \ -- gtkprintoperation-win32.c -- -- --gtk_use_x11_c_sources = \ -- gtkplug-x11.c \ -- gtksocket-x11.c \ -- gtkxembed.c \ -- gtktrayicon-x11.c -- --gtk_use_win32_c_sources = \ -- gtkplug-win32.c \ -- gtksocket-win32.c \ -- gtkwin32embed.c \ -- gtkwin32embedwidget.c -- --gtk_use_quartz_c_sources = \ -- gtksearchenginequartz.c \ -- gtkplug-stub.c \ -- gtksocket-stub.c -- --gtk_use_stub_c_sources = \ -- gtkplug-stub.c \ -- gtksocket-stub.c -- --@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" -- --@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h --@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c --@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" --@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = -- --# we use our own built_sources variable rules to avoid automake's --# BUILT_SOURCES oddities --# we generate frequently rebuild files piggyback on a stamp file, so sources --# depending on them only get rebuild when the built source actually changed --# content -- --# built sources that get installed with the header files --gtk_built_public_sources = \ -- gtkmarshal.h \ -- gtktypebuiltins.h -- -- --# built headers that don't get installed --gtk_built_private_headers = \ -- gtkalias.h \ -- gtkmarshalers.h \ -- gtkbuiltincache.h -- -- --gtk_built_sources = \ -- gtkaliasdef.c \ -- gtktypebuiltins.c \ -- gtkmarshalers.c \ -- gtkmarshal.c \ -- ${gtk_built_private_headers} \ -- ${gtk_built_public_sources} -- -- --stamp_files = \ -- stamp-gtkmarshalers.h \ -- stamp-gtkmarshal.h \ -- stamp-gtktypebuiltins.h \ -- stamp-icons -- -- --# 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 --gtk_extra_sources = \ -- paper_names.c \ -- paper_names_offsets.c \ -- gen-paper-names.c \ -- gtkstatusicon-quartz.c \ -- gtk.symbols \ -- gtkversion.h.in \ -- gtkmarshalers.list \ -- gtkmarshal.list -- +-libstatic_pixbufloader_png_la_SOURCES = io-png.c +-libpixbufloader_png_la_SOURCES = io-png.c +-libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs) - -# --# setup GTK+ sources and their dependencies +-# The BMP loader -# --MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) --EXTRA_HEADERS = -- --EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources) $(gtk_built_sources) $(STOCK_ICONS) \ -- $(STOCK_ICONS) \ -- $(GENERATED_ICONS) \ -- line-arrow.xbm \ -- line-wrap.xbm \ -- tree_plus.xbm \ -- tree_minus.xbm \ -- tree_minus.xpm \ -- tree_plus.xpm \ -- gtk.def \ -- gtk-builder-convert \ -- gtk-win32.rc \ -- gtk-win32.rc.in \ -- gtkwin32embed.h \ -- gtkwin32embedwidget.h \ -- gtkwin32embedwidget.c \ -- gtkfilesystemwin32.h \ -- gtkfilesystemwin32.c \ -- gtkprint-win32.h \ -- gtkprint-win32.c \ -- gtksearchenginequartz.h \ -- gtkrc.default \ -- gtkrc.key.default \ -- gtkrc.key.emacs \ -- makefile.msc \ -- makefile.msc.in \ -- makegtkalias.pl \ -- aliasfilescheck.sh \ -- abicheck.sh \ -- pltcheck.sh -- +-libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c +-libpixbufloader_bmp_la_SOURCES = io-bmp.c +-libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_bmp_la_LIBADD = $(module_libs) - -# --# rules to generate built sources +-# The WBMP loader -# --# setup autogeneration dependencies --gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc --CLEANFILES = $(gen_sources) -- --BUILT_SOURCES = $(gtk_built_sources) -- --# target platform: --lib_LTLIBRARIES = $(gtktargetlib) -- --gtkincludedir = $(includedir)/gtk-2.0/gtk --gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h -- --gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk --gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) -- --libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) -- --libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) --libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts) --libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid --libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) --libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -- --libgtk_x11_2_0_la_LIBADD = $(libadd) --libgtk_linux_fb_2_0_la_LIBADD = $(libadd) --libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 --libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) --libgtk_quartz_2_0_la_LIBADD = $(libadd) --libgtk_directfb_2_0_la_LIBADD = $(libadd) -- --@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) --EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la -- --DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) -- --TEST_DEPS = $(DEPS) gtk.immodules -- --LDADDS = \ -- $(gtktargetlib) \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) -- +-libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c +-libpixbufloader_wbmp_la_SOURCES = io-wbmp.c +-libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_wbmp_la_LIBADD = $(module_libs) - -# --# Installed tools +-# The GIF loader -# --bin_PROGRAMS = \ -- gtk-query-immodules-2.0 \ -- gtk-update-icon-cache +-libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h +-libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h +-libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_gif_la_LIBADD = $(module_libs) - --bin_SCRIPTS = gtk-builder-convert +-# +-# The ICO loader +-# +-libstatic_pixbufloader_ico_la_SOURCES = io-ico.c +-libpixbufloader_ico_la_SOURCES = io-ico.c +-libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_ico_la_LIBADD = $(module_libs) - --gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) --gtk_query_immodules_2_0_LDADD = $(LDADDS) +-# +-# The ANI loader +-# +-libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h +-libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h +-libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_ani_la_LIBADD = $(module_libs) - --gtk_query_immodules_2_0_SOURCES = queryimmodules.c +-# +-# The JPEG loader +-# +-libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c +-libpixbufloader_jpeg_la_SOURCES = io-jpeg.c +-libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs) - --gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-# +-# The PNM loader +-# +-libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c +-libpixbufloader_pnm_la_SOURCES = io-pnm.c +-libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_pnm_la_LIBADD = $(module_libs) - --gtk_update_icon_cache_SOURCES = \ -- updateiconcache.c +-# +-# The RAS loader +-# +-libstatic_pixbufloader_ras_la_SOURCES = io-ras.c +-libpixbufloader_ras_la_SOURCES = io-ras.c +-libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_ras_la_LIBADD = $(module_libs) +- +-# +-# The TIFF loader +-# +-libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c +-libpixbufloader_tiff_la_SOURCES = io-tiff.c +-libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) +- +-# +-# The XPM loader +-# +-libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c +-libpixbufloader_xpm_la_SOURCES = io-xpm.c +-libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_xpm_la_LIBADD = $(module_libs) +- +-# +-# The XBM loader +-# +-libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c +-libpixbufloader_xbm_la_SOURCES = io-xbm.c +-libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_xbm_la_LIBADD = $(module_libs) +- +-# +-# The TGA loader +-# +-libstatic_pixbufloader_tga_la_SOURCES = io-tga.c +-libpixbufloader_tga_la_SOURCES = io-tga.c +-libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_tga_la_LIBADD = $(module_libs) +- +-# +-# The .icns loader +-# +-libstatic_pixbufloader_icns_la_SOURCES = io-icns.c +-libpixbufloader_icns_la_SOURCES = io-icns.c +-libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_icns_la_LIBADD = $(module_libs) +- +-# +-# The PCX loader +-# +-libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c +-libpixbufloader_pcx_la_SOURCES = io-pcx.c +-libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_pcx_la_LIBADD = $(module_libs) +- +-# +-# The JPEG2000 loader +-# +-libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c +-libpixbufloader_jasper_la_SOURCES = io-jasper.c +-libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs) - - --STOCK_ICONS = \ -- stock-icons/16/document-open-recent.png \ -- stock-icons/16/gtk-about.png \ -- stock-icons/16/gtk-add.png \ -- stock-icons/16/gtk-cdrom.png \ -- stock-icons/16/gtk-close.png \ -- stock-icons/16/gtk-connect.png \ -- stock-icons/16/gtk-convert.png \ -- stock-icons/16/gtk-copy.png \ -- stock-icons/16/gtk-cut.png \ -- stock-icons/16/gtk-delete.png \ -- stock-icons/16/gtk-directory.png \ -- stock-icons/16/gtk-disconnect.png \ -- stock-icons/16/gtk-edit.png \ -- stock-icons/16/gtk-execute.png \ -- stock-icons/16/gtk-file.png \ -- stock-icons/16/gtk-find-and-replace.png \ -- stock-icons/16/gtk-find.png \ -- stock-icons/16/gtk-floppy.png \ -- stock-icons/16/gtk-fullscreen.png \ -- stock-icons/16/gtk-go-back-ltr.png \ -- stock-icons/16/gtk-go-down.png \ -- stock-icons/16/gtk-go-forward-ltr.png \ -- stock-icons/16/gtk-goto-bottom.png \ -- stock-icons/16/gtk-goto-first-ltr.png \ -- stock-icons/16/gtk-goto-last-ltr.png \ -- stock-icons/16/gtk-goto-top.png \ -- stock-icons/16/gtk-go-up.png \ -- stock-icons/16/gtk-harddisk.png \ -- stock-icons/16/gtk-help.png \ -- stock-icons/16/gtk-home.png \ -- stock-icons/16/gtk-indent-ltr.png \ -- stock-icons/16/gtk-indent-rtl.png \ -- stock-icons/16/gtk-index.png \ -- stock-icons/16/gtk-info.png \ -- stock-icons/16/gtk-jump-to-ltr.png \ -- stock-icons/16/gtk-jump-to-rtl.png \ -- stock-icons/16/gtk-justify-center.png \ -- stock-icons/16/gtk-justify-fill.png \ -- stock-icons/16/gtk-justify-left.png \ -- stock-icons/16/gtk-justify-right.png \ -- stock-icons/16/gtk-leave-fullscreen.png \ -- stock-icons/16/gtk-media-forward-ltr.png \ -- stock-icons/16/gtk-media-next-ltr.png \ -- stock-icons/16/gtk-media-pause.png \ -- stock-icons/16/gtk-media-play-ltr.png \ -- stock-icons/16/gtk-media-play-rtl.png \ -- stock-icons/16/gtk-media-previous-ltr.png \ -- stock-icons/16/gtk-media-record.png \ -- stock-icons/16/gtk-media-rewind-ltr.png \ -- stock-icons/16/gtk-media-stop.png \ -- stock-icons/16/gtk-missing-image.png \ -- stock-icons/16/gtk-network.png \ -- stock-icons/16/gtk-new.png \ -- stock-icons/16/gtk-open.png \ -- stock-icons/16/gtk-paste.png \ -- stock-icons/16/gtk-preferences.png \ -- stock-icons/16/gtk-print.png \ -- stock-icons/16/gtk-print-preview.png \ -- stock-icons/16/gtk-properties.png \ -- stock-icons/16/gtk-quit.png \ -- stock-icons/16/gtk-redo-ltr.png \ -- stock-icons/16/gtk-redo-rtl.png \ -- stock-icons/16/gtk-refresh.png \ -- stock-icons/16/gtk-remove.png \ -- stock-icons/16/gtk-revert-to-saved-ltr.png \ -- stock-icons/16/gtk-revert-to-saved-rtl.png \ -- stock-icons/16/gtk-save-as.png \ -- stock-icons/16/gtk-select-all.png \ -- stock-icons/16/gtk-select-color.png \ -- stock-icons/16/gtk-select-font.png \ -- stock-icons/16/gtk-sort-ascending.png \ -- stock-icons/16/gtk-sort-descending.png \ -- stock-icons/16/gtk-spell-check.png \ -- stock-icons/16/gtk-stop.png \ -- stock-icons/16/gtk-strikethrough.png \ -- stock-icons/16/gtk-font.png \ -- stock-icons/16/gtk-undelete-ltr.png \ -- stock-icons/16/gtk-undelete-rtl.png \ -- stock-icons/16/gtk-underline.png \ -- stock-icons/16/gtk-undo-ltr.png \ -- stock-icons/16/gtk-undo-rtl.png \ -- stock-icons/16/gtk-unindent-ltr.png \ -- stock-icons/16/gtk-unindent-rtl.png \ -- stock-icons/16/gtk-zoom-100.png \ -- stock-icons/16/gtk-zoom-fit.png \ -- stock-icons/16/gtk-zoom-in.png \ -- stock-icons/16/gtk-zoom-out.png \ -- stock-icons/16/gtk-italic.png \ -- stock-icons/16/gtk-bold.png \ -- stock-icons/20/gtk-apply.png \ -- stock-icons/20/gtk-cancel.png \ -- stock-icons/20/gtk-close.png \ -- stock-icons/20/gtk-no.png \ -- stock-icons/20/gtk-ok.png \ -- stock-icons/20/gtk-yes.png \ -- stock-icons/24/document-open-recent.png \ -- stock-icons/24/gtk-about.png \ -- stock-icons/24/gtk-add.png \ -- stock-icons/24/gtk-bold.png \ -- stock-icons/24/gtk-cdrom.png \ -- stock-icons/24/gtk-clear.png \ -- stock-icons/24/gtk-close.png \ -- stock-icons/24/gtk-color-picker.png \ -- stock-icons/24/gtk-connect.png \ -- stock-icons/24/gtk-convert.png \ -- stock-icons/24/gtk-copy.png \ -- stock-icons/24/gtk-cut.png \ -- stock-icons/24/gtk-directory.png \ -- stock-icons/24/gtk-disconnect.png \ -- stock-icons/24/gtk-edit.png \ -- stock-icons/24/gtk-execute.png \ -- stock-icons/24/gtk-file.png \ -- stock-icons/24/gtk-find-and-replace.png \ -- stock-icons/24/gtk-find.png \ -- stock-icons/24/gtk-font.png \ -- stock-icons/24/gtk-fullscreen.png \ -- stock-icons/24/gtk-go-back-ltr.png \ -- stock-icons/24/gtk-goto-top.png \ -- stock-icons/24/gtk-go-down.png \ -- stock-icons/24/gtk-goto-bottom.png \ -- stock-icons/24/gtk-goto-first-ltr.png \ -- stock-icons/24/gtk-goto-last-ltr.png \ -- stock-icons/24/gtk-go-up.png \ -- stock-icons/24/gtk-harddisk.png \ -- stock-icons/24/gtk-help.png \ -- stock-icons/24/gtk-home.png \ -- stock-icons/24/gtk-indent-ltr.png \ -- stock-icons/24/gtk-indent-rtl.png \ -- stock-icons/24/gtk-index.png \ -- stock-icons/24/gtk-info.png \ -- stock-icons/24/gtk-italic.png \ -- stock-icons/24/gtk-jump-to-ltr.png \ -- stock-icons/24/gtk-jump-to-rtl.png \ -- stock-icons/24/gtk-justify-center.png \ -- stock-icons/24/gtk-justify-fill.png \ -- stock-icons/24/gtk-justify-left.png \ -- stock-icons/24/gtk-justify-right.png \ -- stock-icons/24/gtk-leave-fullscreen.png \ -- stock-icons/24/gtk-media-forward-ltr.png \ -- stock-icons/24/gtk-media-next-ltr.png \ -- stock-icons/24/gtk-media-pause.png \ -- stock-icons/24/gtk-media-play-ltr.png \ -- stock-icons/24/gtk-media-play-rtl.png \ -- stock-icons/24/gtk-media-previous-ltr.png \ -- stock-icons/24/gtk-media-record.png \ -- stock-icons/24/gtk-media-rewind-ltr.png \ -- stock-icons/24/gtk-media-stop.png \ -- stock-icons/24/gtk-missing-image.png \ -- stock-icons/24/gtk-network.png \ -- stock-icons/24/gtk-new.png \ -- stock-icons/24/gtk-open.png \ -- stock-icons/24/gtk-orientation-reverse-landscape.png \ -- stock-icons/24/gtk-orientation-landscape.png \ -- stock-icons/24/gtk-orientation-reverse-portrait.png \ -- stock-icons/24/gtk-orientation-portrait.png \ -- stock-icons/24/gtk-paste.png \ -- stock-icons/24/gtk-preferences.png \ -- stock-icons/24/gtk-print.png \ -- stock-icons/24/gtk-print-preview.png \ -- stock-icons/24/gtk-properties.png \ -- stock-icons/24/gtk-quit.png \ -- stock-icons/24/gtk-redo-ltr.png \ -- stock-icons/24/gtk-redo-rtl.png \ -- stock-icons/24/gtk-refresh.png \ -- stock-icons/24/gtk-remove.png \ -- stock-icons/24/gtk-revert-to-saved-ltr.png \ -- stock-icons/24/gtk-revert-to-saved-rtl.png \ -- stock-icons/24/gtk-select-font.png \ -- stock-icons/24/gtk-save-as.png \ -- stock-icons/24/gtk-floppy.png \ -- stock-icons/24/gtk-select-all.png \ -- stock-icons/24/gtk-select-color.png \ -- stock-icons/24/gtk-sort-ascending.png \ -- stock-icons/24/gtk-sort-descending.png \ -- stock-icons/24/gtk-spell-check.png \ -- stock-icons/24/gtk-stop.png \ -- stock-icons/24/gtk-strikethrough.png \ -- stock-icons/24/gtk-delete.png \ -- stock-icons/24/gtk-undelete-ltr.png \ -- stock-icons/24/gtk-undelete-rtl.png \ -- stock-icons/24/gtk-underline.png \ -- stock-icons/24/gtk-undo-ltr.png \ -- stock-icons/24/gtk-undo-rtl.png \ -- stock-icons/24/gtk-unindent-ltr.png \ -- stock-icons/24/gtk-unindent-rtl.png \ -- stock-icons/24/gtk-zoom-100.png \ -- stock-icons/24/gtk-zoom-fit.png \ -- stock-icons/24/gtk-zoom-in.png \ -- stock-icons/24/gtk-zoom-out.png \ -- stock-icons/24/gtk-go-forward-ltr.png \ -- stock-icons/32/gtk-dnd-multiple.png \ -- stock-icons/32/gtk-dnd.png \ -- stock-icons/48/gtk-dialog-authentication.png \ -- stock-icons/48/gtk-dialog-error.png \ -- stock-icons/48/gtk-dialog-info.png \ -- stock-icons/48/gtk-dialog-question.png \ -- stock-icons/48/gtk-dialog-warning.png +-# When building the GDI+ loader statically, we put the "common" objects +-# only in one of the archives to avoid duplicate definitions +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@STATIC_GDIPLUS_LIBS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la - - --GENERATED_ICONS = \ -- stock-icons/16/gtk-go-back-rtl.png \ -- stock-icons/16/gtk-go-forward-rtl.png \ -- stock-icons/16/gtk-goto-first-rtl.png \ -- stock-icons/16/gtk-goto-last-rtl.png \ -- stock-icons/16/gtk-media-forward-rtl.png \ -- stock-icons/16/gtk-media-next-rtl.png \ -- stock-icons/16/gtk-media-previous-rtl.png \ -- stock-icons/16/gtk-media-rewind-rtl.png \ -- stock-icons/16/gtk-save.png \ -- stock-icons/24/gtk-go-back-rtl.png \ -- stock-icons/24/gtk-go-forward-rtl.png \ -- stock-icons/24/gtk-goto-first-rtl.png \ -- stock-icons/24/gtk-goto-last-rtl.png \ -- stock-icons/24/gtk-media-forward-rtl.png \ -- stock-icons/24/gtk-media-next-rtl.png \ -- stock-icons/24/gtk-media-previous-rtl.png \ -- stock-icons/24/gtk-media-rewind-rtl.png \ -- stock-icons/24/gtk-save.png +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_ico_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c - - --@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) --@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ --@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ --@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_wmf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c - -+bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ -+ gtk-update-icon-cache$(EXEEXT) - subdir = gtk -+DIST_COMMON = $(am__gtkunixprintinclude_HEADERS_DIST) \ -+ $(gtkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/gtk-win32.rc.in \ -+ $(srcdir)/gtkversion.h.in $(srcdir)/makefile.msc.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_emf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_bmp_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_gif_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_png_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_tiff_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@GDIPLUS_LIBS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) +- +- +-# Loaders that aren't built if we build the GDI+ loader +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la +- +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la ++DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ ++ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/gdk-pixbuf-features.h.in $(srcdir)/gdk_pixbuf.rc.in \ ++ $(top_srcdir)/Makefile.decl ChangeLog ++noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) ++bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ ++ gdk-pixbuf-query-loaders$(EXEEXT) ++subdir = gdk-pixbuf ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ -+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" \ -+ "$(DESTDIR)$(gtkunixprintincludedir)" ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" \ ++ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)" +libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) -- --@OS_UNIX_TRUE@libgtk_directfb_2_0_la_DEPENDENCIES = \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk/$(gdktargetlib) \ --@OS_UNIX_TRUE@ xdgmime/libxdgmime.la --@OS_UNIX_FALSE@libgtk_directfb_2_0_la_DEPENDENCIES = \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk/$(gdktargetlib) ++loaderLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ ++ $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) \ -+ $(am__append_3) -+libgtk_directfb_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_2) - am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ - gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ - gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -@@ -1376,16 +104,17 @@ am__libgtk_directfb_2_0_la_SOURCES_DIST - gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ - gtkcellrendererprogress.c gtkcellrendererspin.c \ - gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkctree.c gtkcurve.c \ -- gtkdialog.c gtkdrawingarea.c gtkeditable.c gtkentry.c \ -- gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -- gtkfilechooser.c gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesel.c gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c \ -+ gtkcolorbutton.c gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c \ -+ gtkcombobox.c gtkcomboboxentry.c gtkcontainer.c gtkctree.c \ -+ gtkcurve.c gtkdialog.c gtkdrawingarea.c gtkeditable.c \ -+ gtkentry.c gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -+ gtkfilechooser.c gtkfilechooserbutton.c \ -+ gtkfilechooserdefault.c gtkfilechooserdialog.c \ -+ gtkfilechooserembed.c gtkfilechooserentry.c \ -+ gtkfilechoosersettings.c gtkfilechooserutils.c \ -+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesel.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ - gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ - gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ - gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -@@ -1413,39 +142,41 @@ am__libgtk_directfb_2_0_la_SOURCES_DIST - gtkscrolledwindow.c gtkselection.c gtkseparator.c \ - gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ - gtksignal.c gtksizegroup.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktext.c gtktextbtree.c gtktextbuffer.c \ -- gtktextbufferrichtext.c gtktextbufferserialize.c gtktextchild.c \ -- gtktextdisplay.c gtktextiter.c gtktextlayout.c gtktextmark.c \ -- gtktextsegment.c gtktexttag.c gtktexttagtable.c gtktexttypes.c \ -- gtktextutil.c gtktextview.c gtkthemes.c gtktipsquery.c \ -- gtktoggleaction.c gtktogglebutton.c gtktoggletoolbutton.c \ -- gtktoolbar.c gtktoolbutton.c gtktoolitem.c gtktooltip.c \ -- gtktooltips.c gtktree.c gtktreedatalist.c gtktreednd.c \ -- gtktreeitem.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktext.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktipsquery.c gtktoggleaction.c \ -+ gtktogglebutton.c gtktoggletoolbutton.c gtktoolbar.c \ -+ gtktoolbutton.c gtktoolitem.c gtktooltip.c gtktooltips.c \ -+ gtktree.c gtktreedatalist.c gtktreednd.c gtktreeitem.c \ -+ gtktreemodel.c gtktreemodelfilter.c gtktreemodelsort.c \ -+ gtktreeselection.c gtktreesortable.c gtktreestore.c \ -+ gtktreeview.c gtktreeviewcolumn.c gtktypebuiltins.c \ -+ gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \ -+ gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \ -+ gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \ -+ gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \ - gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h \ -- gtkclipboard.c gtkdnd.c gtkfilesystemunix.c \ -- gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \ -- gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \ -- gtkprintoperation-unix.c gtkprintunixdialog.c gtkprintbackend.c \ -- gtksearchenginebeagle.c gtksearchenginetracker.c \ -- gtkfilesystemwin32.c gtkprint-win32.c gtkprintoperation-win32.c \ -- gtkplug-x11.c gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c \ -- gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c \ -- gtkwin32embedwidget.c gtksearchenginequartz.c gtkplug-stub.c \ -- gtksocket-stub.c --@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \ --@USE_QUARTZ_TRUE@ gtkquartz.lo -+ gtkfilesystemunix.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkfilesystemwin32.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c - @USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo --am__objects_2 = gtkquery.lo gtksearchengine.lo gtksearchenginesimple.lo \ -- fnmatch.lo gtkaboutdialog.lo gtkaccelgroup.lo gtkaccellabel.lo \ -- gtkaccelmap.lo gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ -+@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo \ -+@USE_QUARTZ_TRUE@ gtkdnd-quartz.lo gtkquartz.lo -+am__objects_2 = gtkquery.lo gtksearchengine.lo \ -+ gtksearchenginesimple.lo fnmatch.lo gtkaboutdialog.lo \ -+ gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \ -+ gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ - gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ - gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ - gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ -@@ -1458,44 +189,45 @@ am__objects_2 = gtkquery.lo gtksearcheng - gtkcolorbutton.lo gtkcolorsel.lo gtkcolorseldialog.lo \ - gtkcombo.lo gtkcombobox.lo gtkcomboboxentry.lo gtkcontainer.lo \ - gtkctree.lo gtkcurve.lo gtkdialog.lo gtkdrawingarea.lo \ -- gtkeditable.lo gtkentry.lo gtkentrycompletion.lo gtkeventbox.lo \ -- gtkexpander.lo gtkfilechooser.lo gtkfilechooserbutton.lo \ -- gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ -- gtkfilechooserembed.lo gtkfilechooserentry.lo \ -- gtkfilechoosersettings.lo gtkfilechooserutils.lo \ -- gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesel.lo \ -- gtkfilesystem.lo gtkfilesystemmodel.lo gtkfixed.lo \ -- gtkfontbutton.lo gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo \ -- gtkhandlebox.lo gtkhbbox.lo gtkhbox.lo gtkhpaned.lo \ -- gtkhruler.lo gtkhscale.lo gtkhscrollbar.lo gtkhseparator.lo \ -- gtkhsv.lo gtkiconcache.lo gtkiconcachevalidator.lo \ -- gtkiconfactory.lo gtkicontheme.lo gtkiconview.lo gtkimage.lo \ -- gtkimagemenuitem.lo gtkimcontext.lo gtkimcontextsimple.lo \ -- gtkimmodule.lo gtkimmulticontext.lo gtkinputdialog.lo \ -- gtkinvisible.lo gtkitem.lo gtkitemfactory.lo gtkkeyhash.lo \ -- gtklabel.lo gtklayout.lo gtklinkbutton.lo gtklist.lo \ -- gtklistitem.lo gtkliststore.lo gtkmain.lo gtkmarshal.lo \ -- gtkmarshalers.lo gtkmenu.lo gtkmenubar.lo gtkmenuitem.lo \ -- gtkmenushell.lo gtkmenutoolbutton.lo gtkmessagedialog.lo \ -- gtkmisc.lo gtkmnemonichash.lo gtkmodules.lo gtknotebook.lo \ -- gtkobject.lo gtkoldeditable.lo gtkoptionmenu.lo gtkpagesetup.lo \ -- gtkpaned.lo gtkpapersize.lo gtkpathbar.lo gtkpixmap.lo \ -- gtkplug.lo gtkpreview.lo gtkprintcontext.lo \ -- gtkprintoperation.lo gtkprintoperationpreview.lo \ -- gtkprintsettings.lo gtkprintutils.lo gtkprogress.lo \ -- gtkprogressbar.lo gtkradioaction.lo gtkradiobutton.lo \ -- gtkradiomenuitem.lo gtkradiotoolbutton.lo gtkrange.lo \ -- gtkrbtree.lo gtkrc.lo gtkrecentaction.lo \ -- gtkrecentchooserdefault.lo gtkrecentchooserdialog.lo \ -- gtkrecentchoosermenu.lo gtkrecentchooserwidget.lo \ -- gtkrecentchooserutils.lo gtkrecentchooser.lo gtkrecentfilter.lo \ -- gtkrecentmanager.lo gtkruler.lo gtkscale.lo gtkscalebutton.lo \ -- gtkscrollbar.lo gtkscrolledwindow.lo gtkselection.lo \ -- gtkseparator.lo gtkseparatormenuitem.lo gtkseparatortoolitem.lo \ -- gtksettings.lo gtksignal.lo gtksizegroup.lo gtksocket.lo \ -- gtkspinbutton.lo gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo \ -- gtkstyle.lo gtktable.lo gtktearoffmenuitem.lo gtktext.lo \ -- gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ -+ gtkeditable.lo gtkentry.lo gtkentrycompletion.lo \ -+ gtkeventbox.lo gtkexpander.lo gtkfilechooser.lo \ -+ gtkfilechooserbutton.lo gtkfilechooserdefault.lo \ -+ gtkfilechooserdialog.lo gtkfilechooserembed.lo \ -+ gtkfilechooserentry.lo gtkfilechoosersettings.lo \ -+ gtkfilechooserutils.lo gtkfilechooserwidget.lo \ -+ gtkfilefilter.lo gtkfilesel.lo gtkfilesystem.lo \ -+ gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ -+ gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ -+ gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ -+ gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ -+ gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ -+ gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ -+ gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ -+ gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkitemfactory.lo \ -+ gtkkeyhash.lo gtklabel.lo gtklayout.lo gtklinkbutton.lo \ -+ gtklist.lo gtklistitem.lo gtkliststore.lo gtkmain.lo \ -+ gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo gtkmenubar.lo \ -+ gtkmenuitem.lo gtkmenushell.lo gtkmenutoolbutton.lo \ -+ gtkmessagedialog.lo gtkmisc.lo gtkmnemonichash.lo \ -+ gtkmodules.lo gtknotebook.lo gtkobject.lo gtkoldeditable.lo \ -+ gtkoptionmenu.lo gtkpagesetup.lo gtkpaned.lo gtkpapersize.lo \ -+ gtkpathbar.lo gtkpixmap.lo gtkplug.lo gtkpreview.lo \ -+ gtkprintcontext.lo gtkprintoperation.lo \ -+ gtkprintoperationpreview.lo gtkprintsettings.lo \ -+ gtkprintutils.lo gtkprogress.lo gtkprogressbar.lo \ -+ gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ -+ gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ -+ gtkrecentaction.lo gtkrecentchooserdefault.lo \ -+ gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ -+ gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ -+ gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ -+ gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ -+ gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ -+ gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ -+ gtksignal.lo gtksizegroup.lo gtksocket.lo gtkspinbutton.lo \ -+ gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ -+ gtktable.lo gtktearoffmenuitem.lo gtktext.lo gtktextbtree.lo \ -+ gtktextbuffer.lo gtktextbufferrichtext.lo \ - gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ - gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ - gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ -@@ -1503,13 +235,13 @@ am__objects_2 = gtkquery.lo gtksearcheng - gtktipsquery.lo gtktoggleaction.lo gtktogglebutton.lo \ - gtktoggletoolbutton.lo gtktoolbar.lo gtktoolbutton.lo \ - gtktoolitem.lo gtktooltip.lo gtktooltips.lo gtktree.lo \ -- gtktreedatalist.lo gtktreednd.lo gtktreeitem.lo gtktreemodel.lo \ -- gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ -- gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ -- gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ -- gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ -- gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ -- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ -+ gtktreedatalist.lo gtktreednd.lo gtktreeitem.lo \ -+ gtktreemodel.lo gtktreemodelfilter.lo gtktreemodelsort.lo \ -+ gtktreeselection.lo gtktreesortable.lo gtktreestore.lo \ -+ gtktreeview.lo gtktreeviewcolumn.lo gtktypebuiltins.lo \ -+ gtktypeutils.lo gtkuimanager.lo gtkvbbox.lo gtkvbox.lo \ -+ gtkvolumebutton.lo gtkviewport.lo gtkvpaned.lo gtkvruler.lo \ -+ gtkvscale.lo gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ - gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) - am__objects_3 = gtkfilesystemunix.lo gtkpagesetupunixdialog.lo \ - gtkprinter.lo gtkprinteroption.lo gtkprinteroptionset.lo \ -@@ -1529,23 +261,18 @@ am__objects_9 = gtkplug-win32.lo gtksock - @USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) - am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ - gtksocket-stub.lo --@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = \ --@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_11) -+@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = $(am__objects_11) - am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo --@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = \ --@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_13) -+@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = $(am__objects_13) - am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ - $(am__objects_8) $(am__objects_10) $(am__objects_12) \ - $(am__objects_14) - am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) - libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) --@OS_UNIX_TRUE@libgtk_linux_fb_2_0_la_DEPENDENCIES = \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk/$(gdktargetlib) \ --@OS_UNIX_TRUE@ xdgmime/libxdgmime.la --@OS_UNIX_FALSE@libgtk_linux_fb_2_0_la_DEPENDENCIES = \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk/$(gdktargetlib) -+libgtk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo \ ++ gdk-pixbuf-animation.lo gdk-pixbuf-data.lo gdk-pixbuf-io.lo \ ++ gdk-pixbuf-loader.lo gdk-pixbuf-scale.lo \ ++ gdk-pixbuf-simple-anim.lo gdk-pixbuf-scaled-anim.lo \ ++ gdk-pixbuf-util.lo gdk-pixdata.lo gdk-pixbuf-enum-types.lo ++libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) ++libgdk_pixbuf_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+libgtk_linux_fb_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_2) - am__libgtk_linux_fb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ - gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ - gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -@@ -1557,16 +284,17 @@ am__libgtk_linux_fb_2_0_la_SOURCES_DIST - gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ - gtkcellrendererprogress.c gtkcellrendererspin.c \ - gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkctree.c gtkcurve.c \ -- gtkdialog.c gtkdrawingarea.c gtkeditable.c gtkentry.c \ -- gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -- gtkfilechooser.c gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesel.c gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c \ -+ gtkcolorbutton.c gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c \ -+ gtkcombobox.c gtkcomboboxentry.c gtkcontainer.c gtkctree.c \ -+ gtkcurve.c gtkdialog.c gtkdrawingarea.c gtkeditable.c \ -+ gtkentry.c gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -+ gtkfilechooser.c gtkfilechooserbutton.c \ -+ gtkfilechooserdefault.c gtkfilechooserdialog.c \ -+ gtkfilechooserembed.c gtkfilechooserentry.c \ -+ gtkfilechoosersettings.c gtkfilechooserutils.c \ -+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesel.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ - gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ - gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ - gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -@@ -1594,42 +322,40 @@ am__libgtk_linux_fb_2_0_la_SOURCES_DIST - gtkscrolledwindow.c gtkselection.c gtkseparator.c \ - gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ - gtksignal.c gtksizegroup.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktext.c gtktextbtree.c gtktextbuffer.c \ -- gtktextbufferrichtext.c gtktextbufferserialize.c gtktextchild.c \ -- gtktextdisplay.c gtktextiter.c gtktextlayout.c gtktextmark.c \ -- gtktextsegment.c gtktexttag.c gtktexttagtable.c gtktexttypes.c \ -- gtktextutil.c gtktextview.c gtkthemes.c gtktipsquery.c \ -- gtktoggleaction.c gtktogglebutton.c gtktoggletoolbutton.c \ -- gtktoolbar.c gtktoolbutton.c gtktoolitem.c gtktooltip.c \ -- gtktooltips.c gtktree.c gtktreedatalist.c gtktreednd.c \ -- gtktreeitem.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktext.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktipsquery.c gtktoggleaction.c \ -+ gtktogglebutton.c gtktoggletoolbutton.c gtktoolbar.c \ -+ gtktoolbutton.c gtktoolitem.c gtktooltip.c gtktooltips.c \ -+ gtktree.c gtktreedatalist.c gtktreednd.c gtktreeitem.c \ -+ gtktreemodel.c gtktreemodelfilter.c gtktreemodelsort.c \ -+ gtktreeselection.c gtktreesortable.c gtktreestore.c \ -+ gtktreeview.c gtktreeviewcolumn.c gtktypebuiltins.c \ -+ gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \ -+ gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \ -+ gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \ -+ gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \ - gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h \ -- gtkclipboard.c gtkdnd.c gtkfilesystemunix.c \ -- gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \ -- gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \ -- gtkprintoperation-unix.c gtkprintunixdialog.c gtkprintbackend.c \ -- gtksearchenginebeagle.c gtksearchenginetracker.c \ -- gtkfilesystemwin32.c gtkprint-win32.c gtkprintoperation-win32.c \ -- gtkplug-x11.c gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c \ -- gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c \ -- gtkwin32embedwidget.c gtksearchenginequartz.c gtkplug-stub.c \ -- gtksocket-stub.c -+ gtkfilesystemunix.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkfilesystemwin32.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c - am_libgtk_linux_fb_2_0_la_OBJECTS = $(am__objects_15) - libgtk_linux_fb_2_0_la_OBJECTS = $(am_libgtk_linux_fb_2_0_la_OBJECTS) --@OS_UNIX_TRUE@libgtk_quartz_2_0_la_DEPENDENCIES = \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk/$(gdktargetlib) \ --@OS_UNIX_TRUE@ xdgmime/libxdgmime.la --@OS_UNIX_FALSE@libgtk_quartz_2_0_la_DEPENDENCIES = \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk/$(gdktargetlib) -+libgtk_linux_fb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(libgdk_pixbuf_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__DEPENDENCIES_2 = libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(am__DEPENDENCIES_1) ++libpixbufloader_ani_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo ++libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) ++libpixbufloader_ani_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_linux_fb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+libgtk_quartz_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_2) - am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ - gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ - gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -@@ -1641,16 +367,17 @@ am__libgtk_quartz_2_0_la_SOURCES_DIST = - gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ - gtkcellrendererprogress.c gtkcellrendererspin.c \ - gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkctree.c gtkcurve.c \ -- gtkdialog.c gtkdrawingarea.c gtkeditable.c gtkentry.c \ -- gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -- gtkfilechooser.c gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesel.c gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c \ -+ gtkcolorbutton.c gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c \ -+ gtkcombobox.c gtkcomboboxentry.c gtkcontainer.c gtkctree.c \ -+ gtkcurve.c gtkdialog.c gtkdrawingarea.c gtkeditable.c \ -+ gtkentry.c gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -+ gtkfilechooser.c gtkfilechooserbutton.c \ -+ gtkfilechooserdefault.c gtkfilechooserdialog.c \ -+ gtkfilechooserembed.c gtkfilechooserentry.c \ -+ gtkfilechoosersettings.c gtkfilechooserutils.c \ -+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesel.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ - gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ - gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ - gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -@@ -1678,35 +405,39 @@ am__libgtk_quartz_2_0_la_SOURCES_DIST = - gtkscrolledwindow.c gtkselection.c gtkseparator.c \ - gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ - gtksignal.c gtksizegroup.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktext.c gtktextbtree.c gtktextbuffer.c \ -- gtktextbufferrichtext.c gtktextbufferserialize.c gtktextchild.c \ -- gtktextdisplay.c gtktextiter.c gtktextlayout.c gtktextmark.c \ -- gtktextsegment.c gtktexttag.c gtktexttagtable.c gtktexttypes.c \ -- gtktextutil.c gtktextview.c gtkthemes.c gtktipsquery.c \ -- gtktoggleaction.c gtktogglebutton.c gtktoggletoolbutton.c \ -- gtktoolbar.c gtktoolbutton.c gtktoolitem.c gtktooltip.c \ -- gtktooltips.c gtktree.c gtktreedatalist.c gtktreednd.c \ -- gtktreeitem.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktext.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktipsquery.c gtktoggleaction.c \ -+ gtktogglebutton.c gtktoggletoolbutton.c gtktoolbar.c \ -+ gtktoolbutton.c gtktoolitem.c gtktooltip.c gtktooltips.c \ -+ gtktree.c gtktreedatalist.c gtktreednd.c gtktreeitem.c \ -+ gtktreemodel.c gtktreemodelfilter.c gtktreemodelsort.c \ -+ gtktreeselection.c gtktreesortable.c gtktreestore.c \ -+ gtktreeview.c gtktreeviewcolumn.c gtktypebuiltins.c \ -+ gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \ -+ gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \ -+ gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \ -+ gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \ - gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h \ -- gtkclipboard.c gtkdnd.c gtkfilesystemunix.c \ -- gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \ -- gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \ -- gtkprintoperation-unix.c gtkprintunixdialog.c gtkprintbackend.c \ -- gtksearchenginebeagle.c gtksearchenginetracker.c \ -- gtkfilesystemwin32.c gtkprint-win32.c gtkprintoperation-win32.c \ -- gtkplug-x11.c gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c \ -- gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c \ -- gtkwin32embedwidget.c gtksearchenginequartz.c gtkplug-stub.c \ -- gtksocket-stub.c -+ gtkfilesystemunix.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkfilesystemwin32.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c - am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) - libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) -+libgtk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(libpixbufloader_ani_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@am_libpixbufloader_ani_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ $(loaderdir) ++libpixbufloader_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo ++libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) ++libpixbufloader_bmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ - am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ - gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ - gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -@@ -1718,16 +449,100 @@ am__libgtk_win32_2_0_la_SOURCES_DIST = g - gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ - gtkcellrendererprogress.c gtkcellrendererspin.c \ - gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkctree.c gtkcurve.c \ -- gtkdialog.c gtkdrawingarea.c gtkeditable.c gtkentry.c \ -- gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -- gtkfilechooser.c gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesel.c gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c \ -+ gtkcolorbutton.c gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c \ -+ gtkcombobox.c gtkcomboboxentry.c gtkcontainer.c gtkctree.c \ -+ gtkcurve.c gtkdialog.c gtkdrawingarea.c gtkeditable.c \ -+ gtkentry.c gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -+ gtkfilechooser.c gtkfilechooserbutton.c \ -+ gtkfilechooserdefault.c gtkfilechooserdialog.c \ -+ gtkfilechooserembed.c gtkfilechooserentry.c \ -+ gtkfilechoosersettings.c gtkfilechooserutils.c \ -+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesel.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -+ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -+ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -+ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -+ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -+ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -+ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -+ gtkitemfactory.c gtkkeyhash.c gtklabel.c gtklayout.c \ -+ gtklinkbutton.c gtklist.c gtklistitem.c gtkliststore.c \ -+ gtkmain.c gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ -+ gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ -+ gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ -+ gtknotebook.c gtkobject.c gtkoldeditable.c gtkoptionmenu.c \ -+ gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \ -+ gtkpixmap.c gtkplug.c gtkpreview.c gtkprintcontext.c \ -+ gtkprintoperation.c gtkprintoperationpreview.c \ -+ gtkprintsettings.c gtkprintutils.c gtkprogress.c \ -+ gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ -+ gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ -+ gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ -+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -+ gtksignal.c gtksizegroup.c gtksocket.c gtkspinbutton.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktext.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktipsquery.c gtktoggleaction.c \ -+ gtktogglebutton.c gtktoggletoolbutton.c gtktoolbar.c \ -+ gtktoolbutton.c gtktoolitem.c gtktooltip.c gtktooltips.c \ -+ gtktree.c gtktreedatalist.c gtktreednd.c gtktreeitem.c \ -+ gtktreemodel.c gtktreemodelfilter.c gtktreemodelsort.c \ -+ gtktreeselection.c gtktreesortable.c gtktreestore.c \ -+ gtktreeview.c gtktreeviewcolumn.c gtktypebuiltins.c \ -+ gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \ -+ gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \ -+ gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \ -+ gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \ -+ gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h \ -+ gtkfilesystemunix.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkfilesystemwin32.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c -+am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) -+libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) -+libgtk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(libpixbufloader_bmp_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@am_libpixbufloader_bmp_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-bmp.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.lo ++libpixbufloader_gdip_bmp_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_bmp_la_OBJECTS) ++libpixbufloader_gdip_bmp_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_bmp_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-emf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.lo ++libpixbufloader_gdip_emf_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_emf_la_OBJECTS) ++libpixbufloader_gdip_emf_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_emf_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-gif.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.lo ++libpixbufloader_gdip_gif_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_gif_la_OBJECTS) ++libpixbufloader_gdip_gif_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_gif_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.lo ++libpixbufloader_gdip_ico_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_ico_la_OBJECTS) ++libpixbufloader_gdip_ico_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_ico_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-jpeg.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.lo ++libpixbufloader_gdip_jpeg_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_jpeg_la_OBJECTS) ++libpixbufloader_gdip_jpeg_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_jpeg_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-tiff.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.lo ++libpixbufloader_gdip_tiff_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_tiff_la_OBJECTS) ++libpixbufloader_gdip_tiff_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_tiff_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-wmf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.lo ++libpixbufloader_gdip_wmf_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_wmf_la_OBJECTS) ++libpixbufloader_gdip_wmf_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_wmf_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++libpixbufloader_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo ++libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) ++libpixbufloader_gif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+libgtk_x11_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -+ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -+ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -+ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -+ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -+ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -+ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -+ gtkcellrendererprogress.c gtkcellrendererspin.c \ -+ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c \ -+ gtkcolorbutton.c gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c \ -+ gtkcombobox.c gtkcomboboxentry.c gtkcontainer.c gtkctree.c \ -+ gtkcurve.c gtkdialog.c gtkdrawingarea.c gtkeditable.c \ -+ gtkentry.c gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -+ gtkfilechooser.c gtkfilechooserbutton.c \ -+ gtkfilechooserdefault.c gtkfilechooserdialog.c \ -+ gtkfilechooserembed.c gtkfilechooserentry.c \ -+ gtkfilechoosersettings.c gtkfilechooserutils.c \ -+ gtkfilechooserwidget.c gtkfilefilter.c gtkfilesel.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ - gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ - gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ - gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -@@ -1755,469 +570,1312 @@ am__libgtk_win32_2_0_la_SOURCES_DIST = g - gtkscrolledwindow.c gtkselection.c gtkseparator.c \ - gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ - gtksignal.c gtksizegroup.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktext.c gtktextbtree.c gtktextbuffer.c \ -- gtktextbufferrichtext.c gtktextbufferserialize.c gtktextchild.c \ -- gtktextdisplay.c gtktextiter.c gtktextlayout.c gtktextmark.c \ -- gtktextsegment.c gtktexttag.c gtktexttagtable.c gtktexttypes.c \ -- gtktextutil.c gtktextview.c gtkthemes.c gtktipsquery.c \ -- gtktoggleaction.c gtktogglebutton.c gtktoggletoolbutton.c \ -- gtktoolbar.c gtktoolbutton.c gtktoolitem.c gtktooltip.c \ -- gtktooltips.c gtktree.c gtktreedatalist.c gtktreednd.c \ -- gtktreeitem.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktext.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktipsquery.c gtktoggleaction.c \ -+ gtktogglebutton.c gtktoggletoolbutton.c gtktoolbar.c \ -+ gtktoolbutton.c gtktoolitem.c gtktooltip.c gtktooltips.c \ -+ gtktree.c gtktreedatalist.c gtktreednd.c gtktreeitem.c \ -+ gtktreemodel.c gtktreemodelfilter.c gtktreemodelsort.c \ -+ gtktreeselection.c gtktreesortable.c gtktreestore.c \ -+ gtktreeview.c gtktreeviewcolumn.c gtktypebuiltins.c \ -+ gtktypeutils.c gtkuimanager.c gtkvbbox.c gtkvbox.c \ -+ gtkvolumebutton.c gtkviewport.c gtkvpaned.c gtkvruler.c \ -+ gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c \ -+ gtkwindow-decorate.c gtkwindow.c gtkclipboard.c gtkdnd.c \ - gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h \ -- gtkclipboard.c gtkdnd.c gtkfilesystemunix.c \ -- gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \ -- gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \ -- gtkprintoperation-unix.c gtkprintunixdialog.c gtkprintbackend.c \ -- gtksearchenginebeagle.c gtksearchenginetracker.c \ -- gtkfilesystemwin32.c gtkprint-win32.c gtkprintoperation-win32.c \ -- gtkplug-x11.c gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c \ -- gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c \ -- gtkwin32embedwidget.c gtksearchenginequartz.c gtkplug-stub.c \ -+ gtkfilesystemunix.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkfilesystemwin32.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c -+am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) -+libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) -+libgtk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(libpixbufloader_gif_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@am_libpixbufloader_gif_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@ $(loaderdir) ++libpixbufloader_icns_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_icns_la_OBJECTS = io-icns.lo ++libpixbufloader_icns_la_OBJECTS = \ ++ $(am_libpixbufloader_icns_la_OBJECTS) ++libpixbufloader_icns_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(libpixbufloader_icns_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@am_libpixbufloader_icns_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@ $(loaderdir) ++libpixbufloader_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_ico_la_OBJECTS = io-ico.lo ++libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) ++libpixbufloader_ico_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_ico_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ $(loaderdir) ++libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo ++libpixbufloader_jasper_la_OBJECTS = \ ++ $(am_libpixbufloader_jasper_la_OBJECTS) ++libpixbufloader_jasper_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_jasper_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@am_libpixbufloader_jasper_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@ $(loaderdir) ++libpixbufloader_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo ++libpixbufloader_jpeg_la_OBJECTS = \ ++ $(am_libpixbufloader_jpeg_la_OBJECTS) ++libpixbufloader_jpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_jpeg_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@am_libpixbufloader_jpeg_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@ $(loaderdir) ++libpixbufloader_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo ++libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) ++libpixbufloader_pcx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_pcx_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@am_libpixbufloader_pcx_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ $(loaderdir) ++libpixbufloader_png_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_png_la_OBJECTS = io-png.lo ++libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) ++libpixbufloader_png_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_png_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@am_libpixbufloader_png_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@ $(loaderdir) ++libpixbufloader_pnm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo ++libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) ++libpixbufloader_pnm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_pnm_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@am_libpixbufloader_pnm_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ $(loaderdir) ++libpixbufloader_ras_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_ras_la_OBJECTS = io-ras.lo ++libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) ++libpixbufloader_ras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_ras_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@am_libpixbufloader_ras_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ $(loaderdir) ++libpixbufloader_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_tga_la_OBJECTS = io-tga.lo ++libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) ++libpixbufloader_tga_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_tga_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@am_libpixbufloader_tga_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ $(loaderdir) ++libpixbufloader_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo ++libpixbufloader_tiff_la_OBJECTS = \ ++ $(am_libpixbufloader_tiff_la_OBJECTS) ++libpixbufloader_tiff_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_tiff_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@am_libpixbufloader_tiff_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@ $(loaderdir) ++libpixbufloader_wbmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo ++libpixbufloader_wbmp_la_OBJECTS = \ ++ $(am_libpixbufloader_wbmp_la_OBJECTS) ++libpixbufloader_wbmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_wbmp_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@am_libpixbufloader_wbmp_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ $(loaderdir) ++libpixbufloader_xbm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo ++libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) ++libpixbufloader_xbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_xbm_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@am_libpixbufloader_xbm_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ $(loaderdir) ++libpixbufloader_xpm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo ++libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) ++libpixbufloader_xpm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_xpm_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@am_libpixbufloader_xpm_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ $(loaderdir) ++libstatic_pixbufloader_ani_la_LIBADD = ++am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo \ ++ io-ani-animation.lo ++libstatic_pixbufloader_ani_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_ani_la_OBJECTS) ++@INCLUDE_ANI_TRUE@am_libstatic_pixbufloader_ani_la_rpath = ++libstatic_pixbufloader_bmp_la_LIBADD = ++am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo ++libstatic_pixbufloader_bmp_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_bmp_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@am_libstatic_pixbufloader_bmp_la_rpath = ++libstatic_pixbufloader_gdip_bmp_la_LIBADD = ++am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-bmp.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS = io-gdip-bmp.lo ++libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_rpath = ++libstatic_pixbufloader_gdip_emf_la_LIBADD = ++am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-emf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_OBJECTS = io-gdip-emf.lo ++libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_emf_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_rpath = ++libstatic_pixbufloader_gdip_gif_la_LIBADD = ++am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-gif.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_OBJECTS = io-gdip-gif.lo ++libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_gif_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_rpath = ++libstatic_pixbufloader_gdip_ico_la_LIBADD = ++am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST = \ ++ io-gdip-native.h io-gdip-propertytags.h io-gdip-utils.h \ ++ io-gdip-utils.c io-gdip-animation.c io-gdip-animation.h \ ++ io-gdip-ico.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.lo ++libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_ico_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_rpath = ++libstatic_pixbufloader_gdip_jpeg_la_LIBADD = ++am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-jpeg.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = io-gdip-jpeg.lo ++libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_rpath = ++libstatic_pixbufloader_gdip_tiff_la_LIBADD = ++am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-tiff.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS = io-gdip-tiff.lo ++libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_rpath = ++libstatic_pixbufloader_gdip_wmf_la_LIBADD = ++am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-wmf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS = io-gdip-wmf.lo ++libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_rpath = ++libstatic_pixbufloader_gif_la_LIBADD = ++am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo \ ++ io-gif-animation.lo ++libstatic_pixbufloader_gif_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gif_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@am_libstatic_pixbufloader_gif_la_rpath = ++libstatic_pixbufloader_icns_la_LIBADD = ++am_libstatic_pixbufloader_icns_la_OBJECTS = io-icns.lo ++libstatic_pixbufloader_icns_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_icns_la_OBJECTS) ++@INCLUDE_ICNS_TRUE@am_libstatic_pixbufloader_icns_la_rpath = ++libstatic_pixbufloader_ico_la_LIBADD = ++am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo ++libstatic_pixbufloader_ico_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_ico_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@am_libstatic_pixbufloader_ico_la_rpath = ++libstatic_pixbufloader_jasper_la_LIBADD = ++am_libstatic_pixbufloader_jasper_la_OBJECTS = io-jasper.lo ++libstatic_pixbufloader_jasper_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_jasper_la_OBJECTS) ++@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@am_libstatic_pixbufloader_jasper_la_rpath = ++libstatic_pixbufloader_jpeg_la_LIBADD = ++am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo ++libstatic_pixbufloader_jpeg_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@am_libstatic_pixbufloader_jpeg_la_rpath = ++libstatic_pixbufloader_pcx_la_LIBADD = ++am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo ++libstatic_pixbufloader_pcx_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_pcx_la_OBJECTS) ++@INCLUDE_PCX_TRUE@am_libstatic_pixbufloader_pcx_la_rpath = ++libstatic_pixbufloader_png_la_LIBADD = ++am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo ++libstatic_pixbufloader_png_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_png_la_OBJECTS) ++@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@am_libstatic_pixbufloader_png_la_rpath = ++libstatic_pixbufloader_pnm_la_LIBADD = ++am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo ++libstatic_pixbufloader_pnm_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_pnm_la_OBJECTS) ++@INCLUDE_PNM_TRUE@am_libstatic_pixbufloader_pnm_la_rpath = ++libstatic_pixbufloader_ras_la_LIBADD = ++am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo ++libstatic_pixbufloader_ras_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_ras_la_OBJECTS) ++@INCLUDE_RAS_TRUE@am_libstatic_pixbufloader_ras_la_rpath = ++libstatic_pixbufloader_tga_la_LIBADD = ++am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo ++libstatic_pixbufloader_tga_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_tga_la_OBJECTS) ++@INCLUDE_TGA_TRUE@am_libstatic_pixbufloader_tga_la_rpath = ++libstatic_pixbufloader_tiff_la_LIBADD = ++am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo ++libstatic_pixbufloader_tiff_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_tiff_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@am_libstatic_pixbufloader_tiff_la_rpath = ++libstatic_pixbufloader_wbmp_la_LIBADD = ++am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo ++libstatic_pixbufloader_wbmp_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) ++@INCLUDE_WBMP_TRUE@am_libstatic_pixbufloader_wbmp_la_rpath = ++libstatic_pixbufloader_xbm_la_LIBADD = ++am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo ++libstatic_pixbufloader_xbm_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_xbm_la_OBJECTS) ++@INCLUDE_XBM_TRUE@am_libstatic_pixbufloader_xbm_la_rpath = ++libstatic_pixbufloader_xpm_la_LIBADD = ++am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo ++libstatic_pixbufloader_xpm_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_xpm_la_OBJECTS) ++@INCLUDE_XPM_TRUE@am_libstatic_pixbufloader_xpm_la_rpath = +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) -+am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) -+gtk_query_immodules_2_0_OBJECTS = \ -+ $(am_gtk_query_immodules_2_0_OBJECTS) -+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) -+am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT) -+gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS) -+gtk_update_icon_cache_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -+SCRIPTS = $(bin_SCRIPTS) ++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) ++gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) ++gdk_pixbuf_csource_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) ++gdk_pixbuf_query_loaders_OBJECTS = \ ++ $(am_gdk_pixbuf_query_loaders_OBJECTS) ++test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c ++test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) ++test_gdk_pixbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles @@ -43066,19 +44062,104 @@ Index: gtk+-2.12.12/gtk/Makefile.in +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ -+SOURCES = $(libgtk_directfb_2_0_la_SOURCES) \ -+ $(libgtk_linux_fb_2_0_la_SOURCES) \ -+ $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) \ -+ $(libgtk_x11_2_0_la_SOURCES) \ -+ $(gtk_query_immodules_2_0_SOURCES) \ -+ $(gtk_update_icon_cache_SOURCES) -+DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_linux_fb_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ -+ $(gtk_query_immodules_2_0_SOURCES) \ -+ $(gtk_update_icon_cache_SOURCES) ++SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ ++ $(libpixbufloader_ani_la_SOURCES) \ ++ $(libpixbufloader_bmp_la_SOURCES) \ ++ $(libpixbufloader_gdip_bmp_la_SOURCES) \ ++ $(libpixbufloader_gdip_emf_la_SOURCES) \ ++ $(libpixbufloader_gdip_gif_la_SOURCES) \ ++ $(libpixbufloader_gdip_ico_la_SOURCES) \ ++ $(libpixbufloader_gdip_jpeg_la_SOURCES) \ ++ $(libpixbufloader_gdip_tiff_la_SOURCES) \ ++ $(libpixbufloader_gdip_wmf_la_SOURCES) \ ++ $(libpixbufloader_gif_la_SOURCES) \ ++ $(libpixbufloader_icns_la_SOURCES) \ ++ $(libpixbufloader_ico_la_SOURCES) \ ++ $(libpixbufloader_jasper_la_SOURCES) \ ++ $(libpixbufloader_jpeg_la_SOURCES) \ ++ $(libpixbufloader_pcx_la_SOURCES) \ ++ $(libpixbufloader_png_la_SOURCES) \ ++ $(libpixbufloader_pnm_la_SOURCES) \ ++ $(libpixbufloader_ras_la_SOURCES) \ ++ $(libpixbufloader_tga_la_SOURCES) \ ++ $(libpixbufloader_tiff_la_SOURCES) \ ++ $(libpixbufloader_wbmp_la_SOURCES) \ ++ $(libpixbufloader_xbm_la_SOURCES) \ ++ $(libpixbufloader_xpm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ani_la_SOURCES) \ ++ $(libstatic_pixbufloader_bmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_bmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_emf_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_gif_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_ico_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_jpeg_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_tiff_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_wmf_la_SOURCES) \ ++ $(libstatic_pixbufloader_gif_la_SOURCES) \ ++ $(libstatic_pixbufloader_icns_la_SOURCES) \ ++ $(libstatic_pixbufloader_ico_la_SOURCES) \ ++ $(libstatic_pixbufloader_jasper_la_SOURCES) \ ++ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ ++ $(libstatic_pixbufloader_pcx_la_SOURCES) \ ++ $(libstatic_pixbufloader_png_la_SOURCES) \ ++ $(libstatic_pixbufloader_pnm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ras_la_SOURCES) \ ++ $(libstatic_pixbufloader_tga_la_SOURCES) \ ++ $(libstatic_pixbufloader_tiff_la_SOURCES) \ ++ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_xbm_la_SOURCES) \ ++ $(libstatic_pixbufloader_xpm_la_SOURCES) \ ++ $(gdk_pixbuf_csource_SOURCES) \ ++ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c ++DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ ++ $(libpixbufloader_ani_la_SOURCES) \ ++ $(libpixbufloader_bmp_la_SOURCES) \ ++ $(am__libpixbufloader_gdip_bmp_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_emf_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_gif_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_ico_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_tiff_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_wmf_la_SOURCES_DIST) \ ++ $(libpixbufloader_gif_la_SOURCES) \ ++ $(libpixbufloader_icns_la_SOURCES) \ ++ $(libpixbufloader_ico_la_SOURCES) \ ++ $(libpixbufloader_jasper_la_SOURCES) \ ++ $(libpixbufloader_jpeg_la_SOURCES) \ ++ $(libpixbufloader_pcx_la_SOURCES) \ ++ $(libpixbufloader_png_la_SOURCES) \ ++ $(libpixbufloader_pnm_la_SOURCES) \ ++ $(libpixbufloader_ras_la_SOURCES) \ ++ $(libpixbufloader_tga_la_SOURCES) \ ++ $(libpixbufloader_tiff_la_SOURCES) \ ++ $(libpixbufloader_wbmp_la_SOURCES) \ ++ $(libpixbufloader_xbm_la_SOURCES) \ ++ $(libpixbufloader_xpm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ani_la_SOURCES) \ ++ $(libstatic_pixbufloader_bmp_la_SOURCES) \ ++ $(am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST) \ ++ $(libstatic_pixbufloader_gif_la_SOURCES) \ ++ $(libstatic_pixbufloader_icns_la_SOURCES) \ ++ $(libstatic_pixbufloader_ico_la_SOURCES) \ ++ $(libstatic_pixbufloader_jasper_la_SOURCES) \ ++ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ ++ $(libstatic_pixbufloader_pcx_la_SOURCES) \ ++ $(libstatic_pixbufloader_png_la_SOURCES) \ ++ $(libstatic_pixbufloader_pnm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ras_la_SOURCES) \ ++ $(libstatic_pixbufloader_tga_la_SOURCES) \ ++ $(libstatic_pixbufloader_tiff_la_SOURCES) \ ++ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_xbm_la_SOURCES) \ ++ $(libstatic_pixbufloader_xpm_la_SOURCES) \ ++ $(gdk_pixbuf_csource_SOURCES) \ ++ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ @@ -43087,15 +44168,13 @@ Index: gtk+-2.12.12/gtk/Makefile.in + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +DATA = $(noinst_DATA) -+gtkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+am__gtkunixprintinclude_HEADERS_DIST = gtkpagesetupunixdialog.h \ -+ gtkprintunixdialog.h gtkprinter.h gtkprintjob.h -+gtkunixprintincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) ++libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ @@ -43143,6 +44222,9 @@ Index: gtk+-2.12.12/gtk/Makefile.in +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ ++GAIL_INET_LIBS = @GAIL_INET_LIBS@ ++GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ ++GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ +GDK_DEP_LIBS = @GDK_DEP_LIBS@ +GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ @@ -43194,6 +44276,8 @@ Index: gtk+-2.12.12/gtk/Makefile.in +GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +HTML_DIR = @HTML_DIR@ ++INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ ++INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ +INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ +INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +INDENT = @INDENT@ @@ -43205,6 +44289,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +LDFLAGS = @LDFLAGS@ ++LIBJASPER = @LIBJASPER@ +LIBJPEG = @LIBJPEG@ +LIBOBJS = @LIBOBJS@ +LIBPNG = @LIBPNG@ @@ -43212,6 +44297,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in +LIBTIFF = @LIBTIFF@ +LIBTOOL = @LIBTOOL@ +LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ ++LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -43314,10 +44400,5262 @@ Index: gtk+-2.12.12/gtk/Makefile.in +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ -+SUBDIRS = theme-bits $(am__append_1) -+@OS_UNIX_TRUE@@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" -+@OS_UNIX_TRUE@@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "/Applications/Preview.app/Contents/MacOS/Preview %f" -+DIST_SUBDIRS = theme-bits xdgmime ++GTESTER = gtester # in $PATH for non-GLIB packages ++GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la ++# initialize variables for unconditional += appending ++EXTRA_DIST = gdk-pixbuf-csource.1 makefile.msc gdk-pixbuf.symbols \ ++ makegdkpixbufalias.pl abicheck.sh pltcheck.sh gdk_pixbuf.def \ ++ gdk_pixbuf.rc gdk-pixbuf-marshal.c gdk-pixbuf-marshal.list \ ++ gdk-pixbuf-enum-types.c.template \ ++ gdk-pixbuf-enum-types.h.template gen-color-table.pl ++TEST_PROGS = + +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la ++### testing rules + +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la ++# Xvfb based test rules ++XVFB = Xvfb -ac -noreset -screen 0 800x600x16 ++XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ ++ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ ++ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ ++ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ ++ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ ++ 9995 9996 9997 9998 9999 + ++SKIP_GDKTARGET = \ ++ test "$(gdktarget)" != "x11" \ ++ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." + +-# End of loaders not built if building GDI+ loader +-@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la +-@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la ++XVFB_START = \ ++ ${XVFB} -help 2>/dev/null 1>&2 \ ++ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ ++ && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ ++ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ ++ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ ++ && DISPLAY=:$$XID && export DISPLAY + +-@INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la +-@INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la ++SUBDIRS = pixops ++@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined ++@OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def ++@OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def ++@OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o ++@OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o ++@OS_WIN32_TRUE@libole32 = -lole32 ++@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib ++@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh ++lib_LTLIBRARIES = \ ++ libgdk_pixbuf-2.0.la + +-@INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la +-@INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la ++loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders ++loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d ++module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) + +-@INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la +-@INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la ++# ++# The PNG loader ++# ++libstatic_pixbufloader_png_la_SOURCES = io-png.c ++libpixbufloader_png_la_SOURCES = io-png.c ++libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs) + +-@INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la +-@INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la ++# ++# The BMP loader ++# ++libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c ++libpixbufloader_bmp_la_SOURCES = io-bmp.c ++libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_bmp_la_LIBADD = $(module_libs) + +-@INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la +-@INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la ++# ++# The WBMP loader ++# ++libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c ++libpixbufloader_wbmp_la_SOURCES = io-wbmp.c ++libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_wbmp_la_LIBADD = $(module_libs) + +-@INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la +-@INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la ++# ++# The GIF loader ++# ++libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h ++libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h ++libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_gif_la_LIBADD = $(module_libs) + +-@INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la +-@INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la ++# ++# The ICO loader ++# ++libstatic_pixbufloader_ico_la_SOURCES = io-ico.c ++libpixbufloader_ico_la_SOURCES = io-ico.c ++libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_ico_la_LIBADD = $(module_libs) + +-@INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la +-@INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la ++# ++# The ANI loader ++# ++libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h ++libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h ++libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_ani_la_LIBADD = $(module_libs) + +-@INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la +-@INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la ++# ++# The JPEG loader ++# ++libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c ++libpixbufloader_jpeg_la_SOURCES = io-jpeg.c ++libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs) + +-@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la +-@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@JASPER_LIB = libpixbufloader-jasper.la ++# ++# The PNM loader ++# ++libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c ++libpixbufloader_pnm_la_SOURCES = io-pnm.c ++libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_pnm_la_LIBADD = $(module_libs) + +-@BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(WBMP_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(GIF_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(ICO_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(ANI_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(JPEG_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(PNM_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(RAS_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(TIFF_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(XPM_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(XBM_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(ICNS_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS) ++# ++# The RAS loader ++# ++libstatic_pixbufloader_ras_la_SOURCES = io-ras.c ++libpixbufloader_ras_la_SOURCES = io-ras.c ++libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_ras_la_LIBADD = $(module_libs) + ++# ++# The TIFF loader ++# ++libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c ++libpixbufloader_tiff_la_SOURCES = io-tiff.c ++libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) + +-noinst_LTLIBRARIES = \ +- $(STATIC_PNG_LIB) \ +- $(STATIC_BMP_LIB) \ +- $(STATIC_WBMP_LIB) \ +- $(STATIC_GIF_LIB) \ +- $(STATIC_ICO_LIB) \ +- $(STATIC_ANI_LIB) \ +- $(STATIC_JPEG_LIB) \ +- $(STATIC_PNM_LIB) \ +- $(STATIC_RAS_LIB) \ +- $(STATIC_TIFF_LIB) \ +- $(STATIC_XPM_LIB) \ +- $(STATIC_XBM_LIB) \ +- $(STATIC_TGA_LIB) \ +- $(STATIC_ICNS_LIB) \ +- $(STATIC_PCX_LIB) \ +- $(STATIC_JASPER_LIB) \ +- $(STATIC_GDIPLUS_LIBS) ++# ++# The XPM loader ++# ++libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c ++libpixbufloader_xpm_la_SOURCES = io-xpm.c ++libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_xpm_la_LIBADD = $(module_libs) + ++# ++# The XBM loader ++# ++libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c ++libpixbufloader_xbm_la_SOURCES = io-xbm.c ++libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_xbm_la_LIBADD = $(module_libs) + +-builtin_objs = @INCLUDED_LOADER_OBJ@ ++# ++# The TGA loader ++# ++libstatic_pixbufloader_tga_la_SOURCES = io-tga.c ++libpixbufloader_tga_la_SOURCES = io-tga.c ++libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_tga_la_LIBADD = $(module_libs) + +-DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la +-INCLUDES = \ +- -DG_LOG_DOMAIN=\"GdkPixbuf\" \ +- -DGDK_PIXBUF_COMPILATION \ +- -I$(top_srcdir) -I$(top_builddir) \ +- -I$(top_srcdir)/gdk-pixbuf \ +- -I$(top_builddir)/gdk-pixbuf \ +- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ +- -DGTK_VERSION=\"$(GTK_VERSION)\" \ +- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ +- -DGTK_PREFIX=\"$(prefix)\" \ +- $(INCLUDED_LOADER_DEFINE) \ +- $(GTK_DEBUG_FLAGS) \ +- $(GDK_PIXBUF_DEP_CFLAGS) \ +- -DGDK_PIXBUF_ENABLE_BACKEND ++# ++# The .icns loader ++# ++libstatic_pixbufloader_icns_la_SOURCES = io-icns.c ++libpixbufloader_icns_la_SOURCES = io-icns.c ++libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_icns_la_LIBADD = $(module_libs) + ++# ++# The PCX loader ++# ++libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c ++libpixbufloader_pcx_la_SOURCES = io-pcx.c ++libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_pcx_la_LIBADD = $(module_libs) + +-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" +-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) ++# ++# The JPEG2000 loader ++# ++libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c ++libpixbufloader_jasper_la_SOURCES = io-jasper.c ++libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs) + +-noinst_PROGRAMS = test-gdk-pixbuf +-test_gdk_pixbuf_LDADD = $(LDADDS) ++# When building the GDI+ loader statically, we put the "common" objects ++# only in one of the archives to avoid duplicate definitions ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@STATIC_GDIPLUS_LIBS = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la + +-bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders +-gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c +-gdk_pixbuf_csource_LDADD = $(LDADDS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_ico_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c + +-gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) +-gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_wmf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c + +-gdk_pixbuf_query_loaders_SOURCES = queryloaders.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_emf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c + +-# +-# The GdkPixBuf library +-# +-libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf +-libgdk_pixbuf_2_0_la_SOURCES = \ +- gdk-pixbuf-i18n.h \ +- gdk-pixbuf.c \ +- gdk-pixbuf-animation.c \ +- gdk-pixbuf-data.c \ +- gdk-pixbuf-io.c \ +- gdk-pixbuf-loader.c \ +- gdk-pixbuf-scale.c \ +- gdk-pixbuf-simple-anim.c \ +- gdk-pixbuf-scaled-anim.c \ +- gdk-pixbuf-util.c \ +- gdk-pixdata.c \ +- gdk-pixbuf-enum-types.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_bmp_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_gif_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c + +-libgdk_pixbuf_2_0_la_LDFLAGS = \ +- $(gdk_pixbuf_win32_res_ldflag) \ +- -version-info $(LT_VERSION_INFO) \ +- $(LIBTOOL_EXPORT_OPTIONS) \ +- $(no_undefined) \ +- $(gdk_pixbuf_symbols) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_png_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c + +-libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) +-libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_tiff_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c + +-gdk_pixbuf_headers = \ +- gdk-pixbuf.h \ +- gdk-pixbuf-core.h \ +- gdk-pixbuf-transform.h \ +- gdk-pixbuf-io.h \ +- gdk-pixbuf-animation.h \ +- gdk-pixbuf-simple-anim.h \ +- gdk-pixbuf-loader.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@GDIPLUS_LIBS = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c + +-libgdk_pixbufinclude_HEADERS = \ +- $(gdk_pixbuf_headers) \ +- gdk-pixbuf-enum-types.h \ +- gdk-pixbuf-marshal.h \ +- gdk-pixbuf-features.h \ +- gdk-pixdata.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c + +-noinst_HEADERS = \ +- gdk-pixbuf-alias.h \ +- gdk-pixbuf-private.h \ +- gdk-pixbuf-scaled-anim.h \ +- xpm-color-table.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c + +-BUILT_SOURCES = \ +- gdk-pixbuf-alias.h \ +- gdk-pixbuf-aliasdef.c \ +- gdk-pixbuf-enum-types.h \ +- gdk-pixbuf-enum-types.c \ +- gdk-pixbuf-marshal.h \ +- gdk-pixbuf-marshal.c \ +- gdk-pixbuf-features.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c + +-CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc +-MAINTAINERCLEANFILES = \ +- gdk-pixbuf-aliasdef.c \ +- gdk-pixbuf-enum-types.h \ +- gdk-pixbuf-enum-types.c \ +- gdk-pixbuf-marshal.h \ +- gdk-pixbuf-marshal.c \ +- gdk-pixbuf.loaders\ +-s-enum-types-h stamp-gdk-pixbuf-marshal.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c + +-@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false +-@CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" +-subdir = gdk-pixbuf +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h +-LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ +- $(noinst_LTLIBRARIES) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) + +-am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo gdk-pixbuf-animation.lo \ +- gdk-pixbuf-data.lo gdk-pixbuf-io.lo gdk-pixbuf-loader.lo \ +- gdk-pixbuf-scale.lo gdk-pixbuf-simple-anim.lo \ +- gdk-pixbuf-scaled-anim.lo gdk-pixbuf-util.lo gdk-pixdata.lo \ +- gdk-pixbuf-enum-types.lo +-libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) +-libpixbufloader_ani_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo +-libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) +-libpixbufloader_bmp_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo +-libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-am__libpixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-bmp.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.lo +-libpixbufloader_gdip_bmp_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_bmp_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-am__libpixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-emf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.lo +-libpixbufloader_gdip_emf_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_emf_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-am__libpixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-gif.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.lo +-libpixbufloader_gdip_gif_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_gif_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-am__libpixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.lo +-libpixbufloader_gdip_ico_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_ico_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-jpeg.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.lo +-libpixbufloader_gdip_jpeg_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_jpeg_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-am__libpixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-tiff.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.lo +-libpixbufloader_gdip_tiff_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_tiff_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-am__libpixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-wmf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.lo +-libpixbufloader_gdip_wmf_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_wmf_la_OBJECTS) +-libpixbufloader_gif_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo +-libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) +-libpixbufloader_icns_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_icns_la_OBJECTS = io-icns.lo +-libpixbufloader_icns_la_OBJECTS = $(am_libpixbufloader_icns_la_OBJECTS) +-libpixbufloader_ico_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_ico_la_OBJECTS = io-ico.lo +-libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) +-libpixbufloader_jasper_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo +-libpixbufloader_jasper_la_OBJECTS = \ +- $(am_libpixbufloader_jasper_la_OBJECTS) +-libpixbufloader_jpeg_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo +-libpixbufloader_jpeg_la_OBJECTS = $(am_libpixbufloader_jpeg_la_OBJECTS) +-libpixbufloader_pcx_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo +-libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) +-libpixbufloader_png_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_png_la_OBJECTS = io-png.lo +-libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) +-libpixbufloader_pnm_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo +-libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) +-libpixbufloader_ras_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_ras_la_OBJECTS = io-ras.lo +-libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) +-libpixbufloader_tga_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_tga_la_OBJECTS = io-tga.lo +-libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) +-libpixbufloader_tiff_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo +-libpixbufloader_tiff_la_OBJECTS = $(am_libpixbufloader_tiff_la_OBJECTS) +-libpixbufloader_wbmp_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo +-libpixbufloader_wbmp_la_OBJECTS = $(am_libpixbufloader_wbmp_la_OBJECTS) +-libpixbufloader_xbm_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo +-libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) +-libpixbufloader_xpm_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo +-libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) +-libstatic_pixbufloader_ani_la_LDFLAGS = +-libstatic_pixbufloader_ani_la_LIBADD = +-am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo +-libstatic_pixbufloader_ani_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_ani_la_OBJECTS) +-libstatic_pixbufloader_bmp_la_LDFLAGS = +-libstatic_pixbufloader_bmp_la_LIBADD = +-am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo +-libstatic_pixbufloader_bmp_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_bmp_la_OBJECTS) +-libstatic_pixbufloader_gdip_bmp_la_LDFLAGS = +-libstatic_pixbufloader_gdip_bmp_la_LIBADD = +-am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-bmp.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.lo +-libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS) +-libstatic_pixbufloader_gdip_emf_la_LDFLAGS = +-libstatic_pixbufloader_gdip_emf_la_LIBADD = +-am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-emf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.lo +-libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_emf_la_OBJECTS) +-libstatic_pixbufloader_gdip_gif_la_LDFLAGS = +-libstatic_pixbufloader_gdip_gif_la_LIBADD = +-am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-gif.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.lo +-libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_gif_la_OBJECTS) +-libstatic_pixbufloader_gdip_ico_la_LDFLAGS = +-libstatic_pixbufloader_gdip_ico_la_LIBADD = +-am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.lo +-libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_ico_la_OBJECTS) +-libstatic_pixbufloader_gdip_jpeg_la_LDFLAGS = +-libstatic_pixbufloader_gdip_jpeg_la_LIBADD = +-am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-jpeg.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.lo +-libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) +-libstatic_pixbufloader_gdip_tiff_la_LDFLAGS = +-libstatic_pixbufloader_gdip_tiff_la_LIBADD = +-am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-tiff.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.lo +-libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS) +-libstatic_pixbufloader_gdip_wmf_la_LDFLAGS = +-libstatic_pixbufloader_gdip_wmf_la_LIBADD = +-am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-wmf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.lo +-libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS) +-libstatic_pixbufloader_gif_la_LDFLAGS = +-libstatic_pixbufloader_gif_la_LIBADD = +-am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo +-libstatic_pixbufloader_gif_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gif_la_OBJECTS) +-libstatic_pixbufloader_icns_la_LDFLAGS = +-libstatic_pixbufloader_icns_la_LIBADD = +-am_libstatic_pixbufloader_icns_la_OBJECTS = io-icns.lo +-libstatic_pixbufloader_icns_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_icns_la_OBJECTS) +-libstatic_pixbufloader_ico_la_LDFLAGS = +-libstatic_pixbufloader_ico_la_LIBADD = +-am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo +-libstatic_pixbufloader_ico_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_ico_la_OBJECTS) +-libstatic_pixbufloader_jasper_la_LDFLAGS = +-libstatic_pixbufloader_jasper_la_LIBADD = +-am_libstatic_pixbufloader_jasper_la_OBJECTS = io-jasper.lo +-libstatic_pixbufloader_jasper_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_jasper_la_OBJECTS) +-libstatic_pixbufloader_jpeg_la_LDFLAGS = +-libstatic_pixbufloader_jpeg_la_LIBADD = +-am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo +-libstatic_pixbufloader_jpeg_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) +-libstatic_pixbufloader_pcx_la_LDFLAGS = +-libstatic_pixbufloader_pcx_la_LIBADD = +-am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo +-libstatic_pixbufloader_pcx_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_pcx_la_OBJECTS) +-libstatic_pixbufloader_png_la_LDFLAGS = +-libstatic_pixbufloader_png_la_LIBADD = +-am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo +-libstatic_pixbufloader_png_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_png_la_OBJECTS) +-libstatic_pixbufloader_pnm_la_LDFLAGS = +-libstatic_pixbufloader_pnm_la_LIBADD = +-am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo +-libstatic_pixbufloader_pnm_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_pnm_la_OBJECTS) +-libstatic_pixbufloader_ras_la_LDFLAGS = +-libstatic_pixbufloader_ras_la_LIBADD = +-am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo +-libstatic_pixbufloader_ras_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_ras_la_OBJECTS) +-libstatic_pixbufloader_tga_la_LDFLAGS = +-libstatic_pixbufloader_tga_la_LIBADD = +-am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo +-libstatic_pixbufloader_tga_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_tga_la_OBJECTS) +-libstatic_pixbufloader_tiff_la_LDFLAGS = +-libstatic_pixbufloader_tiff_la_LIBADD = +-am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo +-libstatic_pixbufloader_tiff_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_tiff_la_OBJECTS) +-libstatic_pixbufloader_wbmp_la_LDFLAGS = +-libstatic_pixbufloader_wbmp_la_LIBADD = +-am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo +-libstatic_pixbufloader_wbmp_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) +-libstatic_pixbufloader_xbm_la_LDFLAGS = +-libstatic_pixbufloader_xbm_la_LIBADD = +-am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo +-libstatic_pixbufloader_xbm_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_xbm_la_OBJECTS) +-libstatic_pixbufloader_xpm_la_LDFLAGS = +-libstatic_pixbufloader_xpm_la_LIBADD = +-am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo +-libstatic_pixbufloader_xpm_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_xpm_la_OBJECTS) +-bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ +- gdk-pixbuf-query-loaders$(EXEEXT) +-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) +-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++# Loaders that aren't built if we build the GDI+ loader ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la + +-am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) +-gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) +-gdk_pixbuf_csource_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la +-gdk_pixbuf_csource_LDFLAGS = +-am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) +-gdk_pixbuf_query_loaders_OBJECTS = \ +- $(am_gdk_pixbuf_query_loaders_OBJECTS) +-gdk_pixbuf_query_loaders_LDFLAGS = +-test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c +-test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) +-test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la +-test_gdk_pixbuf_LDFLAGS = ++# End of loaders not built if building GDI+ loader ++@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la ++@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la ++@INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la ++@INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la ++@INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la ++@INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la ++@INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la ++@INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la ++@INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la ++@INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la ++@INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la ++@INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la ++@INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la ++@INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la ++@INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la ++@INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la ++@INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la ++@INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la ++@INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la ++@INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la ++@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la ++@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@JASPER_LIB = libpixbufloader-jasper.la ++@BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(WBMP_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(GIF_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(ICO_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(ANI_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(JPEG_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(PNM_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(RAS_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(TIFF_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(XPM_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(XBM_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(ICNS_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS) + +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk-pixbuf-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-csource.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-data.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-enum-types.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-io.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-loader.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scaled-anim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-simple-anim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-util.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixdata.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ani-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ani.Plo ./$(DEPDIR)/io-bmp.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-bmp.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-emf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-gif.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-ico.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-jpeg.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-tiff.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-utils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-wmf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gif-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gif.Plo ./$(DEPDIR)/io-icns.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ico.Plo ./$(DEPDIR)/io-jasper.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-jpeg.Plo ./$(DEPDIR)/io-pcx.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-png.Plo ./$(DEPDIR)/io-pnm.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ras.Plo ./$(DEPDIR)/io-tga.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-tiff.Plo ./$(DEPDIR)/io-wbmp.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-xbm.Plo ./$(DEPDIR)/io-xpm.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/queryloaders.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/test-gdk-pixbuf.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ +- $(libpixbufloader_ani_la_SOURCES) \ +- $(libpixbufloader_bmp_la_SOURCES) \ +- $(am__libpixbufloader_gdip_bmp_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_emf_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_gif_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_ico_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_tiff_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_wmf_la_SOURCES_DIST) \ +- $(libpixbufloader_gif_la_SOURCES) \ +- $(libpixbufloader_icns_la_SOURCES) \ +- $(libpixbufloader_ico_la_SOURCES) \ +- $(libpixbufloader_jasper_la_SOURCES) \ +- $(libpixbufloader_jpeg_la_SOURCES) \ +- $(libpixbufloader_pcx_la_SOURCES) \ +- $(libpixbufloader_png_la_SOURCES) \ +- $(libpixbufloader_pnm_la_SOURCES) \ +- $(libpixbufloader_ras_la_SOURCES) \ +- $(libpixbufloader_tga_la_SOURCES) \ +- $(libpixbufloader_tiff_la_SOURCES) \ +- $(libpixbufloader_wbmp_la_SOURCES) \ +- $(libpixbufloader_xbm_la_SOURCES) \ +- $(libpixbufloader_xpm_la_SOURCES) \ +- $(libstatic_pixbufloader_ani_la_SOURCES) \ +- $(libstatic_pixbufloader_bmp_la_SOURCES) \ +- $(am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST) \ +- $(libstatic_pixbufloader_gif_la_SOURCES) \ +- $(libstatic_pixbufloader_icns_la_SOURCES) \ +- $(libstatic_pixbufloader_ico_la_SOURCES) \ +- $(libstatic_pixbufloader_jasper_la_SOURCES) \ +- $(libstatic_pixbufloader_jpeg_la_SOURCES) \ +- $(libstatic_pixbufloader_pcx_la_SOURCES) \ +- $(libstatic_pixbufloader_png_la_SOURCES) \ +- $(libstatic_pixbufloader_pnm_la_SOURCES) \ +- $(libstatic_pixbufloader_ras_la_SOURCES) \ +- $(libstatic_pixbufloader_tga_la_SOURCES) \ +- $(libstatic_pixbufloader_tiff_la_SOURCES) \ +- $(libstatic_pixbufloader_wbmp_la_SOURCES) \ +- $(libstatic_pixbufloader_xbm_la_SOURCES) \ +- $(libstatic_pixbufloader_xpm_la_SOURCES) \ +- $(gdk_pixbuf_csource_SOURCES) \ +- $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c +-DATA = $(noinst_DATA) ++noinst_LTLIBRARIES = \ ++ $(STATIC_PNG_LIB) \ ++ $(STATIC_BMP_LIB) \ ++ $(STATIC_WBMP_LIB) \ ++ $(STATIC_GIF_LIB) \ ++ $(STATIC_ICO_LIB) \ ++ $(STATIC_ANI_LIB) \ ++ $(STATIC_JPEG_LIB) \ ++ $(STATIC_PNM_LIB) \ ++ $(STATIC_RAS_LIB) \ ++ $(STATIC_TIFF_LIB) \ ++ $(STATIC_XPM_LIB) \ ++ $(STATIC_XBM_LIB) \ ++ $(STATIC_TGA_LIB) \ ++ $(STATIC_ICNS_LIB) \ ++ $(STATIC_PCX_LIB) \ ++ $(STATIC_JASPER_LIB) \ ++ $(STATIC_GDIPLUS_LIBS) + +-HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) ++builtin_objs = @INCLUDED_LOADER_OBJ@ ++DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la ++INCLUDES = \ ++ -DG_LOG_DOMAIN=\"GdkPixbuf\" \ ++ -DGDK_PIXBUF_COMPILATION \ ++ -I$(top_srcdir) -I$(top_builddir) \ ++ -I$(top_srcdir)/gdk-pixbuf \ ++ -I$(top_builddir)/gdk-pixbuf \ ++ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ ++ -DGTK_VERSION=\"$(GTK_VERSION)\" \ ++ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ ++ -DGTK_PREFIX=\"$(prefix)\" \ ++ $(INCLUDED_LOADER_DEFINE) \ ++ $(GTK_DEBUG_FLAGS) \ ++ $(GDK_PIXBUF_DEP_CFLAGS) \ ++ -DGDK_PIXBUF_ENABLE_BACKEND + ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" ++LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) ++test_gdk_pixbuf_LDADD = $(LDADDS) ++gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c ++gdk_pixbuf_csource_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_SOURCES = queryloaders.c + +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ +- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog \ +- Makefile.am gdk-pixbuf-features.h.in gdk_pixbuf.rc.in +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) $(libpixbufloader_ani_la_SOURCES) $(libpixbufloader_bmp_la_SOURCES) $(libpixbufloader_gdip_bmp_la_SOURCES) $(libpixbufloader_gdip_emf_la_SOURCES) $(libpixbufloader_gdip_gif_la_SOURCES) $(libpixbufloader_gdip_ico_la_SOURCES) $(libpixbufloader_gdip_jpeg_la_SOURCES) $(libpixbufloader_gdip_tiff_la_SOURCES) $(libpixbufloader_gdip_wmf_la_SOURCES) $(libpixbufloader_gif_la_SOURCES) $(libpixbufloader_icns_la_SOURCES) $(libpixbufloader_ico_la_SOURCES) $(libpixbufloader_jasper_la_SOURCES) $(libpixbufloader_jpeg_la_SOURCES) $(libpixbufloader_pcx_la_SOURCES) $(libpixbufloader_png_la_SOURCES) $(libpixbufloader_pnm_la_SOURCES) $(libpixbufloader_ras_la_SOURCES) $(libpixbufloader_tga_la_SOURCES) $(libpixbufloader_tiff_la_SOURCES) $(libpixbufloader_wbmp_la_SOURCES) $(libpixbufloader_xbm_la_SOURCES) $(libpixbufloader_xpm_la_SOURCES) $(libstatic_pixbufloader_ani_la_SOURCES) $(libstatic_pixbufloader_bmp_la_SOURCES) $(libstatic_pixbufloader_gdip_bmp_la_SOURCES) $(libstatic_pixbufloader_gdip_emf_la_SOURCES) $(libstatic_pixbufloader_gdip_gif_la_SOURCES) $(libstatic_pixbufloader_gdip_ico_la_SOURCES) $(libstatic_pixbufloader_gdip_jpeg_la_SOURCES) $(libstatic_pixbufloader_gdip_tiff_la_SOURCES) $(libstatic_pixbufloader_gdip_wmf_la_SOURCES) $(libstatic_pixbufloader_gif_la_SOURCES) $(libstatic_pixbufloader_icns_la_SOURCES) $(libstatic_pixbufloader_ico_la_SOURCES) $(libstatic_pixbufloader_jasper_la_SOURCES) $(libstatic_pixbufloader_jpeg_la_SOURCES) $(libstatic_pixbufloader_pcx_la_SOURCES) $(libstatic_pixbufloader_png_la_SOURCES) $(libstatic_pixbufloader_pnm_la_SOURCES) $(libstatic_pixbufloader_ras_la_SOURCES) $(libstatic_pixbufloader_tga_la_SOURCES) $(libstatic_pixbufloader_tiff_la_SOURCES) $(libstatic_pixbufloader_wbmp_la_SOURCES) $(libstatic_pixbufloader_xbm_la_SOURCES) $(libstatic_pixbufloader_xpm_la_SOURCES) $(gdk_pixbuf_csource_SOURCES) $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c ++# ++# The GdkPixBuf library ++# ++libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf ++libgdk_pixbuf_2_0_la_SOURCES = \ ++ gdk-pixbuf-i18n.h \ ++ gdk-pixbuf.c \ ++ gdk-pixbuf-animation.c \ ++ gdk-pixbuf-data.c \ ++ gdk-pixbuf-io.c \ ++ gdk-pixbuf-loader.c \ ++ gdk-pixbuf-scale.c \ ++ gdk-pixbuf-simple-anim.c \ ++ gdk-pixbuf-scaled-anim.c \ ++ gdk-pixbuf-util.c \ ++ gdk-pixdata.c \ ++ gdk-pixbuf-enum-types.c ++ ++libgdk_pixbuf_2_0_la_LDFLAGS = \ ++ $(gdk_pixbuf_win32_res_ldflag) \ ++ -version-info $(LT_VERSION_INFO) \ ++ $(LIBTOOL_EXPORT_OPTIONS) \ ++ $(no_undefined) \ ++ $(gdk_pixbuf_symbols) ++ ++libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) ++libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) ++gdk_pixbuf_headers = \ ++ gdk-pixbuf.h \ ++ gdk-pixbuf-core.h \ ++ gdk-pixbuf-transform.h \ ++ gdk-pixbuf-io.h \ ++ gdk-pixbuf-animation.h \ ++ gdk-pixbuf-simple-anim.h \ ++ gdk-pixbuf-loader.h ++ ++libgdk_pixbufinclude_HEADERS = \ ++ $(gdk_pixbuf_headers) \ ++ gdk-pixbuf-enum-types.h \ ++ gdk-pixbuf-marshal.h \ ++ gdk-pixbuf-features.h \ ++ gdk-pixdata.h ++ ++noinst_HEADERS = \ ++ gdk-pixbuf-alias.h \ ++ gdk-pixbuf-private.h \ ++ gdk-pixbuf-scaled-anim.h \ ++ xpm-color-table.h ++ ++BUILT_SOURCES = \ ++ gdk-pixbuf-alias.h \ ++ gdk-pixbuf-aliasdef.c \ ++ gdk-pixbuf-enum-types.h \ ++ gdk-pixbuf-enum-types.c \ ++ gdk-pixbuf-marshal.h \ ++ gdk-pixbuf-marshal.c \ ++ gdk-pixbuf-features.h + ++CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc ++MAINTAINERCLEANFILES = gdk-pixbuf-aliasdef.c gdk-pixbuf-enum-types.h \ ++ gdk-pixbuf-enum-types.c gdk-pixbuf-marshal.h \ ++ gdk-pixbuf-marshal.c gdk-pixbuf.loaders s-enum-types-h \ ++ stamp-gdk-pixbuf-marshal.h ++@CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" ++@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk-pixbuf/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-gdk_pixbuf.rc: $(top_builddir)/config.status gdk_pixbuf.rc.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++gdk_pixbuf.rc: $(top_builddir)/config.status $(srcdir)/gdk_pixbuf.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-gdk-pixbuf-features.h: $(top_builddir)/config.status gdk-pixbuf-features.h.in ++gdk-pixbuf-features.h: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-features.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-libLTLIBRARIES_INSTALL = $(INSTALL) + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-loaderLTLIBRARIES_INSTALL = $(INSTALL) + install-loaderLTLIBRARIES: $(loader_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(loaderdir) ++ test -z "$(loaderdir)" || $(MKDIR_P) "$(DESTDIR)$(loaderdir)" + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(loaderdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(loaderdir)/$$f"; \ + else :; fi; \ + done + + uninstall-loaderLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(loaderdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(loaderdir)/$$p"; \ + done + + clean-loaderLTLIBRARIES: + -test -z "$(loader_LTLIBRARIES)" || rm -f $(loader_LTLIBRARIES) + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -1479,116 +1404,115 @@ clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk_pixbuf-2.0.la: $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_LDFLAGS) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_pixbuf_2_0_la_LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) + libpixbufloader-ani.la: $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ani_la_LDFLAGS) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) ++ $(libpixbufloader_ani_la_LINK) $(am_libpixbufloader_ani_la_rpath) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) + libpixbufloader-bmp.la: $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_bmp_la_LDFLAGS) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) ++ $(libpixbufloader_bmp_la_LINK) $(am_libpixbufloader_bmp_la_rpath) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) + libpixbufloader-gdip-bmp.la: $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_bmp_la_LDFLAGS) $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_bmp_la_LINK) $(am_libpixbufloader_gdip_bmp_la_rpath) $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_LIBADD) $(LIBS) + libpixbufloader-gdip-emf.la: $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_emf_la_LDFLAGS) $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_emf_la_LINK) $(am_libpixbufloader_gdip_emf_la_rpath) $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_LIBADD) $(LIBS) + libpixbufloader-gdip-gif.la: $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_gif_la_LDFLAGS) $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_gif_la_LINK) $(am_libpixbufloader_gdip_gif_la_rpath) $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_LIBADD) $(LIBS) + libpixbufloader-gdip-ico.la: $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_ico_la_LDFLAGS) $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_ico_la_LINK) $(am_libpixbufloader_gdip_ico_la_rpath) $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_LIBADD) $(LIBS) + libpixbufloader-gdip-jpeg.la: $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_jpeg_la_LDFLAGS) $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_jpeg_la_LINK) $(am_libpixbufloader_gdip_jpeg_la_rpath) $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) + libpixbufloader-gdip-tiff.la: $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_tiff_la_LDFLAGS) $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_tiff_la_LINK) $(am_libpixbufloader_gdip_tiff_la_rpath) $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_LIBADD) $(LIBS) + libpixbufloader-gdip-wmf.la: $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_wmf_la_LDFLAGS) $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_wmf_la_LINK) $(am_libpixbufloader_gdip_wmf_la_rpath) $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_LIBADD) $(LIBS) + libpixbufloader-gif.la: $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gif_la_LDFLAGS) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gif_la_LINK) $(am_libpixbufloader_gif_la_rpath) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) + libpixbufloader-icns.la: $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_icns_la_LDFLAGS) $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_LIBADD) $(LIBS) ++ $(libpixbufloader_icns_la_LINK) $(am_libpixbufloader_icns_la_rpath) $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_LIBADD) $(LIBS) + libpixbufloader-ico.la: $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ico_la_LDFLAGS) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) ++ $(libpixbufloader_ico_la_LINK) $(am_libpixbufloader_ico_la_rpath) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) + libpixbufloader-jasper.la: $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jasper_la_LDFLAGS) $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_LIBADD) $(LIBS) ++ $(libpixbufloader_jasper_la_LINK) $(am_libpixbufloader_jasper_la_rpath) $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_LIBADD) $(LIBS) + libpixbufloader-jpeg.la: $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jpeg_la_LDFLAGS) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) ++ $(libpixbufloader_jpeg_la_LINK) $(am_libpixbufloader_jpeg_la_rpath) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) + libpixbufloader-pcx.la: $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pcx_la_LDFLAGS) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) ++ $(libpixbufloader_pcx_la_LINK) $(am_libpixbufloader_pcx_la_rpath) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) + libpixbufloader-png.la: $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_png_la_LDFLAGS) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) ++ $(libpixbufloader_png_la_LINK) $(am_libpixbufloader_png_la_rpath) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) + libpixbufloader-pnm.la: $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pnm_la_LDFLAGS) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) ++ $(libpixbufloader_pnm_la_LINK) $(am_libpixbufloader_pnm_la_rpath) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) + libpixbufloader-ras.la: $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ras_la_LDFLAGS) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) ++ $(libpixbufloader_ras_la_LINK) $(am_libpixbufloader_ras_la_rpath) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) + libpixbufloader-tga.la: $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tga_la_LDFLAGS) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) ++ $(libpixbufloader_tga_la_LINK) $(am_libpixbufloader_tga_la_rpath) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) + libpixbufloader-tiff.la: $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tiff_la_LDFLAGS) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) ++ $(libpixbufloader_tiff_la_LINK) $(am_libpixbufloader_tiff_la_rpath) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) + libpixbufloader-wbmp.la: $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_wbmp_la_LDFLAGS) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) ++ $(libpixbufloader_wbmp_la_LINK) $(am_libpixbufloader_wbmp_la_rpath) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) + libpixbufloader-xbm.la: $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xbm_la_LDFLAGS) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) ++ $(libpixbufloader_xbm_la_LINK) $(am_libpixbufloader_xbm_la_rpath) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) + libpixbufloader-xpm.la: $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xpm_la_LDFLAGS) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) ++ $(libpixbufloader_xpm_la_LINK) $(am_libpixbufloader_xpm_la_rpath) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) + libstatic-pixbufloader-ani.la: $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_ani_la_LDFLAGS) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_ani_la_rpath) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) + libstatic-pixbufloader-bmp.la: $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_bmp_la_LDFLAGS) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_bmp_la_rpath) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-bmp.la: $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_bmp_la_LDFLAGS) $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_bmp_la_rpath) $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-emf.la: $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_emf_la_LDFLAGS) $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_emf_la_rpath) $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-gif.la: $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_gif_la_LDFLAGS) $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_gif_la_rpath) $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-ico.la: $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_ico_la_LDFLAGS) $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_ico_la_rpath) $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-jpeg.la: $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_jpeg_la_rpath) $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-tiff.la: $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_tiff_la_LDFLAGS) $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_tiff_la_rpath) $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-wmf.la: $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_wmf_la_LDFLAGS) $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_wmf_la_rpath) $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gif.la: $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gif_la_LDFLAGS) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gif_la_rpath) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) + libstatic-pixbufloader-icns.la: $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_icns_la_LDFLAGS) $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_icns_la_rpath) $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_LIBADD) $(LIBS) + libstatic-pixbufloader-ico.la: $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_ico_la_LDFLAGS) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_ico_la_rpath) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) + libstatic-pixbufloader-jasper.la: $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_jasper_la_LDFLAGS) $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_jasper_la_rpath) $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_LIBADD) $(LIBS) + libstatic-pixbufloader-jpeg.la: $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_jpeg_la_rpath) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) + libstatic-pixbufloader-pcx.la: $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_pcx_la_LDFLAGS) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_pcx_la_rpath) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) + libstatic-pixbufloader-png.la: $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_png_la_LDFLAGS) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_png_la_rpath) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) + libstatic-pixbufloader-pnm.la: $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_pnm_la_LDFLAGS) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_pnm_la_rpath) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) + libstatic-pixbufloader-ras.la: $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_ras_la_LDFLAGS) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_ras_la_rpath) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) + libstatic-pixbufloader-tga.la: $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_tga_la_LDFLAGS) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_tga_la_rpath) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) + libstatic-pixbufloader-tiff.la: $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_tiff_la_LDFLAGS) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_tiff_la_rpath) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) + libstatic-pixbufloader-wbmp.la: $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_wbmp_la_LDFLAGS) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_wbmp_la_rpath) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) + libstatic-pixbufloader-xbm.la: $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_xbm_la_LDFLAGS) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_xbm_la_rpath) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) + libstatic-pixbufloader-xpm.la: $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_xpm_la_LDFLAGS) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++ $(LINK) $(am_libstatic_pixbufloader_xpm_la_rpath) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -1596,8 +1520,8 @@ uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + + clean-binPROGRAMS: +@@ -1615,16 +1539,16 @@ clean-noinstPROGRAMS: + done + gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) + @rm -f gdk-pixbuf-csource$(EXEEXT) +- $(LINK) $(gdk_pixbuf_csource_LDFLAGS) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) ++ $(LINK) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) + gdk-pixbuf-query-loaders$(EXEEXT): $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_DEPENDENCIES) + @rm -f gdk-pixbuf-query-loaders$(EXEEXT) +- $(LINK) $(gdk_pixbuf_query_loaders_LDFLAGS) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) ++ $(LINK) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) + test-gdk-pixbuf$(EXEEXT): $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_DEPENDENCIES) + @rm -f test-gdk-pixbuf$(EXEEXT) +- $(LINK) $(test_gdk_pixbuf_LDFLAGS) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) ++ $(LINK) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -1672,64 +1596,47 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdk_pixbufincludeHEADERS: $(libgdk_pixbufinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdk_pixbufincludedir) ++ test -z "$(libgdk_pixbufincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdk_pixbufincludedir)" + @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ +- $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdk_pixbufincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ ++ $(libgdk_pixbufincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ + done + + uninstall-libgdk_pixbufincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -1739,7 +1646,13 @@ uninstall-libgdk_pixbufincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1751,15 +1664,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -1780,7 +1698,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1791,35 +1709,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -1827,23 +1740,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1857,9 +1770,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -1868,25 +1781,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -1911,46 +1824,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1961,15 +1868,19 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1978,13 +1889,16 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local ++@CROSS_COMPILING_TRUE@all-local: ++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ ++ all-local + install-binPROGRAMS: install-libLTLIBRARIES + + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(loaderdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libgdk_pixbufincludedir) +- ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -2006,13 +1920,13 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + clean: clean-recursive + + clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ +@@ -2023,12 +1937,14 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-local distclean-tags ++ distclean-local distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: +@@ -2038,12 +1954,20 @@ install-data-am: install-libgdk_pixbufin + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -2064,35 +1988,34 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ +- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ ++uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ ++ uninstall-libgdk_pixbufincludeHEADERS \ + uninstall-loaderLTLIBRARIES uninstall-local + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-data-am install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ +- check-TESTS check-am check-local clean clean-binPROGRAMS \ +- clean-generic clean-libLTLIBRARIES clean-libtool \ +- clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ +- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-local distclean-recursive distclean-tags distdir dvi \ +- dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-binPROGRAMS install-data install-data-am \ +- install-data-recursive install-exec install-exec-am \ +- install-exec-recursive install-info install-info-am \ +- install-info-recursive install-libLTLIBRARIES \ +- install-libgdk_pixbufincludeHEADERS install-loaderLTLIBRARIES \ +- install-man install-recursive install-strip installcheck \ +- installcheck-am installdirs installdirs-am \ +- installdirs-recursive maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ +- tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-info-recursive \ +- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ +- uninstall-loaderLTLIBRARIES uninstall-local uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am all-local check check-TESTS check-am check-local \ ++ clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ ++ clean-libtool clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ ++ clean-noinstPROGRAMS ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-local distclean-tags distdir dvi dvi-am html html-am \ ++ info info-am install install-am install-binPROGRAMS \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-libLTLIBRARIES install-libgdk_pixbufincludeHEADERS \ ++ install-loaderLTLIBRARIES install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ ++ uninstall-libgdk_pixbufincludeHEADERS \ ++ uninstall-loaderLTLIBRARIES uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/gdk-pixbuf/pixops/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk-pixbuf/pixops/Makefile.in 2009-02-17 23:15:21.215122569 +0100 ++++ gtk+-2.14.7/gdk-pixbuf/pixops/Makefile.in 2009-02-21 14:58:42.995081894 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,59 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = timescale$(EXEEXT) ++subdir = gdk-pixbuf/pixops ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++libpixops_la_LIBADD = ++am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ ++ have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ ++ composite_line_color_22_4a4_mmx.S ++@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ ++@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ ++@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo ++am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) ++libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) ++PROGRAMS = $(noinst_PROGRAMS) ++am_timescale_OBJECTS = timescale.$(OBJEXT) ++timescale_OBJECTS = $(am_timescale_OBJECTS) ++am__DEPENDENCIES_1 = ++timescale_DEPENDENCIES = libpixops.la $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) ++LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) ++DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +242,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,18 +304,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- DETAILS \ +- pixbuf-transform-math.ltx \ +- makefile.msc +- ++EXTRA_DIST = DETAILS pixbuf-transform-math.ltx makefile.msc + TEST_PROGS = + + ### testing rules +@@ -410,97 +339,70 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + noinst_LTLIBRARIES = libpixops.la +- + INCLUDES = \ + -I$(top_srcdir) -I$(top_builddir) \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_PIXBUF_DEP_CFLAGS) + +- +-noinst_PROGRAMS = timescale +- + timescale_SOURCES = timescale.c + timescale_LDADD = libpixops.la $(GLIB_LIBS) $(GDK_PIXBUF_DEP_LIBS) +- + @USE_MMX_TRUE@mmx_sources = \ + @USE_MMX_TRUE@ have_mmx.S \ + @USE_MMX_TRUE@ scale_line_22_33_mmx.S \ + @USE_MMX_TRUE@ composite_line_22_4a4_mmx.S \ + @USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.S + +- + libpixops_la_SOURCES = \ + pixops.c \ + pixops.h \ + pixops-internal.h \ + $(mmx_sources) + +-subdir = gdk-pixbuf/pixops +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +- +-libpixops_la_LDFLAGS = +-libpixops_la_LIBADD = +-am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ +- have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ +- composite_line_color_22_4a4_mmx.S +-@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ +-@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ +-@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo +-am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) +-libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) +-noinst_PROGRAMS = timescale$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_timescale_OBJECTS = timescale.$(OBJEXT) +-timescale_OBJECTS = $(am_timescale_OBJECTS) +-timescale_DEPENDENCIES = libpixops.la +-timescale_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixops.Plo ./$(DEPDIR)/timescale.Po +-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) +-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ +- $(CCASFLAGS) +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libpixops.la: $(libpixops_la_OBJECTS) $(libpixops_la_DEPENDENCIES) +- $(LINK) $(libpixops_la_LDFLAGS) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) ++ $(LINK) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -510,58 +412,62 @@ clean-noinstPROGRAMS: + done + timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) + @rm -f timescale$(EXEEXT) +- $(LINK) $(timescale_LDFLAGS) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) ++ $(LINK) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_22_4a4_mmx.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_color_22_4a4_mmx.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/have_mmx.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixops.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale_line_22_33_mmx.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timescale.Po@am__quote@ + + .S.o: +- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< + + .S.obj: +- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .S.lo: +- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -569,26 +475,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -598,23 +493,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -626,29 +521,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -663,7 +552,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -684,7 +572,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -698,24 +586,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -736,19 +634,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/gtk/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gtk/Makefile.in 2009-02-17 23:15:21.147089272 +0100 ++++ gtk+-2.14.7/gtk/Makefile.in 2009-02-21 14:58:45.055081978 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,15 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,7 +36,13 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(am__gtkunixprintinclude_HEADERS_DIST) \ ++ $(gtkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/gtk-win32.rc.in \ ++ $(srcdir)/gtkversion.h.in $(srcdir)/makefile.msc.in \ ++ $(top_srcdir)/Makefile.decl + @OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh + @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ) + @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ) +@@ -61,1756 +66,945 @@ host_triplet = @host@ + @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h + @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) + @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) +-ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-AS = @AS@ +-ATK_PREFIX = @ATK_PREFIX@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ +-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ +-CAIRO_PREFIX = @CAIRO_PREFIX@ +-CATALOGS = @CATALOGS@ +-CATOBJEXT = @CATOBJEXT@ +-CC = @CC@ +-CCAS = @CCAS@ +-CCASFLAGS = @CCASFLAGS@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ +-CUPS_API_MAJOR = @CUPS_API_MAJOR@ +-CUPS_API_MINOR = @CUPS_API_MINOR@ +-CUPS_CFLAGS = @CUPS_CFLAGS@ +-CUPS_CONFIG = @CUPS_CONFIG@ +-CUPS_LIBS = @CUPS_LIBS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DATADIRNAME = @DATADIRNAME@ +-DB2HTML = @DB2HTML@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ +-DLLTOOL = @DLLTOOL@ +-DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +-EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-GAIL_INET_LIBS = @GAIL_INET_LIBS@ +-GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +-GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +-GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ +-GDK_DEP_LIBS = @GDK_DEP_LIBS@ +-GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ +-GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ +-GDK_PACKAGES = @GDK_PACKAGES@ +-GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +-GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ +-GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ +-GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ +-GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ +-GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ +-GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ +-GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ +-GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ +-GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ +-GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ +-GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ +-GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ +-GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +-GDK_WLIBS = @GDK_WLIBS@ +-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +-GLIB_CFLAGS = @GLIB_CFLAGS@ +-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +-GLIB_LIBS = @GLIB_LIBS@ +-GLIB_MKENUMS = @GLIB_MKENUMS@ +-GLIB_PREFIX = @GLIB_PREFIX@ +-GMOFILES = @GMOFILES@ +-GMSGFMT = @GMSGFMT@ +-GOBJECT_QUERY = @GOBJECT_QUERY@ +-GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTK_API_VERSION = @GTK_API_VERSION@ +-GTK_BINARY_AGE = @GTK_BINARY_AGE@ +-GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +-GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ +-GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ +-GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ +-GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ +-GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ +-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ +-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ +-GTK_PACKAGES = @GTK_PACKAGES@ +-GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ +-GTK_VERSION = @GTK_VERSION@ +-GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ +-HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ +-HTML_DIR = @HTML_DIR@ +-INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ +-INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ +-INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ +-INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ +-INDENT = @INDENT@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INSTOBJEXT = @INSTOBJEXT@ +-INTLLIBS = @INTLLIBS@ +-LDFLAGS = @LDFLAGS@ +-LIBJASPER = @LIBJASPER@ +-LIBJPEG = @LIBJPEG@ +-LIBOBJS = @LIBOBJS@ +-LIBPNG = @LIBPNG@ +-LIBS = @LIBS@ +-LIBTIFF = @LIBTIFF@ +-LIBTOOL = @LIBTOOL@ +-LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +-LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LN_S = @LN_S@ +-LTLIBOBJS = @LTLIBOBJS@ +-LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ +-LT_VERSION_INFO = @LT_VERSION_INFO@ +-MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +-MAKEINFO = @MAKEINFO@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-MSGFMT = @MSGFMT@ +-MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +-NM = @NM@ +-NMEDIT = @NMEDIT@ +-OBJDUMP = @OBJDUMP@ +-OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PANGO_PREFIX = @PANGO_PREFIX@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PERL = @PERL@ +-PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ +-POFILES = @POFILES@ +-POSUB = @POSUB@ +-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +-RANLIB = @RANLIB@ +-REBUILD = @REBUILD@ +-REBUILD_PNGS = @REBUILD_PNGS@ +-SED = @SED@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ +-USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ +-VERSION = @VERSION@ +-WINDRES = @WINDRES@ +-XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ +-XMKMF = @XMKMF@ +-XMLCATALOG = @XMLCATALOG@ +-XML_CATALOG_FILE = @XML_CATALOG_FILE@ +-XSLTPROC = @XSLTPROC@ +-X_CFLAGS = @X_CFLAGS@ +-X_EXTRA_LIBS = @X_EXTRA_LIBS@ +-X_LIBS = @X_LIBS@ +-X_PRE_LIBS = @X_PRE_LIBS@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-gdktarget = @gdktarget@ +-gdktargetlib = @gdktargetlib@ +-gtktargetlib = @gtktargetlib@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-ms_librarian = @ms_librarian@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +- +-GTESTER = gtester # in $PATH for non-GLIB packages +-GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +- +-# initialize variables for unconditional += appending +-EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) $(gtk_built_sources) $(STOCK_ICONS) \ +- $(STOCK_ICONS) \ +- $(GENERATED_ICONS) \ +- line-arrow.xbm \ +- line-wrap.xbm \ +- tree_plus.xbm \ +- tree_minus.xbm \ +- tree_minus.xpm \ +- tree_plus.xpm \ +- gtk.def \ +- gtk-builder-convert \ +- gtk-win32.rc \ +- gtk-win32.rc.in \ +- gtkwin32embed.h \ +- gtkwin32embedwidget.h \ +- gtkwin32embedwidget.c \ +- gtkprint-win32.h \ +- gtkprint-win32.c \ +- gtksearchenginequartz.h \ +- gtkrc.default \ +- gtkrc.key.default \ +- gtkrc.key.emacs \ +- makefile.msc \ +- makefile.msc.in \ +- makegtkalias.pl \ +- aliasfilescheck.sh \ +- abicheck.sh \ +- pltcheck.sh \ +- gtktypebuiltins.c.template \ +- gtktypebuiltins.h.template +- +-TEST_PROGS = +- +-### testing rules +- +-# Xvfb based test rules +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 +-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ +- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ +- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ +- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ +- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ +- 9995 9996 9997 9998 9999 +- +-SKIP_GDKTARGET = \ +- test "$(gdktarget)" != "x11" \ +- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." +- +-XVFB_START = \ +- ${XVFB} -help 2>/dev/null 1>&2 \ +- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ +- && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ +- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ +- && DISPLAY=:$$XID && export DISPLAY +- +- +- +-# Makefile.am for gtk+/gtk +-@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" +-@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" +- +-SUBDIRS = theme-bits . tests +-DIST_SUBDIRS = theme-bits tests +-@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr +- +-@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups +- +-INCLUDES = \ +- -DG_LOG_DOMAIN=\"Gtk\" \ +- -DGTK_LIBDIR=\"$(libdir)\" \ +- -DGTK_DATADIR=\"$(datadir)\" \ +- -DGTK_DATA_PREFIX=\"$(prefix)\" \ +- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ +- -DGTK_VERSION=\"$(GTK_VERSION)\" \ +- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ +- -DGTK_HOST=\"$(host)\" \ +- -DGTK_COMPILATION \ +- -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ +- -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ +- -I$(top_builddir) \ +- -I$(top_builddir)/gtk \ +- -I$(top_srcdir) -I../gdk \ +- -I$(top_srcdir)/gdk \ +- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ +- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ +- $(GTK_DEBUG_FLAGS) \ +- $(GTK_DEP_CFLAGS) \ +- $(gtk_clipboard_dnd_c_sources_CFLAGS) \ +- $(INCLUDED_IMMODULE_DEFINE) +- +- +-gtarget = $(gdktarget) +- +-@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- +-@OS_WIN32_TRUE@gtk_def = gtk.def +-@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def +- +-@OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o +-@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o +- +-@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib +- +-TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" +-TESTS = aliasfilescheck.sh $(am__append_1) +- +-libgtkincludedir = $(includedir)/gtk-2.0/gtk +-libadd = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(GTK_DEP_LIBS)\ +-$(am__append_2) +-deps = $(am__append_3) +- +-# libtool stuff: set version and export symbols for resolving +-# since automake doesn't support conditionalized libsomething_la_LDFLAGS +-# we use the general approach here +-libtool_opts = \ +- -version-info $(LT_VERSION_INFO) \ +- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ +- -rpath $(libdir) $(libgtk_target_ldflags) +- +- +-# +-# setup source file variables +-# +- +-# GTK+ header files for public installation (non-generated, or generated +-# by configure) +- +-# Broken +- +-# Deprecated +-gtk_public_h_sources = \ +- gtk.h \ +- gtkaboutdialog.h \ +- gtkaccelgroup.h \ +- gtkaccellabel.h \ +- gtkaccelmap.h \ +- gtkaccessible.h \ +- gtkaction.h \ +- gtkactiongroup.h \ +- gtkadjustment.h \ +- gtkalignment.h \ +- gtkarrow.h \ +- gtkaspectframe.h \ +- gtkassistant.h \ +- gtkbbox.h \ +- gtkbin.h \ +- gtkbindings.h \ +- gtkbox.h \ +- gtkbuilder.h \ +- gtkbuildable.h \ +- gtkbutton.h \ +- gtkcalendar.h \ +- gtkcelleditable.h \ +- gtkcelllayout.h \ +- gtkcellrenderer.h \ +- gtkcellrendereraccel.h \ +- gtkcellrenderercombo.h \ +- gtkcellrendererpixbuf.h \ +- gtkcellrendererprogress.h \ +- gtkcellrendererspin.h \ +- gtkcellrenderertext.h \ +- gtkcellrenderertoggle.h \ +- gtkcellview.h \ +- gtkcheckbutton.h \ +- gtkcheckmenuitem.h \ +- gtkclipboard.h \ +- gtkcolorbutton.h \ +- gtkcolorsel.h \ +- gtkcolorseldialog.h \ +- gtkcombobox.h \ +- gtkcomboboxentry.h \ +- gtkcontainer.h \ +- gtkcurve.h \ +- gtkdebug.h \ +- gtkdialog.h \ +- gtkdnd.h \ +- gtkdrawingarea.h \ +- gtkeditable.h \ +- gtkentry.h \ +- gtkentrycompletion.h \ +- gtkenums.h \ +- gtkeventbox.h \ +- gtkexpander.h \ +- gtkfilechooser.h \ +- gtkfilechooserbutton.h \ +- gtkfilechooserdialog.h \ +- gtkfilechooserwidget.h \ +- gtkfilefilter.h \ +- gtkfixed.h \ +- gtkfontbutton.h \ +- gtkfontsel.h \ +- gtkframe.h \ +- gtkgamma.h \ +- gtkgc.h \ +- gtkhandlebox.h \ +- gtkhbbox.h \ +- gtkhbox.h \ +- gtkhpaned.h \ +- gtkhruler.h \ +- gtkhscale.h \ +- gtkhscrollbar.h \ +- gtkhseparator.h \ +- gtkhsv.h \ +- gtkiconfactory.h \ +- gtkicontheme.h \ +- gtkiconview.h \ +- gtkimage.h \ +- gtkimagemenuitem.h \ +- gtkimcontext.h \ +- gtkimcontextsimple.h \ +- gtkimmodule.h \ +- gtkimmulticontext.h \ +- gtkinputdialog.h \ +- gtkinvisible.h \ +- gtkitem.h \ +- gtklabel.h \ +- gtklayout.h \ +- gtklinkbutton.h \ +- gtkliststore.h \ +- gtkmain.h \ +- gtkmenu.h \ +- gtkmenubar.h \ +- gtkmenuitem.h \ +- gtkmenushell.h \ +- gtkmenutoolbutton.h \ +- gtkmessagedialog.h \ +- gtkmisc.h \ +- gtkmodules.h \ +- gtkmountoperation.h \ +- gtknotebook.h \ +- gtkobject.h \ +- gtkpagesetup.h \ +- gtkpaned.h \ +- gtkpapersize.h \ +- gtkplug.h \ +- gtkprintcontext.h \ +- gtkprintoperation.h \ +- gtkprintoperationpreview.h \ +- gtkprintsettings.h \ +- gtkprivate.h \ +- gtkprogressbar.h \ +- gtkradioaction.h \ +- gtkradiobutton.h \ +- gtkradiomenuitem.h \ +- gtkradiotoolbutton.h \ +- gtkrange.h \ +- gtkrc.h \ +- gtkrecentaction.h \ +- gtkrecentchooser.h \ +- gtkrecentchooserdialog.h \ +- gtkrecentchoosermenu.h \ +- gtkrecentchooserwidget.h \ +- gtkrecentfilter.h \ +- gtkrecentmanager.h \ +- gtkruler.h \ +- gtkscale.h \ +- gtkscalebutton.h \ +- gtkscrollbar.h \ +- gtkscrolledwindow.h \ +- gtkselection.h \ +- gtkseparator.h \ +- gtkseparatormenuitem.h \ +- gtkseparatortoolitem.h \ +- gtkshow.h \ +- gtksettings.h \ +- gtksizegroup.h \ +- gtksocket.h \ +- gtkspinbutton.h \ +- gtkstatusbar.h \ +- gtkstatusicon.h \ +- gtkstock.h \ +- gtkstyle.h \ +- gtktable.h \ +- gtktearoffmenuitem.h \ +- gtktestutils.h \ +- gtktextbuffer.h \ +- gtktextbufferrichtext.h \ +- gtktextchild.h \ +- gtktextdisplay.h \ +- gtktextiter.h \ +- gtktextmark.h \ +- gtktexttag.h \ +- gtktexttagtable.h \ +- gtktextview.h \ +- gtktoggleaction.h \ +- gtktogglebutton.h \ +- gtktoggletoolbutton.h \ +- gtktoolbar.h \ +- gtktoolbutton.h \ +- gtktoolitem.h \ +- gtktoolshell.h \ +- gtktooltip.h \ +- gtktreednd.h \ +- gtktreemodel.h \ +- gtktreemodelfilter.h \ +- gtktreemodelsort.h \ +- gtktreeselection.h \ +- gtktreesortable.h \ +- gtktreestore.h \ +- gtktreeview.h \ +- gtktreeviewcolumn.h \ +- gtktypeutils.h \ +- gtkuimanager.h \ +- gtkvbbox.h \ +- gtkvbox.h \ +- gtkviewport.h \ +- gtkvolumebutton.h \ +- gtkvpaned.h \ +- gtkvruler.h \ +- gtkvscale.h \ +- gtkvscrollbar.h \ +- gtkvseparator.h \ +- gtkwidget.h \ +- gtkwindow.h\ +-\ +- gtktext.h \ +- gtktree.h \ +- gtktreeitem.h\ +-\ +- gtkclist.h \ +- gtkcombo.h \ +- gtkctree.h \ +- gtkfilesel.h \ +- gtkitemfactory.h \ +- gtklist.h \ +- gtklistitem.h \ +- gtkoldeditable.h \ +- gtkoptionmenu.h \ +- gtkpixmap.h \ +- gtkpreview.h \ +- gtkprogress.h \ +- gtksignal.h \ +- gtktipsquery.h \ +- gtktooltips.h +- +- +-@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ +-@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ +-@OS_UNIX_TRUE@ gtkprintunixdialog.h \ +-@OS_UNIX_TRUE@ gtkprinter.h \ +-@OS_UNIX_TRUE@ gtkprintjob.h \ +-@OS_UNIX_TRUE@ gtkunixprint.h +- +- +-# Installed header files without compatibility guarantees +-# that are not included in gtk/gtk.h +-gtk_semi_private_h_sources = \ +- gtktextlayout.h +- +- +-# GTK+ header files that don't get installed +-gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ +- gtksearchenginesimple.h \ +- gtkdndcursors.h \ +- gtkentryprivate.h \ +- gtkbuilderprivate.h \ +- gtkfilechooserdefault.h \ +- gtkfilechooserembed.h \ +- gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ +- gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystem.h \ +- gtkfilesystemmodel.h \ +- gtkiconcache.h \ +- gtkintl.h \ +- gtkkeyhash.h \ +- gtkmnemonichash.h \ +- gtkpathbar.h \ +- gtkplugprivate.h \ +- gtkprintoperation-private.h\ +- gtkprintutils.h \ +- gtkrbtree.h \ +- gtkrecentchooserdefault.h \ +- gtkrecentchooserprivate.h \ +- gtkrecentchooserutils.h \ +- gtksocketprivate.h \ +- gtktextbtree.h \ +- gtktextbufferserialize.h\ +- gtktextchildprivate.h \ +- gtktextiterprivate.h \ +- gtktextmarkprivate.h \ +- gtktextsegment.h \ +- gtktexttagprivate.h \ +- gtktexttypes.h \ +- gtktextutil.h \ +- gtkthemes.h \ +- gtktoggleactionprivate.h\ +- gtktreedatalist.h \ +- gtktreeprivate.h \ +- gtkwindow-decorate.h \ +- $(gtk_clipboard_dnd_h_sources)\ +-$(am__append_4) $(am__append_6) $(am__append_8) $(am__append_10) $(am__append_12) +- +-# GTK+ C sources to build the library from +-gtk_base_c_sources = \ +- gtkquery.c \ +- gtksearchengine.c \ +- gtksearchenginesimple.c \ +- fnmatch.c \ +- gtkaboutdialog.c \ +- gtkaccelgroup.c \ +- gtkaccellabel.c \ +- gtkaccelmap.c \ +- gtkaccessible.c \ +- gtkaction.c \ +- gtkactiongroup.c \ +- gtkadjustment.c \ +- gtkalignment.c \ +- gtkarrow.c \ +- gtkaspectframe.c \ +- gtkassistant.c \ +- gtkbbox.c \ +- gtkbin.c \ +- gtkbindings.c \ +- gtkbox.c \ +- gtkbuildable.c \ +- gtkbuilder.c \ +- gtkbuilderparser.c \ +- gtkbutton.c \ +- gtkcalendar.c \ +- gtkcelleditable.c \ +- gtkcelllayout.c \ +- gtkcellrenderer.c \ +- gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c \ +- gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c \ +- gtkcellrendererspin.c \ +- gtkcellrenderertext.c \ +- gtkcellrenderertoggle.c \ +- gtkcellview.c \ +- gtkcheckbutton.c \ +- gtkcheckmenuitem.c \ +- gtkcolorbutton.c \ +- gtkcolorsel.c \ +- gtkcolorseldialog.c \ +- gtkcombobox.c \ +- gtkcomboboxentry.c \ +- gtkcontainer.c \ +- gtkcurve.c \ +- gtkdialog.c \ +- gtkdrawingarea.c \ +- gtkeditable.c \ +- gtkentry.c \ +- gtkentrycompletion.c \ +- gtkeventbox.c \ +- gtkexpander.c \ +- gtkfilechooser.c \ +- gtkfilechooserbutton.c \ +- gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c \ +- gtkfilechooserembed.c \ +- gtkfilechooserentry.c \ +- gtkfilechoosersettings.c \ +- gtkfilechooserutils.c \ +- gtkfilechooserwidget.c \ +- gtkfilefilter.c \ +- gtkfilesystem.c \ +- gtkfilesystemmodel.c \ +- gtkfixed.c \ +- gtkfontbutton.c \ +- gtkfontsel.c \ +- gtkframe.c \ +- gtkgamma.c \ +- gtkgc.c \ +- gtkhandlebox.c \ +- gtkhbbox.c \ +- gtkhbox.c \ +- gtkhpaned.c \ +- gtkhruler.c \ +- gtkhscale.c \ +- gtkhscrollbar.c \ +- gtkhseparator.c \ +- gtkhsv.c \ +- gtkiconcache.c \ +- gtkiconcachevalidator.c \ +- gtkiconfactory.c \ +- gtkicontheme.c \ +- gtkiconview.c \ +- gtkimage.c \ +- gtkimagemenuitem.c \ +- gtkimcontext.c \ +- gtkimcontextsimple.c \ +- gtkimmodule.c \ +- gtkimmulticontext.c \ +- gtkinputdialog.c \ +- gtkinvisible.c \ +- gtkitem.c \ +- gtkkeyhash.c \ +- gtklabel.c \ +- gtklayout.c \ +- gtklinkbutton.c \ +- gtkliststore.c \ +- gtkmain.c \ +- gtkmarshal.c \ +- gtkmarshalers.c \ +- gtkmenu.c \ +- gtkmenubar.c \ +- gtkmenuitem.c \ +- gtkmenushell.c \ +- gtkmenutoolbutton.c \ +- gtkmessagedialog.c \ +- gtkmisc.c \ +- gtkmnemonichash.c \ +- gtkmodules.c \ +- gtkmountoperation.c \ +- gtknotebook.c \ +- gtkobject.c \ +- gtkpagesetup.c \ +- gtkpaned.c \ +- gtkpapersize.c \ +- gtkpathbar.c \ +- gtkplug.c \ +- gtkprintcontext.c \ +- gtkprintoperation.c \ +- gtkprintoperationpreview.c \ +- gtkprintsettings.c \ +- gtkprintutils.c \ +- gtkprogressbar.c \ +- gtkradioaction.c \ +- gtkradiobutton.c \ +- gtkradiomenuitem.c \ +- gtkradiotoolbutton.c \ +- gtkrange.c \ +- gtkrbtree.c \ +- gtkrc.c \ +- gtkrecentaction.c \ +- gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c \ +- gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c \ +- gtkrecentchooserutils.c \ +- gtkrecentchooser.c \ +- gtkrecentfilter.c \ +- gtkrecentmanager.c \ +- gtkruler.c \ +- gtkscale.c \ +- gtkscalebutton.c \ +- gtkscrollbar.c \ +- gtkscrolledwindow.c \ +- gtkselection.c \ +- gtkseparator.c \ +- gtkseparatormenuitem.c \ +- gtkseparatortoolitem.c \ +- gtksettings.c \ +- gtksizegroup.c \ +- gtkshow.c \ +- gtksocket.c \ +- gtkspinbutton.c \ +- gtkstatusbar.c \ +- gtkstatusicon.c \ +- gtkstock.c \ +- gtkstyle.c \ +- gtktable.c \ +- gtktearoffmenuitem.c \ +- gtktestutils.c \ +- gtktextbtree.c \ +- gtktextbuffer.c \ +- gtktextbufferrichtext.c \ +- gtktextbufferserialize.c\ +- gtktextchild.c \ +- gtktextdisplay.c \ +- gtktextiter.c \ +- gtktextlayout.c \ +- gtktextmark.c \ +- gtktextsegment.c \ +- gtktexttag.c \ +- gtktexttagtable.c \ +- gtktexttypes.c \ +- gtktextutil.c \ +- gtktextview.c \ +- gtkthemes.c \ +- gtktoggleaction.c \ +- gtktogglebutton.c \ +- gtktoggletoolbutton.c \ +- gtktoolbar.c \ +- gtktoolbutton.c \ +- gtktoolitem.c \ +- gtktoolshell.c \ +- gtktooltip.c \ +- gtktreedatalist.c \ +- gtktreednd.c \ +- gtktreemodel.c \ +- gtktreemodelfilter.c \ +- gtktreemodelsort.c \ +- gtktreeselection.c \ +- gtktreesortable.c \ +- gtktreestore.c \ +- gtktreeview.c \ +- gtktreeviewcolumn.c \ +- gtktypebuiltins.c \ +- gtktypeutils.c \ +- gtkuimanager.c \ +- gtkvbbox.c \ +- gtkvbox.c \ +- gtkvolumebutton.c \ +- gtkviewport.c \ +- gtkvpaned.c \ +- gtkvruler.c \ +- gtkvscale.c \ +- gtkvscrollbar.c \ +- gtkvseparator.c \ +- gtkwidget.c \ +- gtkwindow-decorate.c \ +- gtkwindow.c \ +- $(gtk_clipboard_dnd_c_sources)\ +-\ +- gtktext.c \ +- gtktree.c \ +- gtktreeitem.c\ +-\ +- gtkclist.c \ +- gtkcombo.c \ +- gtkctree.c \ +- gtkfilesel.c \ +- gtkitemfactory.c \ +- gtklist.c \ +- gtklistitem.c \ +- gtkoldeditable.c \ +- gtkoptionmenu.c \ +- gtkpixmap.c \ +- gtkpreview.c \ +- gtkprogress.c \ +- gtksignal.c \ +- gtktipsquery.c \ +- gtktooltips.c +- +- +-gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) $(am__append_9) $(am__append_11) $(am__append_13) $(am__append_14) +-gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources) +- +-gtk_os_unix_c_sources = \ +- gtkpagesetupunixdialog.c \ +- gtkprinter.c \ +- gtkprinteroption.c \ +- gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c \ +- gtkprintjob.c \ +- gtkprintoperation-unix.c \ +- gtkprintunixdialog.c \ +- gtkprintbackend.c \ +- gtksearchenginebeagle.c \ +- gtksearchenginetracker.c +- +- +-gtk_os_win32_c_sources = \ +- gtkprint-win32.c \ +- gtkprintoperation-win32.c +- +- +-gtk_use_x11_c_sources = \ +- gtkplug-x11.c \ +- gtksocket-x11.c \ +- gtkxembed.c \ +- gtktrayicon-x11.c +- +-gtk_use_win32_c_sources = \ +- gtkplug-win32.c \ +- gtksocket-win32.c \ +- gtkwin32embed.c \ +- gtkwin32embedwidget.c +- +-gtk_use_quartz_c_sources = \ +- gtksearchenginequartz.c \ +- gtkplug-stub.c \ +- gtksocket-stub.c +- +-gtk_use_stub_c_sources = \ +- gtkplug-stub.c \ +- gtksocket-stub.c +- +-@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" +- +-@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c +-@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c +-@USE_QUARTZ_TRUE@gtk_clipboard_dnd_h_sources = gtkquartz.h +-@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" +-@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = +- +-# we use our own built_sources variable rules to avoid automake's +-# BUILT_SOURCES oddities +-# we generate frequently rebuild files piggyback on a stamp file, so sources +-# depending on them only get rebuild when the built source actually changed +-# content +- +-# built sources that get installed with the header files +-gtk_built_public_sources = \ +- gtkmarshal.h \ +- gtktypebuiltins.h +- +- +-# built headers that don't get installed +-gtk_built_private_headers = \ +- gtkalias.h \ +- gtkmarshalers.h \ +- gtkbuiltincache.h \ +- gtkimcontextsimpleseqs.h +- +- +-gtk_built_sources = \ +- gtkaliasdef.c \ +- gtktypebuiltins.c \ +- gtktypefuncs.c \ +- gtkmarshalers.c \ +- gtkmarshal.c \ +- ${gtk_built_private_headers} \ +- ${gtk_built_public_sources} +- +- +-stamp_files = \ +- stamp-gtkmarshalers.h \ +- stamp-gtkmarshal.h \ +- stamp-gtktypebuiltins.h \ +- stamp-icons +- +- +-# 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 +-gtk_extra_sources = \ +- paper_names.c \ +- paper_names_offsets.c \ +- gen-paper-names.c \ +- gtkstatusicon-quartz.c \ +- gtk.symbols \ +- gtkversion.h.in \ +- gtkmarshalers.list \ +- gtkmarshal.list +- +- +-# +-# setup GTK+ sources and their dependencies +-# +-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) +-EXTRA_HEADERS = +- +-# +-# rules to generate built sources +-# +-# setup autogeneration dependencies +-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf +-CLEANFILES = $(gen_sources) +- +-BUILT_SOURCES = $(gtk_built_sources) +- +-# target platform: +-lib_LTLIBRARIES = $(gtktargetlib) +- +-gtkincludedir = $(includedir)/gtk-2.0/gtk +-gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h +- +-gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk +-gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) +- +-libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) +-libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) +-libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) +-libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) +- +-libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) +-libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid +-libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) +-libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) +- +-libgtk_x11_2_0_la_LIBADD = $(libadd) +-libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 +-libgtk_quartz_2_0_la_LIBADD = $(libadd) +-libgtk_directfb_2_0_la_LIBADD = $(libadd) +- +-libgtk_x11_2_0_la_DEPENDENCIES = $(deps) +-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) +-libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) +-libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) +- +-@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) +-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la +- +-DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) +- +-TEST_DEPS = $(DEPS) gtk.immodules +- +-LDADDS = \ +- $(gtktargetlib) \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) +- +- +-# +-# Installed tools +-# +-bin_PROGRAMS = \ +- gtk-query-immodules-2.0 \ +- gtk-update-icon-cache +- +-bin_SCRIPTS = gtk-builder-convert +- +-gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) +-gtk_query_immodules_2_0_LDADD = $(LDADDS) +- +-gtk_query_immodules_2_0_SOURCES = queryimmodules.c +- +-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +- +-gtk_update_icon_cache_SOURCES = \ +- updateiconcache.c +- +- +-STOCK_ICONS = \ +- stock-icons/16/document-open-recent.png \ +- stock-icons/16/gtk-about.png \ +- stock-icons/16/gtk-add.png \ +- stock-icons/16/gtk-cdrom.png \ +- stock-icons/16/gtk-close.png \ +- stock-icons/16/gtk-connect.png \ +- stock-icons/16/gtk-convert.png \ +- stock-icons/16/gtk-copy.png \ +- stock-icons/16/gtk-cut.png \ +- stock-icons/16/gtk-delete.png \ +- stock-icons/16/gtk-directory.png \ +- stock-icons/16/gtk-disconnect.png \ +- stock-icons/16/gtk-edit.png \ +- stock-icons/16/gtk-execute.png \ +- stock-icons/16/gtk-file.png \ +- stock-icons/16/gtk-find-and-replace.png \ +- stock-icons/16/gtk-find.png \ +- stock-icons/16/gtk-floppy.png \ +- stock-icons/16/gtk-fullscreen.png \ +- stock-icons/16/gtk-go-back-ltr.png \ +- stock-icons/16/gtk-go-down.png \ +- stock-icons/16/gtk-go-forward-ltr.png \ +- stock-icons/16/gtk-goto-bottom.png \ +- stock-icons/16/gtk-goto-first-ltr.png \ +- stock-icons/16/gtk-goto-last-ltr.png \ +- stock-icons/16/gtk-goto-top.png \ +- stock-icons/16/gtk-go-up.png \ +- stock-icons/16/gtk-harddisk.png \ +- stock-icons/16/gtk-help.png \ +- stock-icons/16/gtk-home.png \ +- stock-icons/16/gtk-indent-ltr.png \ +- stock-icons/16/gtk-indent-rtl.png \ +- stock-icons/16/gtk-index.png \ +- stock-icons/16/gtk-info.png \ +- stock-icons/16/gtk-jump-to-ltr.png \ +- stock-icons/16/gtk-jump-to-rtl.png \ +- stock-icons/16/gtk-justify-center.png \ +- stock-icons/16/gtk-justify-fill.png \ +- stock-icons/16/gtk-justify-left.png \ +- stock-icons/16/gtk-justify-right.png \ +- stock-icons/16/gtk-leave-fullscreen.png \ +- stock-icons/16/gtk-media-forward-ltr.png \ +- stock-icons/16/gtk-media-next-ltr.png \ +- stock-icons/16/gtk-media-pause.png \ +- stock-icons/16/gtk-media-play-ltr.png \ +- stock-icons/16/gtk-media-play-rtl.png \ +- stock-icons/16/gtk-media-previous-ltr.png \ +- stock-icons/16/gtk-media-record.png \ +- stock-icons/16/gtk-media-rewind-ltr.png \ +- stock-icons/16/gtk-media-stop.png \ +- stock-icons/16/gtk-missing-image.png \ +- stock-icons/16/gtk-network.png \ +- stock-icons/16/gtk-new.png \ +- stock-icons/16/gtk-open.png \ +- stock-icons/16/gtk-page-setup.png \ +- stock-icons/16/gtk-paste.png \ +- stock-icons/16/gtk-preferences.png \ +- stock-icons/16/gtk-print.png \ +- stock-icons/16/gtk-print-error.png \ +- stock-icons/16/gtk-print-paused.png \ +- stock-icons/16/gtk-print-preview.png \ +- stock-icons/16/gtk-print-report.png \ +- stock-icons/16/gtk-print-warning.png \ +- stock-icons/16/gtk-properties.png \ +- stock-icons/16/gtk-quit.png \ +- stock-icons/16/gtk-redo-ltr.png \ +- stock-icons/16/gtk-redo-rtl.png \ +- stock-icons/16/gtk-refresh.png \ +- stock-icons/16/gtk-remove.png \ +- stock-icons/16/gtk-revert-to-saved-ltr.png \ +- stock-icons/16/gtk-revert-to-saved-rtl.png \ +- stock-icons/16/gtk-save-as.png \ +- stock-icons/16/gtk-select-all.png \ +- stock-icons/16/gtk-select-color.png \ +- stock-icons/16/gtk-select-font.png \ +- stock-icons/16/gtk-sort-ascending.png \ +- stock-icons/16/gtk-sort-descending.png \ +- stock-icons/16/gtk-spell-check.png \ +- stock-icons/16/gtk-stop.png \ +- stock-icons/16/gtk-strikethrough.png \ +- stock-icons/16/gtk-font.png \ +- stock-icons/16/gtk-undelete-ltr.png \ +- stock-icons/16/gtk-undelete-rtl.png \ +- stock-icons/16/gtk-underline.png \ +- stock-icons/16/gtk-undo-ltr.png \ +- stock-icons/16/gtk-undo-rtl.png \ +- stock-icons/16/gtk-unindent-ltr.png \ +- stock-icons/16/gtk-unindent-rtl.png \ +- stock-icons/16/gtk-zoom-100.png \ +- stock-icons/16/gtk-zoom-fit.png \ +- stock-icons/16/gtk-zoom-in.png \ +- stock-icons/16/gtk-zoom-out.png \ +- stock-icons/16/gtk-italic.png \ +- stock-icons/16/gtk-bold.png \ +- stock-icons/20/gtk-apply.png \ +- stock-icons/20/gtk-cancel.png \ +- stock-icons/20/gtk-close.png \ +- stock-icons/20/gtk-no.png \ +- stock-icons/20/gtk-ok.png \ +- stock-icons/20/gtk-yes.png \ +- stock-icons/24/audio-volume-high.png \ +- stock-icons/24/audio-volume-low.png \ +- stock-icons/24/audio-volume-medium.png \ +- stock-icons/24/audio-volume-muted.png \ +- stock-icons/24/document-open-recent.png \ +- stock-icons/24/gtk-about.png \ +- stock-icons/24/gtk-add.png \ +- stock-icons/24/gtk-bold.png \ +- stock-icons/24/gtk-cdrom.png \ +- stock-icons/24/gtk-clear.png \ +- stock-icons/24/gtk-close.png \ +- stock-icons/24/gtk-color-picker.png \ +- stock-icons/24/gtk-connect.png \ +- stock-icons/24/gtk-convert.png \ +- stock-icons/24/gtk-copy.png \ +- stock-icons/24/gtk-cut.png \ +- stock-icons/24/gtk-directory.png \ +- stock-icons/24/gtk-disconnect.png \ +- stock-icons/24/gtk-edit.png \ +- stock-icons/24/gtk-execute.png \ +- stock-icons/24/gtk-file.png \ +- stock-icons/24/gtk-find-and-replace.png \ +- stock-icons/24/gtk-find.png \ +- stock-icons/24/gtk-font.png \ +- stock-icons/24/gtk-fullscreen.png \ +- stock-icons/24/gtk-go-back-ltr.png \ +- stock-icons/24/gtk-goto-top.png \ +- stock-icons/24/gtk-go-down.png \ +- stock-icons/24/gtk-goto-bottom.png \ +- stock-icons/24/gtk-goto-first-ltr.png \ +- stock-icons/24/gtk-goto-last-ltr.png \ +- stock-icons/24/gtk-go-up.png \ +- stock-icons/24/gtk-harddisk.png \ +- stock-icons/24/gtk-help.png \ +- stock-icons/24/gtk-home.png \ +- stock-icons/24/gtk-indent-ltr.png \ +- stock-icons/24/gtk-indent-rtl.png \ +- stock-icons/24/gtk-index.png \ +- stock-icons/24/gtk-info.png \ +- stock-icons/24/gtk-italic.png \ +- stock-icons/24/gtk-jump-to-ltr.png \ +- stock-icons/24/gtk-jump-to-rtl.png \ +- stock-icons/24/gtk-justify-center.png \ +- stock-icons/24/gtk-justify-fill.png \ +- stock-icons/24/gtk-justify-left.png \ +- stock-icons/24/gtk-justify-right.png \ +- stock-icons/24/gtk-leave-fullscreen.png \ +- stock-icons/24/gtk-media-forward-ltr.png \ +- stock-icons/24/gtk-media-next-ltr.png \ +- stock-icons/24/gtk-media-pause.png \ +- stock-icons/24/gtk-media-play-ltr.png \ +- stock-icons/24/gtk-media-play-rtl.png \ +- stock-icons/24/gtk-media-previous-ltr.png \ +- stock-icons/24/gtk-media-record.png \ +- stock-icons/24/gtk-media-rewind-ltr.png \ +- stock-icons/24/gtk-media-stop.png \ +- stock-icons/24/gtk-missing-image.png \ +- stock-icons/24/gtk-network.png \ +- stock-icons/24/gtk-new.png \ +- stock-icons/24/gtk-open.png \ +- stock-icons/24/gtk-orientation-reverse-landscape.png \ +- stock-icons/24/gtk-orientation-landscape.png \ +- stock-icons/24/gtk-orientation-reverse-portrait.png \ +- stock-icons/24/gtk-orientation-portrait.png \ +- stock-icons/24/gtk-page-setup.png \ +- stock-icons/24/gtk-paste.png \ +- stock-icons/24/gtk-preferences.png \ +- stock-icons/24/gtk-print.png \ +- stock-icons/24/gtk-print-error.png \ +- stock-icons/24/gtk-print-paused.png \ +- stock-icons/24/gtk-print-preview.png \ +- stock-icons/24/gtk-print-report.png \ +- stock-icons/24/gtk-print-warning.png \ +- stock-icons/24/gtk-properties.png \ +- stock-icons/24/gtk-quit.png \ +- stock-icons/24/gtk-redo-ltr.png \ +- stock-icons/24/gtk-redo-rtl.png \ +- stock-icons/24/gtk-refresh.png \ +- stock-icons/24/gtk-remove.png \ +- stock-icons/24/gtk-revert-to-saved-ltr.png \ +- stock-icons/24/gtk-revert-to-saved-rtl.png \ +- stock-icons/24/gtk-select-font.png \ +- stock-icons/24/gtk-save-as.png \ +- stock-icons/24/gtk-floppy.png \ +- stock-icons/24/gtk-select-all.png \ +- stock-icons/24/gtk-select-color.png \ +- stock-icons/24/gtk-sort-ascending.png \ +- stock-icons/24/gtk-sort-descending.png \ +- stock-icons/24/gtk-spell-check.png \ +- stock-icons/24/gtk-stop.png \ +- stock-icons/24/gtk-strikethrough.png \ +- stock-icons/24/gtk-delete.png \ +- stock-icons/24/gtk-undelete-ltr.png \ +- stock-icons/24/gtk-undelete-rtl.png \ +- stock-icons/24/gtk-underline.png \ +- stock-icons/24/gtk-undo-ltr.png \ +- stock-icons/24/gtk-undo-rtl.png \ +- stock-icons/24/gtk-unindent-ltr.png \ +- stock-icons/24/gtk-unindent-rtl.png \ +- stock-icons/24/gtk-zoom-100.png \ +- stock-icons/24/gtk-zoom-fit.png \ +- stock-icons/24/gtk-zoom-in.png \ +- stock-icons/24/gtk-zoom-out.png \ +- stock-icons/24/gtk-go-forward-ltr.png \ +- stock-icons/32/gtk-dnd-multiple.png \ +- stock-icons/32/gtk-dnd.png \ +- stock-icons/48/gtk-dialog-authentication.png \ +- stock-icons/48/gtk-dialog-error.png \ +- stock-icons/48/gtk-dialog-info.png \ +- stock-icons/48/gtk-dialog-question.png \ +- stock-icons/48/gtk-dialog-warning.png ++bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ ++ gtk-update-icon-cache$(EXEEXT) ++subdir = gtk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ ++ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" \ ++ "$(DESTDIR)$(gtkunixprintincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++@HAVE_INCLUDED_IMMMODULES_TRUE@am__DEPENDENCIES_2 = \ ++@HAVE_INCLUDED_IMMMODULES_TRUE@ $(am__DEPENDENCIES_1) ++am__DEPENDENCIES_3 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo ++@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo \ ++@USE_QUARTZ_TRUE@ gtkdnd-quartz.lo gtkquartz.lo ++am__objects_2 = gtkquery.lo gtksearchengine.lo \ ++ gtksearchenginesimple.lo fnmatch.lo gtkaboutdialog.lo \ ++ gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \ ++ gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ ++ gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ ++ gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ ++ gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ ++ gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \ ++ gtkcellrenderer.lo gtkcellrendereraccel.lo \ ++ gtkcellrenderercombo.lo gtkcellrendererpixbuf.lo \ ++ gtkcellrendererprogress.lo gtkcellrendererspin.lo \ ++ gtkcellrenderertext.lo gtkcellrenderertoggle.lo gtkcellview.lo \ ++ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkcolorbutton.lo \ ++ gtkcolorsel.lo gtkcolorseldialog.lo gtkcombobox.lo \ ++ gtkcomboboxentry.lo gtkcontainer.lo gtkcurve.lo gtkdialog.lo \ ++ gtkdrawingarea.lo gtkeditable.lo gtkentry.lo \ ++ gtkentrycompletion.lo gtkeventbox.lo gtkexpander.lo \ ++ gtkfilechooser.lo gtkfilechooserbutton.lo \ ++ gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ ++ gtkfilechooserembed.lo gtkfilechooserentry.lo \ ++ gtkfilechoosersettings.lo gtkfilechooserutils.lo \ ++ gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \ ++ gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ ++ gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ ++ gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ ++ gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ ++ gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ ++ gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ ++ gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ ++ gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \ ++ gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \ ++ gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \ ++ gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ ++ gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ ++ gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ ++ gtknotebook.lo gtkobject.lo gtkpagesetup.lo gtkpaned.lo \ ++ gtkpapersize.lo gtkpathbar.lo gtkplug.lo gtkprintcontext.lo \ ++ gtkprintoperation.lo gtkprintoperationpreview.lo \ ++ gtkprintsettings.lo gtkprintutils.lo gtkprogressbar.lo \ ++ gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ ++ gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ ++ gtkrecentaction.lo gtkrecentchooserdefault.lo \ ++ gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ ++ gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ ++ gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ ++ gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ ++ gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ ++ gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ ++ gtksizegroup.lo gtkshow.lo gtksocket.lo gtkspinbutton.lo \ ++ gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ ++ gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \ ++ gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ ++ gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ ++ gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ ++ gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ ++ gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \ ++ gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \ ++ gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \ ++ gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \ ++ gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ ++ gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ ++ gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ ++ gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ ++ gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ ++ gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ ++ gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \ ++ gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \ ++ gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \ ++ gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \ ++ gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo ++am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \ ++ gtkprinteroption.lo gtkprinteroptionset.lo \ ++ gtkprinteroptionwidget.lo gtkprintjob.lo \ ++ gtkprintoperation-unix.lo gtkprintunixdialog.lo \ ++ gtkprintbackend.lo gtksearchenginebeagle.lo \ ++ gtksearchenginetracker.lo ++@OS_UNIX_TRUE@am__objects_4 = $(am__objects_3) ++am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo ++@OS_WIN32_TRUE@am__objects_6 = $(am__objects_5) ++am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \ ++ gtktrayicon-x11.lo ++@USE_X11_TRUE@am__objects_8 = $(am__objects_7) ++am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \ ++ gtkwin32embedwidget.lo ++@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) ++am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ ++ gtksocket-stub.lo ++@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = $(am__objects_11) ++am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo ++@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = $(am__objects_13) ++am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ ++ $(am__objects_8) $(am__objects_10) $(am__objects_12) \ ++ $(am__objects_14) ++am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) ++libgtk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) ++libgtk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) ++libgtk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) ++libgtk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) ++am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) ++gtk_query_immodules_2_0_OBJECTS = \ ++ $(am_gtk_query_immodules_2_0_OBJECTS) ++am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) ++am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT) ++gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS) ++gtk_update_icon_cache_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgtk_directfb_2_0_la_SOURCES) \ ++ $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) \ ++ $(libgtk_x11_2_0_la_SOURCES) \ ++ $(gtk_query_immodules_2_0_SOURCES) \ ++ $(gtk_update_icon_cache_SOURCES) ++DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ ++ $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ ++ $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ ++ $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ ++ $(gtk_query_immodules_2_0_SOURCES) \ ++ $(gtk_update_icon_cache_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++DATA = $(noinst_DATA) ++gtkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++am__gtkunixprintinclude_HEADERS_DIST = gtkpagesetupunixdialog.h \ ++ gtkprintunixdialog.h gtkprinter.h gtkprintjob.h gtkunixprint.h ++gtkunixprintincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AS = @AS@ ++ATK_PREFIX = @ATK_PREFIX@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ ++BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ ++CAIRO_PREFIX = @CAIRO_PREFIX@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ ++CCASFLAGS = @CCASFLAGS@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CUPS_API_MAJOR = @CUPS_API_MAJOR@ ++CUPS_API_MINOR = @CUPS_API_MINOR@ ++CUPS_CFLAGS = @CUPS_CFLAGS@ ++CUPS_CONFIG = @CUPS_CONFIG@ ++CUPS_LIBS = @CUPS_LIBS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DB2HTML = @DB2HTML@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++GAIL_INET_LIBS = @GAIL_INET_LIBS@ ++GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ ++GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ ++GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ ++GDK_DEP_LIBS = @GDK_DEP_LIBS@ ++GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ ++GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ ++GDK_PACKAGES = @GDK_PACKAGES@ ++GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ ++GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ ++GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ ++GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ ++GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ ++GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ ++GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ ++GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ ++GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ ++GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ ++GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ ++GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ ++GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ ++GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ ++GDK_WLIBS = @GDK_WLIBS@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ ++GLIB_MKENUMS = @GLIB_MKENUMS@ ++GLIB_PREFIX = @GLIB_PREFIX@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ ++GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTK_API_VERSION = @GTK_API_VERSION@ ++GTK_BINARY_AGE = @GTK_BINARY_AGE@ ++GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ ++GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ ++GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ ++GTK_DEP_LIBS = @GTK_DEP_LIBS@ ++GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ ++GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ ++GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ ++GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ ++GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ ++GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ ++GTK_PACKAGES = @GTK_PACKAGES@ ++GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ ++GTK_VERSION = @GTK_VERSION@ ++GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ ++HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ ++HTML_DIR = @HTML_DIR@ ++INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ ++INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ ++INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ ++INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ ++INDENT = @INDENT@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++LDFLAGS = @LDFLAGS@ ++LIBJASPER = @LIBJASPER@ ++LIBJPEG = @LIBJPEG@ ++LIBOBJS = @LIBOBJS@ ++LIBPNG = @LIBPNG@ ++LIBS = @LIBS@ ++LIBTIFF = @LIBTIFF@ ++LIBTOOL = @LIBTOOL@ ++LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ ++LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ ++LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PANGO_PREFIX = @PANGO_PREFIX@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PERL = @PERL@ ++PKG_CONFIG = @PKG_CONFIG@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++RANLIB = @RANLIB@ ++REBUILD = @REBUILD@ ++REBUILD_PNGS = @REBUILD_PNGS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++WINDRES = @WINDRES@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++XMLCATALOG = @XMLCATALOG@ ++XML_CATALOG_FILE = @XML_CATALOG_FILE@ ++XSLTPROC = @XSLTPROC@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gdktarget = @gdktarget@ ++gdktargetlib = @gdktargetlib@ ++gtktargetlib = @gtktargetlib@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++ms_librarian = @ms_librarian@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++GTESTER = gtester # in $PATH for non-GLIB packages ++GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + ++# initialize variables for unconditional += appending ++EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) \ ++ $(gtk_built_sources) $(STOCK_ICONS) $(STOCK_ICONS) \ ++ $(GENERATED_ICONS) line-arrow.xbm line-wrap.xbm tree_plus.xbm \ ++ tree_minus.xbm tree_minus.xpm tree_plus.xpm gtk.def \ ++ gtk-builder-convert gtk-win32.rc gtk-win32.rc.in \ ++ gtkwin32embed.h gtkwin32embedwidget.h gtkwin32embedwidget.c \ ++ gtkprint-win32.h gtkprint-win32.c gtksearchenginequartz.h \ ++ gtkrc.default gtkrc.key.default gtkrc.key.emacs makefile.msc \ ++ makefile.msc.in makegtkalias.pl aliasfilescheck.sh abicheck.sh \ ++ pltcheck.sh gtktypebuiltins.c.template \ ++ gtktypebuiltins.h.template ++TEST_PROGS = + +-GENERATED_ICONS = \ +- stock-icons/16/gtk-go-back-rtl.png \ +- stock-icons/16/gtk-go-forward-rtl.png \ +- stock-icons/16/gtk-goto-first-rtl.png \ +- stock-icons/16/gtk-goto-last-rtl.png \ +- stock-icons/16/gtk-media-forward-rtl.png \ +- stock-icons/16/gtk-media-next-rtl.png \ +- stock-icons/16/gtk-media-previous-rtl.png \ +- stock-icons/16/gtk-media-rewind-rtl.png \ +- stock-icons/16/gtk-save.png \ +- stock-icons/16/drive-harddisk.png \ +- stock-icons/16/folder.png \ +- stock-icons/16/folder-remote.png \ +- stock-icons/16/user-home.png \ +- stock-icons/16/user-desktop.png \ +- stock-icons/16/text-x-generic.png \ +- stock-icons/24/gtk-go-back-rtl.png \ +- stock-icons/24/gtk-go-forward-rtl.png \ +- stock-icons/24/gtk-goto-first-rtl.png \ +- stock-icons/24/gtk-goto-last-rtl.png \ +- stock-icons/24/gtk-media-forward-rtl.png \ +- stock-icons/24/gtk-media-next-rtl.png \ +- stock-icons/24/gtk-media-previous-rtl.png \ +- stock-icons/24/gtk-media-rewind-rtl.png \ +- stock-icons/24/gtk-save.png \ +- stock-icons/24/drive-harddisk.png \ +- stock-icons/24/folder.png \ +- stock-icons/24/folder-remote.png \ +- stock-icons/24/user-home.png \ +- stock-icons/24/user-desktop.png \ +- stock-icons/24/text-x-generic.png ++### testing rules ++ ++# Xvfb based test rules ++XVFB = Xvfb -ac -noreset -screen 0 800x600x16 ++XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ ++ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ ++ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ ++ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ ++ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ ++ 9995 9996 9997 9998 9999 + ++SKIP_GDKTARGET = \ ++ test "$(gdktarget)" != "x11" \ ++ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." + +-@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) +-@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ +-@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ +-@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache ++XVFB_START = \ ++ ${XVFB} -help 2>/dev/null 1>&2 \ ++ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ ++ && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ ++ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ ++ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ ++ && DISPLAY=:$$XID && export DISPLAY + +-subdir = gtk +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc +-LTLIBRARIES = $(lib_LTLIBRARIES) ++@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" + +-am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ +- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ +- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ +- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ +- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ +- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ +- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c gtkcellrendererspin.c \ +- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ +- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ +- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ +- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ +- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ +- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ +- gtkfilechooserbutton.c gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c gtkfilechooserembed.c \ +- gtkfilechooserentry.c gtkfilechoosersettings.c \ +- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ +- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ +- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ +- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ +- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ +- gtktextbuffer.c gtktextbufferrichtext.c \ +- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ +- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ +- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ +- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ +- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ +- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ +- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ +- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ +- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ +- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ +- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ +- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \ +-@USE_QUARTZ_TRUE@ gtkquartz.lo +-@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo +-am__objects_2 = gtkquery.lo gtksearchengine.lo gtksearchenginesimple.lo \ +- fnmatch.lo gtkaboutdialog.lo gtkaccelgroup.lo gtkaccellabel.lo \ +- gtkaccelmap.lo gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ +- gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ +- gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ +- gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ +- gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \ +- gtkcellrenderer.lo gtkcellrendereraccel.lo \ +- gtkcellrenderercombo.lo gtkcellrendererpixbuf.lo \ +- gtkcellrendererprogress.lo gtkcellrendererspin.lo \ +- gtkcellrenderertext.lo gtkcellrenderertoggle.lo gtkcellview.lo \ +- gtkcheckbutton.lo gtkcheckmenuitem.lo gtkcolorbutton.lo \ +- gtkcolorsel.lo gtkcolorseldialog.lo gtkcombobox.lo \ +- gtkcomboboxentry.lo gtkcontainer.lo gtkcurve.lo gtkdialog.lo \ +- gtkdrawingarea.lo gtkeditable.lo gtkentry.lo \ +- gtkentrycompletion.lo gtkeventbox.lo gtkexpander.lo \ +- gtkfilechooser.lo gtkfilechooserbutton.lo \ +- gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ +- gtkfilechooserembed.lo gtkfilechooserentry.lo \ +- gtkfilechoosersettings.lo gtkfilechooserutils.lo \ +- gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \ +- gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ +- gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ +- gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ +- gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ +- gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ +- gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ +- gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ +- gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \ +- gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \ +- gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \ +- gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ +- gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ +- gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ +- gtknotebook.lo gtkobject.lo gtkpagesetup.lo gtkpaned.lo \ +- gtkpapersize.lo gtkpathbar.lo gtkplug.lo gtkprintcontext.lo \ +- gtkprintoperation.lo gtkprintoperationpreview.lo \ +- gtkprintsettings.lo gtkprintutils.lo gtkprogressbar.lo \ +- gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ +- gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ +- gtkrecentaction.lo gtkrecentchooserdefault.lo \ +- gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ +- gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ +- gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ +- gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ +- gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ +- gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ +- gtksizegroup.lo gtkshow.lo gtksocket.lo gtkspinbutton.lo \ +- gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ +- gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \ +- gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ +- gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ +- gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ +- gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ +- gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \ +- gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \ +- gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \ +- gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \ +- gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ +- gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ +- gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ +- gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ +- gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ +- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ +- gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \ +- gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \ +- gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \ +- gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \ +- gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo +-am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \ +- gtkprinteroption.lo gtkprinteroptionset.lo \ +- gtkprinteroptionwidget.lo gtkprintjob.lo \ +- gtkprintoperation-unix.lo gtkprintunixdialog.lo \ +- gtkprintbackend.lo gtksearchenginebeagle.lo \ +- gtksearchenginetracker.lo +-@OS_UNIX_TRUE@am__objects_4 = $(am__objects_3) +-am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo +-@OS_WIN32_TRUE@am__objects_6 = $(am__objects_5) +-am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \ +- gtktrayicon-x11.lo +-@USE_X11_TRUE@am__objects_8 = $(am__objects_7) +-am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \ +- gtkwin32embedwidget.lo +-@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) +-am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ +- gtksocket-stub.lo +-@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = \ +-@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_11) +-am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo +-@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = \ +-@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_13) +-am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ +- $(am__objects_8) $(am__objects_10) $(am__objects_12) \ +- $(am__objects_14) +-am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) +-am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ +- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ +- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ +- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ +- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ +- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ +- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c gtkcellrendererspin.c \ +- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ +- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ +- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ +- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ +- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ +- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ +- gtkfilechooserbutton.c gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c gtkfilechooserembed.c \ +- gtkfilechooserentry.c gtkfilechoosersettings.c \ +- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ +- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ +- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ +- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ +- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ +- gtktextbuffer.c gtktextbufferrichtext.c \ +- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ +- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ +- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ +- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ +- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ +- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ +- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ +- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ +- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ +- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ +- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ +- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) +-am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ +- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ +- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ +- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ +- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ +- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ +- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c gtkcellrendererspin.c \ +- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ +- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ +- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ +- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ +- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ +- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ +- gtkfilechooserbutton.c gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c gtkfilechooserembed.c \ +- gtkfilechooserentry.c gtkfilechoosersettings.c \ +- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ +- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ +- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ +- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ +- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ +- gtktextbuffer.c gtktextbufferrichtext.c \ +- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ +- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ +- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ +- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ +- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ +- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ +- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ +- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ +- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ +- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ +- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ +- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) +-am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++# Makefile.am for gtk+/gtk ++@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" ++SUBDIRS = theme-bits . tests ++DIST_SUBDIRS = theme-bits tests +@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr +@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups +INCLUDES = \ @@ -43332,19 +49670,21 @@ Index: gtk+-2.12.12/gtk/Makefile.in + -DGTK_COMPILATION \ + -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ + -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ ++ -I$(top_builddir) \ + -I$(top_builddir)/gtk \ + -I$(top_srcdir) -I../gdk \ + -I$(top_srcdir)/gdk \ + -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -+ -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DMAEMO_CHANGES \ + -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ ++ -DGTK_DISABLE_DEPRECATED \ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) \ -+ $(gtk_clipboard_dnd_c_sources_CFLAGS) ++ $(gtk_clipboard_dnd_c_sources_CFLAGS) \ ++ $(INCLUDED_IMMODULE_DEFINE) + +gtarget = $(gdktarget) +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined @@ -43354,17 +49694,16 @@ Index: gtk+-2.12.12/gtk/Makefile.in +@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o +@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib +TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" -+TESTS = aliasfilescheck.sh $(am__append_2) ++TESTS = aliasfilescheck.sh $(am__append_1) ++libgtkincludedir = $(includedir)/gtk-2.0/gtk ++libadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(GTK_DEP_LIBS) \ ++ $(am__append_2) ++deps = $(am__append_3) + +# libtool stuff: set version and export symbols for resolving +# since automake doesn't support conditionalized libsomething_la_LDFLAGS +# we use the general approach here -+libgtkincludedir = $(includedir)/gtk-2.0/gtk -+libadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) $(GTK_DEP_LIBS) \ -+ $(am__append_3) -+ -+# common options for the various packages. +libtool_opts = \ + -version-info $(LT_VERSION_INFO) \ + -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ @@ -43377,215 +49716,78 @@ Index: gtk+-2.12.12/gtk/Makefile.in + +# GTK+ header files for public installation (non-generated, or generated +# by configure) -+gtk_public_h_sources = \ -+ gtk.h \ -+ gtkaboutdialog.h \ -+ gtkaccelgroup.h \ -+ gtkaccellabel.h \ -+ gtkaccelmap.h \ -+ gtkaccessible.h \ -+ gtkaction.h \ -+ gtkactiongroup.h \ -+ gtkadjustment.h \ -+ gtkalignment.h \ -+ gtkarrow.h \ -+ gtkaspectframe.h \ -+ gtkassistant.h \ -+ gtkbbox.h \ -+ gtkbin.h \ -+ gtkbindings.h \ -+ gtkbox.h \ -+ gtkbuilder.h \ -+ gtkbuildable.h \ -+ gtkbutton.h \ -+ gtkcalendar.h \ -+ gtkcelleditable.h \ -+ gtkcelllayout.h \ -+ gtkcellrenderer.h \ -+ gtkcellrendereraccel.h \ -+ gtkcellrenderercombo.h \ -+ gtkcellrendererpixbuf.h \ -+ gtkcellrendererprogress.h \ -+ gtkcellrendererspin.h \ -+ gtkcellrenderertext.h \ -+ gtkcellrenderertoggle.h \ -+ gtkcellview.h \ -+ gtkcheckbutton.h \ -+ gtkcheckmenuitem.h \ -+ gtkclipboard.h \ -+ gtkclist.h \ -+ gtkcolorbutton.h \ -+ gtkcolorsel.h \ -+ gtkcolorseldialog.h \ -+ gtkcombo.h \ -+ gtkcombobox.h \ -+ gtkcomboboxentry.h \ -+ gtkcontainer.h \ -+ gtkctree.h \ -+ gtkcurve.h \ -+ gtkdebug.h \ -+ gtkdialog.h \ -+ gtkdnd.h \ -+ gtkdrawingarea.h \ -+ gtkeditable.h \ -+ gtkentry.h \ -+ gtkentrycompletion.h \ -+ gtkenums.h \ -+ gtkeventbox.h \ -+ gtkexpander.h \ -+ gtkfilechooser.h \ -+ gtkfilechooserbutton.h \ -+ gtkfilechooserdialog.h \ -+ gtkfilechooserwidget.h \ -+ gtkfilefilter.h \ -+ gtkfilesel.h \ -+ gtkfixed.h \ -+ gtkfontbutton.h \ -+ gtkfontsel.h \ -+ gtkframe.h \ -+ gtkgamma.h \ -+ gtkgc.h \ -+ gtkhandlebox.h \ -+ gtkhbbox.h \ -+ gtkhbox.h \ -+ gtkhpaned.h \ -+ gtkhruler.h \ -+ gtkhscale.h \ -+ gtkhscrollbar.h \ -+ gtkhseparator.h \ -+ gtkiconfactory.h \ -+ gtkicontheme.h \ -+ gtkiconview.h \ -+ gtkimage.h \ -+ gtkimagemenuitem.h \ -+ gtkimcontext.h \ -+ gtkimcontextsimple.h \ -+ gtkimmodule.h \ -+ gtkimmulticontext.h \ -+ gtkinputdialog.h \ -+ gtkinvisible.h \ -+ gtkitem.h \ -+ gtkitemfactory.h \ -+ gtklabel.h \ -+ gtklayout.h \ -+ gtklinkbutton.h \ -+ gtklist.h \ -+ gtklistitem.h \ -+ gtkliststore.h \ -+ gtkmain.h \ -+ gtkmenu.h \ -+ gtkmenubar.h \ -+ gtkmenuitem.h \ -+ gtkmenushell.h \ -+ gtkmenutoolbutton.h \ -+ gtkmessagedialog.h \ -+ gtkmisc.h \ -+ gtkmodules.h \ -+ gtknotebook.h \ -+ gtkobject.h \ -+ gtkoldeditable.h \ -+ gtkoptionmenu.h \ -+ gtkpagesetup.h \ -+ gtkpaned.h \ -+ gtkpapersize.h \ -+ gtkpixmap.h \ -+ gtkplug.h \ -+ gtkpreview.h \ -+ gtkprintcontext.h \ -+ gtkprintoperation.h \ -+ gtkprintoperationpreview.h \ -+ gtkprintsettings.h \ -+ gtkprivate.h \ -+ gtkprogress.h \ -+ gtkprogressbar.h \ -+ gtkradioaction.h \ -+ gtkradiobutton.h \ -+ gtkradiomenuitem.h \ -+ gtkradiotoolbutton.h \ -+ gtkrange.h \ -+ gtkrc.h \ -+ gtkrecentaction.h \ -+ gtkrecentchooser.h \ -+ gtkrecentchooserdialog.h \ -+ gtkrecentchoosermenu.h \ -+ gtkrecentchooserwidget.h \ -+ gtkrecentfilter.h \ -+ gtkrecentmanager.h \ -+ gtkruler.h \ -+ gtkscale.h \ -+ gtkscalebutton.h \ -+ gtkscrollbar.h \ -+ gtkscrolledwindow.h \ -+ gtkselection.h \ -+ gtkseparator.h \ -+ gtkseparatormenuitem.h \ -+ gtkseparatortoolitem.h \ -+ gtksettings.h \ -+ gtksignal.h \ -+ gtksizegroup.h \ -+ gtksocket.h \ -+ gtkspinbutton.h \ -+ gtkstatusbar.h \ -+ gtkstatusicon.h \ -+ gtkstock.h \ -+ gtkstyle.h \ -+ gtktable.h \ -+ gtktearoffmenuitem.h \ -+ gtktext.h \ -+ gtktextbuffer.h \ -+ gtktextbufferrichtext.h \ -+ gtktextchild.h \ -+ gtktextdisplay.h \ -+ gtktextiter.h \ -+ gtktextmark.h \ -+ gtktexttag.h \ -+ gtktexttagtable.h \ -+ gtktextview.h \ -+ gtktipsquery.h \ -+ gtktoggleaction.h \ -+ gtktogglebutton.h \ -+ gtktoggletoolbutton.h \ -+ gtktoolbar.h \ -+ gtktoolbutton.h \ -+ gtktoolitem.h \ -+ gtktooltip.h \ -+ gtktooltips.h \ -+ gtktree.h \ -+ gtktreednd.h \ -+ gtktreeitem.h \ -+ gtktreemodel.h \ -+ gtktreemodelfilter.h \ -+ gtktreemodelsort.h \ -+ gtktreeselection.h \ -+ gtktreesortable.h \ -+ gtktreestore.h \ -+ gtktreeview.h \ -+ gtktreeviewcolumn.h \ -+ gtktypeutils.h \ -+ gtkuimanager.h \ -+ gtkvbbox.h \ -+ gtkvbox.h \ -+ gtkviewport.h \ -+ gtkvolumebutton.h \ -+ gtkvpaned.h \ -+ gtkvruler.h \ -+ gtkvscale.h \ -+ gtkvscrollbar.h \ -+ gtkvseparator.h \ -+ gtkwidget.h \ -+ gtkwindow.h + ++# Broken ++ ++# Deprecated ++gtk_public_h_sources = gtk.h gtkaboutdialog.h gtkaccelgroup.h \ ++ gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkaction.h \ ++ gtkactiongroup.h gtkadjustment.h gtkalignment.h gtkarrow.h \ ++ gtkaspectframe.h gtkassistant.h gtkbbox.h gtkbin.h \ ++ gtkbindings.h gtkbox.h gtkbuilder.h gtkbuildable.h gtkbutton.h \ ++ gtkcalendar.h gtkcelleditable.h gtkcelllayout.h \ ++ gtkcellrenderer.h gtkcellrendereraccel.h \ ++ gtkcellrenderercombo.h gtkcellrendererpixbuf.h \ ++ gtkcellrendererprogress.h gtkcellrendererspin.h \ ++ gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcellview.h \ ++ gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h \ ++ gtkcolorbutton.h gtkcolorsel.h gtkcolorseldialog.h \ ++ gtkcombobox.h gtkcomboboxentry.h gtkcontainer.h gtkcurve.h \ ++ gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h \ ++ gtkentry.h gtkentrycompletion.h gtkenums.h gtkeventbox.h \ ++ gtkexpander.h gtkfilechooser.h gtkfilechooserbutton.h \ ++ gtkfilechooserdialog.h gtkfilechooserwidget.h gtkfilefilter.h \ ++ gtkfixed.h gtkfontbutton.h gtkfontsel.h gtkframe.h gtkgamma.h \ ++ gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h \ ++ gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h \ ++ gtkhsv.h gtkiconfactory.h gtkicontheme.h gtkiconview.h \ ++ gtkimage.h gtkimagemenuitem.h gtkimcontext.h \ ++ gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h \ ++ gtkinputdialog.h gtkinvisible.h gtkitem.h gtklabel.h \ ++ gtklayout.h gtklinkbutton.h gtkliststore.h gtkmain.h gtkmenu.h \ ++ gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmenutoolbutton.h \ ++ gtkmessagedialog.h gtkmisc.h gtkmodules.h gtkmountoperation.h \ ++ gtknotebook.h gtkobject.h gtkpagesetup.h gtkpaned.h \ ++ gtkpapersize.h gtkplug.h gtkprintcontext.h gtkprintoperation.h \ ++ gtkprintoperationpreview.h gtkprintsettings.h gtkprivate.h \ ++ gtkprogressbar.h gtkradioaction.h gtkradiobutton.h \ ++ gtkradiomenuitem.h gtkradiotoolbutton.h gtkrange.h gtkrc.h \ ++ gtkrecentaction.h gtkrecentchooser.h gtkrecentchooserdialog.h \ ++ gtkrecentchoosermenu.h gtkrecentchooserwidget.h \ ++ gtkrecentfilter.h gtkrecentmanager.h gtkruler.h gtkscale.h \ ++ gtkscalebutton.h gtkscrollbar.h gtkscrolledwindow.h \ ++ gtkselection.h gtkseparator.h gtkseparatormenuitem.h \ ++ gtkseparatortoolitem.h gtkshow.h gtksettings.h gtksizegroup.h \ ++ gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstatusicon.h \ ++ gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h \ ++ gtktestutils.h gtktextbuffer.h gtktextbufferrichtext.h \ ++ gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextmark.h \ ++ gtktexttag.h gtktexttagtable.h gtktextview.h gtktoggleaction.h \ ++ gtktogglebutton.h gtktoggletoolbutton.h gtktoolbar.h \ ++ gtktoolbutton.h gtktoolitem.h gtktoolshell.h gtktooltip.h \ ++ gtktreednd.h gtktreemodel.h gtktreemodelfilter.h \ ++ gtktreemodelsort.h gtktreeselection.h gtktreesortable.h \ ++ gtktreestore.h gtktreeview.h gtktreeviewcolumn.h \ ++ gtktypeutils.h gtkuimanager.h gtkvbbox.h gtkvbox.h \ ++ gtkviewport.h gtkvolumebutton.h gtkvpaned.h gtkvruler.h \ ++ gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h \ ++ gtkwindow.h gtktext.h gtktree.h gtktreeitem.h gtkclist.h \ ++ gtkcombo.h gtkctree.h gtkfilesel.h gtkitemfactory.h gtklist.h \ ++ gtklistitem.h gtkoldeditable.h gtkoptionmenu.h gtkpixmap.h \ ++ gtkpreview.h gtkprogress.h gtksignal.h gtktipsquery.h \ ++ gtktooltips.h +@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ +@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ +@OS_UNIX_TRUE@ gtkprintunixdialog.h \ +@OS_UNIX_TRUE@ gtkprinter.h \ -+@OS_UNIX_TRUE@ gtkprintjob.h ++@OS_UNIX_TRUE@ gtkprintjob.h \ ++@OS_UNIX_TRUE@ gtkunixprint.h + + +# Installed header files without compatibility guarantees +# that are not included in gtk/gtk.h +gtk_semi_private_h_sources = \ -+ gtktextlayout.h \ ++ gtktextlayout.h \ + gtkfilesystem.h \ + gtkfilesystemmodel.h \ + gtkfilechooserprivate.h \ @@ -43598,247 +49800,109 @@ Index: gtk+-2.12.12/gtk/Makefile.in +gtk_private_h_sources = gtksearchenginesimple.h gtkdndcursors.h \ + gtkentryprivate.h gtkbuilderprivate.h gtkfilechooserdefault.h \ + gtkfilechooserembed.h gtkfilechooserentry.h \ -+ gtkfilechoosersettings.h gtkfilesystemunix.h gtkhsv.h \ -+ gtkiconcache.h gtkintl.h gtkkeyhash.h gtkmnemonichash.h \ -+ gtkpathbar.h gtkplugprivate.h gtkprintoperation-private.h \ -+ gtkprintutils.h gtkrbtree.h gtkrecentchooserdefault.h \ -+ gtkrecentchooserprivate.h gtkrecentchooserutils.h \ -+ gtksocketprivate.h gtktextbtree.h gtktextbufferserialize.h \ -+ gtktextchildprivate.h gtktextiterprivate.h \ -+ gtktextmarkprivate.h gtktextsegment.h gtktexttagprivate.h \ -+ gtktexttypes.h gtktextutil.h gtkthemes.h \ ++ gtkfilechoosersettings.h gtkiconcache.h gtkintl.h gtkkeyhash.h \ ++ gtkmnemonichash.h gtkpathbar.h gtkplugprivate.h \ ++ gtkprintoperation-private.h gtkprintutils.h gtkrbtree.h \ ++ gtkrecentchooserdefault.h gtkrecentchooserprivate.h \ ++ gtkrecentchooserutils.h gtksocketprivate.h gtktextbtree.h \ ++ gtktextbufferserialize.h gtktextchildprivate.h \ ++ gtktextiterprivate.h gtktextmarkprivate.h gtktextsegment.h \ ++ gtktexttagprivate.h gtktexttypes.h gtktextutil.h gtkthemes.h \ + gtktoggleactionprivate.h gtktreedatalist.h gtktreeprivate.h \ -+ gtkwindow-decorate.h $(am__append_4) $(am__append_6) \ -+ $(am__append_8) $(am__append_10) $(am__append_12) ++ gtkwindow-decorate.h $(gtk_clipboard_dnd_h_sources) \ ++ $(am__append_4) $(am__append_6) $(am__append_8) \ ++ $(am__append_10) $(am__append_12) + +# GTK+ C sources to build the library from -+gtk_base_c_sources = \ -+ gtkquery.c \ -+ gtksearchengine.c \ -+ gtksearchenginesimple.c \ -+ fnmatch.c \ -+ gtkaboutdialog.c \ -+ gtkaccelgroup.c \ -+ gtkaccellabel.c \ -+ gtkaccelmap.c \ -+ gtkaccessible.c \ -+ gtkaction.c \ -+ gtkactiongroup.c \ -+ gtkadjustment.c \ -+ gtkalignment.c \ -+ gtkarrow.c \ -+ gtkaspectframe.c \ -+ gtkassistant.c \ -+ gtkbbox.c \ -+ gtkbin.c \ -+ gtkbindings.c \ -+ gtkbox.c \ -+ gtkbuildable.c \ -+ gtkbuilder.c \ -+ gtkbuilderparser.c \ -+ gtkbutton.c \ -+ gtkcalendar.c \ -+ gtkcelleditable.c \ -+ gtkcelllayout.c \ -+ gtkcellrenderer.c \ -+ gtkcellrendereraccel.c \ -+ gtkcellrenderercombo.c \ -+ gtkcellrendererpixbuf.c \ -+ gtkcellrendererprogress.c \ -+ gtkcellrendererspin.c \ -+ gtkcellrenderertext.c \ -+ gtkcellrenderertoggle.c \ -+ gtkcellview.c \ -+ gtkcheckbutton.c \ -+ gtkcheckmenuitem.c \ -+ gtkclist.c \ -+ gtkcolorbutton.c \ -+ gtkcolorsel.c \ -+ gtkcolorseldialog.c \ -+ gtkcombo.c \ -+ gtkcombobox.c \ -+ gtkcomboboxentry.c \ -+ gtkcontainer.c \ -+ gtkctree.c \ -+ gtkcurve.c \ -+ gtkdialog.c \ -+ gtkdrawingarea.c \ -+ gtkeditable.c \ -+ gtkentry.c \ -+ gtkentrycompletion.c \ -+ gtkeventbox.c \ -+ gtkexpander.c \ -+ gtkfilechooser.c \ -+ gtkfilechooserbutton.c \ -+ gtkfilechooserdefault.c \ -+ gtkfilechooserdialog.c \ -+ gtkfilechooserembed.c \ -+ gtkfilechooserentry.c \ -+ gtkfilechoosersettings.c \ -+ gtkfilechooserutils.c \ -+ gtkfilechooserwidget.c \ -+ gtkfilefilter.c \ -+ gtkfilesel.c \ -+ gtkfilesystem.c \ -+ gtkfilesystemmodel.c \ -+ gtkfixed.c \ -+ gtkfontbutton.c \ -+ gtkfontsel.c \ -+ gtkframe.c \ -+ gtkgamma.c \ -+ gtkgc.c \ -+ gtkhandlebox.c \ -+ gtkhbbox.c \ -+ gtkhbox.c \ -+ gtkhpaned.c \ -+ gtkhruler.c \ -+ gtkhscale.c \ -+ gtkhscrollbar.c \ -+ gtkhseparator.c \ -+ gtkhsv.c \ -+ gtkiconcache.c \ -+ gtkiconcachevalidator.c \ -+ gtkiconfactory.c \ -+ gtkicontheme.c \ -+ gtkiconview.c \ -+ gtkimage.c \ -+ gtkimagemenuitem.c \ -+ gtkimcontext.c \ -+ gtkimcontextsimple.c \ -+ gtkimmodule.c \ -+ gtkimmulticontext.c \ -+ gtkinputdialog.c \ -+ gtkinvisible.c \ -+ gtkitem.c \ -+ gtkitemfactory.c \ -+ gtkkeyhash.c \ -+ gtklabel.c \ -+ gtklayout.c \ -+ gtklinkbutton.c \ -+ gtklist.c \ -+ gtklistitem.c \ -+ gtkliststore.c \ -+ gtkmain.c \ -+ gtkmarshal.c \ -+ gtkmarshalers.c \ -+ gtkmenu.c \ -+ gtkmenubar.c \ -+ gtkmenuitem.c \ -+ gtkmenushell.c \ -+ gtkmenutoolbutton.c \ -+ gtkmessagedialog.c \ -+ gtkmisc.c \ -+ gtkmnemonichash.c \ -+ gtkmodules.c \ -+ gtknotebook.c \ -+ gtkobject.c \ -+ gtkoldeditable.c \ -+ gtkoptionmenu.c \ -+ gtkpagesetup.c \ -+ gtkpaned.c \ -+ gtkpapersize.c \ -+ gtkpathbar.c \ -+ gtkpixmap.c \ -+ gtkplug.c \ -+ gtkpreview.c \ -+ gtkprintcontext.c \ -+ gtkprintoperation.c \ -+ gtkprintoperationpreview.c \ -+ gtkprintsettings.c \ -+ gtkprintutils.c \ -+ gtkprogress.c \ -+ gtkprogressbar.c \ -+ gtkradioaction.c \ -+ gtkradiobutton.c \ -+ gtkradiomenuitem.c \ -+ gtkradiotoolbutton.c \ -+ gtkrange.c \ -+ gtkrbtree.c \ -+ gtkrc.c \ -+ gtkrecentaction.c \ -+ gtkrecentchooserdefault.c \ -+ gtkrecentchooserdialog.c \ -+ gtkrecentchoosermenu.c \ -+ gtkrecentchooserwidget.c \ -+ gtkrecentchooserutils.c \ -+ gtkrecentchooser.c \ -+ gtkrecentfilter.c \ -+ gtkrecentmanager.c \ -+ gtkruler.c \ -+ gtkscale.c \ -+ gtkscalebutton.c \ -+ gtkscrollbar.c \ -+ gtkscrolledwindow.c \ -+ gtkselection.c \ -+ gtkseparator.c \ -+ gtkseparatormenuitem.c \ -+ gtkseparatortoolitem.c \ -+ gtksettings.c \ -+ gtksignal.c \ -+ gtksizegroup.c \ -+ gtksocket.c \ -+ gtkspinbutton.c \ -+ gtkstatusbar.c \ -+ gtkstatusicon.c \ -+ gtkstock.c \ -+ gtkstyle.c \ -+ gtktable.c \ -+ gtktearoffmenuitem.c \ -+ gtktext.c \ -+ gtktextbtree.c \ -+ gtktextbuffer.c \ -+ gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c\ -+ gtktextchild.c \ -+ gtktextdisplay.c \ -+ gtktextiter.c \ -+ gtktextlayout.c \ -+ gtktextmark.c \ -+ gtktextsegment.c \ -+ gtktexttag.c \ -+ gtktexttagtable.c \ -+ gtktexttypes.c \ -+ gtktextutil.c \ -+ gtktextview.c \ -+ gtkthemes.c \ -+ gtktipsquery.c \ -+ gtktoggleaction.c \ -+ gtktogglebutton.c \ -+ gtktoggletoolbutton.c \ -+ gtktoolbar.c \ -+ gtktoolbutton.c \ -+ gtktoolitem.c \ -+ gtktooltip.c \ -+ gtktooltips.c \ -+ gtktree.c \ -+ gtktreedatalist.c \ -+ gtktreednd.c \ -+ gtktreeitem.c \ -+ gtktreemodel.c \ -+ gtktreemodelfilter.c \ -+ gtktreemodelsort.c \ -+ gtktreeselection.c \ -+ gtktreesortable.c \ -+ gtktreestore.c \ -+ gtktreeview.c \ -+ gtktreeviewcolumn.c \ -+ gtktypebuiltins.c \ -+ gtktypeutils.c \ -+ gtkuimanager.c \ -+ gtkvbbox.c \ -+ gtkvbox.c \ -+ gtkvolumebutton.c \ -+ gtkviewport.c \ -+ gtkvpaned.c \ -+ gtkvruler.c \ -+ gtkvscale.c \ -+ gtkvscrollbar.c \ -+ gtkvseparator.c \ -+ gtkwidget.c \ -+ gtkwindow-decorate.c \ -+ gtkwindow.c \ -+ $(gtk_clipboard_dnd_c_sources) -+ ++gtk_base_c_sources = gtkquery.c gtksearchengine.c \ + gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ + gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ + gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +@@ -1830,25 +1024,26 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk + gtkfilechooserdialog.c gtkfilechooserembed.c \ + gtkfilechooserentry.c gtkfilechoosersettings.c \ + gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ + gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ + gtkrecentchooserwidget.c gtkrecentchooserutils.c \ + gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +@@ -1856,8 +1051,8 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk + gtkscrolledwindow.c gtkselection.c gtkseparator.c \ + gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ + gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ + gtktextbuffer.c gtktextbufferrichtext.c \ + gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ + gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +@@ -1872,370 +1067,501 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk + gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ + gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ + gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) +-bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ +- gtk-update-icon-cache$(EXEEXT) +-PROGRAMS = $(bin_PROGRAMS) ++ $(gtk_clipboard_dnd_c_sources) gtktext.c gtktree.c \ ++ gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c \ ++ gtkitemfactory.c gtklist.c gtklistitem.c gtkoldeditable.c \ ++ gtkoptionmenu.c gtkpixmap.c gtkpreview.c gtkprogress.c \ ++ gtksignal.c gtktipsquery.c gtktooltips.c +gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) \ + $(am__append_9) $(am__append_11) $(am__append_13) \ + $(am__append_14) @@ -43847,7 +49911,6 @@ Index: gtk+-2.12.12/gtk/Makefile.in + $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) \ + $(gtk_use_stub_c_sources) +gtk_os_unix_c_sources = \ -+ gtkfilesystemunix.c \ + gtkpagesetupunixdialog.c \ + gtkprinter.c \ + gtkprinteroption.c \ @@ -43859,120 +49922,6 @@ Index: gtk+-2.12.12/gtk/Makefile.in + gtkprintbackend.c \ + gtksearchenginebeagle.c \ + gtksearchenginetracker.c -+ -+gtk_os_win32_c_sources = \ -+ gtkfilesystemwin32.c \ -+ gtkprint-win32.c \ -+ gtkprintoperation-win32.c -+ -+gtk_use_x11_c_sources = \ -+ gtkplug-x11.c \ -+ gtksocket-x11.c \ -+ gtkxembed.c \ -+ gtktrayicon-x11.c -+ -+gtk_use_win32_c_sources = \ -+ gtkplug-win32.c \ -+ gtksocket-win32.c \ -+ gtkwin32embed.c \ -+ gtkwin32embedwidget.c -+ -+gtk_use_quartz_c_sources = \ -+ gtksearchenginequartz.c \ -+ gtkplug-stub.c \ - gtksocket-stub.c --am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) --libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) --@OS_UNIX_TRUE@libgtk_x11_2_0_la_DEPENDENCIES = \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_TRUE@ $(top_builddir)/gdk/$(gdktargetlib) \ --@OS_UNIX_TRUE@ xdgmime/libxdgmime.la --@OS_UNIX_FALSE@libgtk_x11_2_0_la_DEPENDENCIES = \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ --@OS_UNIX_FALSE@ $(top_builddir)/gdk/$(gdktargetlib) --am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -- gtkcellrendererprogress.c gtkcellrendererspin.c \ -- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombo.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkctree.c gtkcurve.c \ -- gtkdialog.c gtkdrawingarea.c gtkeditable.c gtkentry.c \ -- gtkentrycompletion.c gtkeventbox.c gtkexpander.c \ -- gtkfilechooser.c gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesel.c gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -- gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -- gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -- gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -- gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -- gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -- gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -- gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -- gtkitemfactory.c gtkkeyhash.c gtklabel.c gtklayout.c \ -- gtklinkbutton.c gtklist.c gtklistitem.c gtkliststore.c \ -- gtkmain.c gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ -- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ -- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ -- gtknotebook.c gtkobject.c gtkoldeditable.c gtkoptionmenu.c \ -- gtkpagesetup.c gtkpaned.c gtkpapersize.c gtkpathbar.c \ -- gtkpixmap.c gtkplug.c gtkpreview.c gtkprintcontext.c \ -- gtkprintoperation.c gtkprintoperationpreview.c \ -- gtkprintsettings.c gtkprintutils.c gtkprogress.c \ -- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ -- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ -- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ -- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -- gtksignal.c gtksizegroup.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktext.c gtktextbtree.c gtktextbuffer.c \ -- gtktextbufferrichtext.c gtktextbufferserialize.c gtktextchild.c \ -- gtktextdisplay.c gtktextiter.c gtktextlayout.c gtktextmark.c \ -- gtktextsegment.c gtktexttag.c gtktexttagtable.c gtktexttypes.c \ -- gtktextutil.c gtktextview.c gtkthemes.c gtktipsquery.c \ -- gtktoggleaction.c gtktogglebutton.c gtktoggletoolbutton.c \ -- gtktoolbar.c gtktoolbutton.c gtktoolitem.c gtktooltip.c \ -- gtktooltips.c gtktree.c gtktreedatalist.c gtktreednd.c \ -- gtktreeitem.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h \ -- gtkclipboard.c gtkdnd.c gtkfilesystemunix.c \ -- gtkpagesetupunixdialog.c gtkprinter.c gtkprinteroption.c \ -- gtkprinteroptionset.c gtkprinteroptionwidget.c gtkprintjob.c \ -- gtkprintoperation-unix.c gtkprintunixdialog.c gtkprintbackend.c \ -- gtksearchenginebeagle.c gtksearchenginetracker.c \ -- gtkfilesystemwin32.c gtkprint-win32.c gtkprintoperation-win32.c \ -- gtkplug-x11.c gtksocket-x11.c gtkxembed.c gtktrayicon-x11.c \ -- gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c \ -- gtkwin32embedwidget.c gtksearchenginequartz.c gtkplug-stub.c \ -+ -+gtk_use_stub_c_sources = \ -+ gtkplug-stub.c \ - gtksocket-stub.c --am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) --libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) --bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ -- gtk-update-icon-cache$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) -am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) -gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS) @@ -43983,17 +49932,15 @@ Index: gtk+-2.12.12/gtk/Makefile.in - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -gtk_update_icon_cache_LDFLAGS = -SCRIPTS = $(bin_SCRIPTS) -+@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" -+@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c -+@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c gtkquartz.h -+@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = -+@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" ++gtk_os_win32_c_sources = \ ++ gtkprint-win32.c \ ++ gtkprintoperation-win32.c -+# we use our own built_sources variable rules to avoid automake's -+# BUILT_SOURCES oddities -+# we generate frequently rebuild files piggyback on a stamp file, so sources -+# depending on them only get rebuild when the built source actually changed -+# content ++gtk_use_x11_c_sources = \ ++ gtkplug-x11.c \ ++ gtksocket-x11.c \ ++ gtkxembed.c \ ++ gtktrayicon-x11.c -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -44064,8 +50011,6 @@ Index: gtk+-2.12.12/gtk/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesel.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystem.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystemmodel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystemunix.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystemwin32.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkfixed.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkfontbutton.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkfontsel.Plo ./$(DEPDIR)/gtkframe.Plo \ @@ -44106,6 +50051,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gtkmisc.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkmnemonichash.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkmodules.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmountoperation.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtknotebook.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkobject.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkoldeditable.Plo \ @@ -44166,7 +50112,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparator.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparatormenuitem.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparatortoolitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksettings.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksettings.Plo ./$(DEPDIR)/gtkshow.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtksignal.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtksizegroup.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-stub.Plo \ @@ -44179,6 +50125,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gtkstock.Plo ./$(DEPDIR)/gtkstyle.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktable.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktearoffmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktestutils.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktext.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbtree.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbuffer.Plo \ @@ -44203,6 +50150,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolbar.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolbutton.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolshell.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktooltip.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktooltips.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/gtktrayicon-x11.Plo \ @@ -44243,29 +50191,58 @@ Index: gtk+-2.12.12/gtk/Makefile.in -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ -- $(am__libgtk_linux_fb_2_0_la_SOURCES_DIST) \ - $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ - $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ - $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ - $(gtk_query_immodules_2_0_SOURCES) \ - $(gtk_update_icon_cache_SOURCES) -DATA = $(noinst_DATA) ++gtk_use_win32_c_sources = \ ++ gtkplug-win32.c \ ++ gtksocket-win32.c \ ++ gtkwin32embed.c \ ++ gtkwin32embedwidget.c + +-HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) ++gtk_use_quartz_c_sources = \ ++ gtksearchenginequartz.c \ ++ gtkplug-stub.c \ ++ gtksocket-stub.c ++ ++gtk_use_stub_c_sources = \ ++ gtkplug-stub.c \ ++ gtksocket-stub.c ++ ++@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" ++@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c ++@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c ++@USE_QUARTZ_TRUE@gtk_clipboard_dnd_h_sources = gtkquartz.h ++@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = ++@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" ++ ++# we use our own built_sources variable rules to avoid automake's ++# BUILT_SOURCES oddities ++# we generate frequently rebuild files piggyback on a stamp file, so sources ++# depending on them only get rebuild when the built source actually changed ++# content ++ +# built sources that get installed with the header files +gtk_built_public_sources = \ + gtkmarshal.h \ + gtktypebuiltins.h - --HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) - ++ ++ +# built headers that don't get installed +gtk_built_private_headers = \ + gtkalias.h \ + gtkmarshalers.h \ -+ gtkbuiltincache.h ++ gtkbuiltincache.h \ ++ gtkimcontextsimpleseqs.h + +gtk_built_sources = \ + gtkaliasdef.c \ + gtktypebuiltins.c \ ++ gtktypefuncs.c \ + gtkmarshalers.c \ + gtkmarshal.c \ + ${gtk_built_private_headers} \ @@ -44297,22 +50274,12 @@ Index: gtk+-2.12.12/gtk/Makefile.in +# +MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) +EXTRA_HEADERS = -+EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources) \ -+ $(gtk_built_sources) $(STOCK_ICONS) $(STOCK_ICONS) \ -+ $(GENERATED_ICONS) line-arrow.xbm line-wrap.xbm tree_plus.xbm \ -+ tree_minus.xbm tree_minus.xpm tree_plus.xpm gtk.def \ -+ gtk-builder-convert gtk-win32.rc gtk-win32.rc.in \ -+ gtkwin32embed.h gtkwin32embedwidget.h gtkwin32embedwidget.c \ -+ gtkfilesystemwin32.h gtkfilesystemwin32.c gtkprint-win32.h \ -+ gtkprint-win32.c gtksearchenginequartz.h gtkrc.default \ -+ gtkrc.key.default gtkrc.key.emacs makefile.msc makefile.msc.in \ -+ makegtkalias.pl aliasfilescheck.sh abicheck.sh pltcheck.sh + +# +# rules to generate built sources +# +# setup autogeneration dependencies -+gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc ++gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf +CLEANFILES = $(gen_sources) +BUILT_SOURCES = $(gtk_built_sources) + @@ -44323,23 +50290,23 @@ Index: gtk+-2.12.12/gtk/Makefile.in +gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk +gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) +libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) -+libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources) +libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) +libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) +libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) +libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) -+libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts) +libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid +libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) +libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) +libgtk_x11_2_0_la_LIBADD = $(libadd) -+libgtk_linux_fb_2_0_la_LIBADD = $(libadd) +libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) +libgtk_quartz_2_0_la_LIBADD = $(libadd) +libgtk_directfb_2_0_la_LIBADD = $(libadd) ++libgtk_x11_2_0_la_DEPENDENCIES = $(deps) ++libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) ++libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) ++libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) +@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) -+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-linux-fb-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la ++EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la +DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) +TEST_DEPS = $(DEPS) gtk.immodules +LDADDS = \ @@ -44410,10 +50377,15 @@ Index: gtk+-2.12.12/gtk/Makefile.in + stock-icons/16/gtk-network.png \ + stock-icons/16/gtk-new.png \ + stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-page-setup.png \ + stock-icons/16/gtk-paste.png \ + stock-icons/16/gtk-preferences.png \ + stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-paused.png \ + stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-warning.png \ + stock-icons/16/gtk-properties.png \ + stock-icons/16/gtk-quit.png \ + stock-icons/16/gtk-redo-ltr.png \ @@ -44451,6 +50423,10 @@ Index: gtk+-2.12.12/gtk/Makefile.in + stock-icons/20/gtk-no.png \ + stock-icons/20/gtk-ok.png \ + stock-icons/20/gtk-yes.png \ ++ stock-icons/24/audio-volume-high.png \ ++ stock-icons/24/audio-volume-low.png \ ++ stock-icons/24/audio-volume-medium.png \ ++ stock-icons/24/audio-volume-muted.png \ + stock-icons/24/document-open-recent.png \ + stock-icons/24/gtk-about.png \ + stock-icons/24/gtk-add.png \ @@ -44511,10 +50487,15 @@ Index: gtk+-2.12.12/gtk/Makefile.in + stock-icons/24/gtk-orientation-landscape.png \ + stock-icons/24/gtk-orientation-reverse-portrait.png \ + stock-icons/24/gtk-orientation-portrait.png \ ++ stock-icons/24/gtk-page-setup.png \ + stock-icons/24/gtk-paste.png \ + stock-icons/24/gtk-preferences.png \ + stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-paused.png \ + stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-warning.png \ + stock-icons/24/gtk-properties.png \ + stock-icons/24/gtk-quit.png \ + stock-icons/24/gtk-redo-ltr.png \ @@ -44553,7 +50534,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in + stock-icons/48/gtk-dialog-info.png \ + stock-icons/48/gtk-dialog-question.png \ + stock-icons/48/gtk-dialog-warning.png -+ + +GENERATED_ICONS = \ + stock-icons/16/gtk-go-back-rtl.png \ + stock-icons/16/gtk-go-forward-rtl.png \ @@ -44564,6 +50545,12 @@ Index: gtk+-2.12.12/gtk/Makefile.in + stock-icons/16/gtk-media-previous-rtl.png \ + stock-icons/16/gtk-media-rewind-rtl.png \ + stock-icons/16/gtk-save.png \ ++ stock-icons/16/drive-harddisk.png \ ++ stock-icons/16/folder.png \ ++ stock-icons/16/folder-remote.png \ ++ stock-icons/16/user-home.png \ ++ stock-icons/16/user-desktop.png \ ++ stock-icons/16/text-x-generic.png \ + stock-icons/24/gtk-go-back-rtl.png \ + stock-icons/24/gtk-go-forward-rtl.png \ + stock-icons/24/gtk-goto-first-rtl.png \ @@ -44572,7 +50559,13 @@ Index: gtk+-2.12.12/gtk/Makefile.in + stock-icons/24/gtk-media-next-rtl.png \ + stock-icons/24/gtk-media-previous-rtl.png \ + stock-icons/24/gtk-media-rewind-rtl.png \ -+ stock-icons/24/gtk-save.png ++ stock-icons/24/gtk-save.png \ ++ stock-icons/24/drive-harddisk.png \ ++ stock-icons/24/folder.png \ ++ stock-icons/24/folder-remote.png \ ++ stock-icons/24/user-home.png \ ++ stock-icons/24/user-desktop.png \ ++ stock-icons/24/text-x-generic.png -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ @@ -44580,9 +50573,9 @@ Index: gtk+-2.12.12/gtk/Makefile.in - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) \ -- $(srcdir)/Makefile.in Makefile.am gtk-win32.rc.in \ -- gtkversion.h.in makefile.msc.in --SOURCES = $(libgtk_directfb_2_0_la_SOURCES) $(libgtk_linux_fb_2_0_la_SOURCES) $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) $(libgtk_x11_2_0_la_SOURCES) $(gtk_query_immodules_2_0_SOURCES) $(gtk_update_icon_cache_SOURCES) +- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl Makefile.am \ +- gtk-win32.rc.in gtkversion.h.in makefile.msc.in +-SOURCES = $(libgtk_directfb_2_0_la_SOURCES) $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) $(libgtk_x11_2_0_la_SOURCES) $(gtk_query_immodules_2_0_SOURCES) $(gtk_update_icon_cache_SOURCES) +@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ +@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ +@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache @@ -44593,8 +50586,8 @@ Index: gtk+-2.12.12/gtk/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -44673,9 +50666,6 @@ Index: gtk+-2.12.12/gtk/Makefile.in libgtk-directfb-2.0.la: $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_DEPENDENCIES) - $(LINK) $(libgtk_directfb_2_0_la_LDFLAGS) $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_LIBADD) $(LIBS) + $(libgtk_directfb_2_0_la_LINK) $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_LIBADD) $(LIBS) - libgtk-linux-fb-2.0.la: $(libgtk_linux_fb_2_0_la_OBJECTS) $(libgtk_linux_fb_2_0_la_DEPENDENCIES) -- $(LINK) $(libgtk_linux_fb_2_0_la_LDFLAGS) $(libgtk_linux_fb_2_0_la_OBJECTS) $(libgtk_linux_fb_2_0_la_LIBADD) $(LIBS) -+ $(libgtk_linux_fb_2_0_la_LINK) $(libgtk_linux_fb_2_0_la_OBJECTS) $(libgtk_linux_fb_2_0_la_LIBADD) $(LIBS) libgtk-quartz-2.0.la: $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_DEPENDENCIES) - $(LINK) $(libgtk_quartz_2_0_la_LDFLAGS) $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_LIBADD) $(LIBS) + $(libgtk_quartz_2_0_la_LINK) $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_LIBADD) $(LIBS) @@ -44703,7 +50693,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in else :; fi; \ done -@@ -2225,8 +1883,8 @@ uninstall-binPROGRAMS: +@@ -2243,8 +1569,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -44714,7 +50704,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in done clean-binPROGRAMS: -@@ -2237,20 +1895,19 @@ clean-binPROGRAMS: +@@ -2255,20 +1581,19 @@ clean-binPROGRAMS: done gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES) @rm -f gtk-query-immodules-2.0$(EXEEXT) @@ -44740,7 +50730,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in else :; fi; \ done -@@ -2258,12 +1915,12 @@ uninstall-binSCRIPTS: +@@ -2276,12 +1601,12 @@ uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ @@ -44756,7 +50746,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -2527,82 +2184,64 @@ distclean-compile: +@@ -2547,82 +1872,64 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@ .c.o: @@ -44865,7 +50855,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -2612,7 +2251,13 @@ uninstall-gtkunixprintincludeHEADERS: +@@ -2632,7 +1939,13 @@ uninstall-gtkunixprintincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -44880,7 +50870,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2624,15 +2269,20 @@ $(RECURSIVE_TARGETS): +@@ -2644,15 +1957,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -44905,7 +50895,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2653,7 +2303,7 @@ maintainer-clean-recursive: +@@ -2673,7 +1991,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -44914,7 +50904,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2664,35 +2314,30 @@ ctags-recursive: +@@ -2684,35 +2002,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -44957,7 +50947,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2700,23 +2345,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -2720,23 +2033,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -44990,7 +50980,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2730,9 +2375,9 @@ distclean-tags: +@@ -2750,9 +2063,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -45002,7 +50992,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -2741,25 +2386,25 @@ check-TESTS: $(TESTS) +@@ -2761,25 +2074,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -45038,7 +51028,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in ;; \ esac; \ else \ -@@ -2784,46 +2429,40 @@ check-TESTS: $(TESTS) +@@ -2804,46 +2117,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -45069,7 +51059,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/stock-icons/16 $(distdir)/stock-icons/20 $(distdir)/stock-icons/24 $(distdir)/stock-icons/32 $(distdir)/stock-icons/48 +- $(mkinstalldirs) $(distdir)/.. $(distdir)/stock-icons/16 $(distdir)/stock-icons/20 $(distdir)/stock-icons/24 $(distdir)/stock-icons/32 $(distdir)/stock-icons/48 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -45102,7 +51092,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2836,13 +2475,17 @@ distdir: $(DISTFILES) +@@ -2856,13 +2163,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -45124,7 +51114,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -2857,8 +2500,9 @@ install-binPROGRAMS: install-libLTLIBRAR +@@ -2877,8 +2188,9 @@ install-binPROGRAMS: install-libLTLIBRAR installdirs: installdirs-recursive installdirs-am: @@ -45136,7 +51126,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2880,13 +2524,13 @@ clean-generic: +@@ -2900,13 +2212,13 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -45152,7 +51142,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2896,12 +2540,14 @@ distclean: distclean-recursive +@@ -2916,12 +2228,14 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -45168,7 +51158,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in info: info-recursive info-am: -@@ -2909,15 +2555,23 @@ info-am: +@@ -2929,15 +2243,23 @@ info-am: install-data-am: install-data-local install-gtkincludeHEADERS \ install-gtkunixprintincludeHEADERS @@ -45192,7 +51182,7 @@ Index: gtk+-2.12.12/gtk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2940,35 +2594,33 @@ ps-am: +@@ -2960,35 +2282,34 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-gtkincludeHEADERS \ @@ -45206,24 +51196,23 @@ Index: gtk+-2.12.12/gtk/Makefile.in + install-exec-am install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ -- check-am clean clean-binPROGRAMS clean-generic \ +- check-am check-local clean clean-binPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-recursive ctags \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-TESTS check-am clean clean-binPROGRAMS \ -+ clean-generic clean-libLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ +- ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-local distclean-recursive \ - distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-binPROGRAMS \ -- install-binSCRIPTS install-data install-data-am \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-TESTS check-am check-local clean \ ++ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-local distclean-tags distdir dvi dvi-am html html-am \ ++ info info-am install install-am install-binPROGRAMS \ + install-binSCRIPTS install-data install-data-am \ - install-data-local install-data-recursive install-exec \ - install-exec-am install-exec-recursive \ -+ distclean-libtool distclean-local distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-binPROGRAMS install-binSCRIPTS install-data \ -+ install-data-am install-data-local install-dvi install-dvi-am \ -+ install-exec install-exec-am install-exec-hook \ - install-gtkincludeHEADERS install-gtkunixprintincludeHEADERS \ +- install-gtkincludeHEADERS install-gtkunixprintincludeHEADERS \ - install-info install-info-am install-info-recursive \ - install-libLTLIBRARIES install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ @@ -45232,7 +51221,10 @@ Index: gtk+-2.12.12/gtk/Makefile.in - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ -+ install-html install-html-am install-info install-info-am \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-exec-hook install-gtkincludeHEADERS \ ++ install-gtkunixprintincludeHEADERS install-html \ ++ install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ @@ -45247,12 +51239,12 @@ Index: gtk+-2.12.12/gtk/Makefile.in + uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \ + uninstall-local + # call as: $(XVFB_START) && someprogram - @OS_WIN32_TRUE@gtk-win32-res.o : gtk-win32.rc -Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in +Index: gtk+-2.14.7/gtk/tests/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/gtk/theme-bits/Makefile.in 2008-09-13 02:03:27.000000000 +0200 -+++ gtk+-2.12.12/gtk/theme-bits/Makefile.in 2008-12-09 21:03:27.705715460 +0100 +--- gtk+-2.14.7.orig/gtk/tests/Makefile.in 2009-02-17 23:15:21.099088199 +0100 ++++ gtk+-2.14.7/gtk/tests/Makefile.in 2009-02-21 14:58:45.302582009 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -45265,9 +51257,9 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -45282,15 +51274,893 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,41 @@ POST_INSTALL = : +@@ -37,11 +32,86 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = $(am__EXEEXT_2) + @OS_UNIX_TRUE@am__append_1 = defaultvalue ++subdir = gtk/tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++@OS_UNIX_TRUE@am__EXEEXT_1 = defaultvalue$(EXEEXT) ++am__EXEEXT_2 = testing$(EXEEXT) liststore$(EXEEXT) treestore$(EXEEXT) \ ++ treeview-scrolling$(EXEEXT) recentmanager$(EXEEXT) \ ++ floating$(EXEEXT) object$(EXEEXT) builder$(EXEEXT) \ ++ $(am__EXEEXT_1) textbuffer$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++am_builder_OBJECTS = builder.$(OBJEXT) ++builder_OBJECTS = $(am_builder_OBJECTS) ++builder_DEPENDENCIES = $(progs_ldadd) ++builder_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(builder_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++am_defaultvalue_OBJECTS = defaultvalue.$(OBJEXT) pixbuf-init.$(OBJEXT) ++defaultvalue_OBJECTS = $(am_defaultvalue_OBJECTS) ++defaultvalue_DEPENDENCIES = $(progs_ldadd) ++am_floating_OBJECTS = floating.$(OBJEXT) ++floating_OBJECTS = $(am_floating_OBJECTS) ++floating_DEPENDENCIES = $(progs_ldadd) ++am_liststore_OBJECTS = liststore.$(OBJEXT) ++liststore_OBJECTS = $(am_liststore_OBJECTS) ++liststore_DEPENDENCIES = $(progs_ldadd) ++am_object_OBJECTS = object.$(OBJEXT) pixbuf-init.$(OBJEXT) ++object_OBJECTS = $(am_object_OBJECTS) ++object_DEPENDENCIES = $(progs_ldadd) ++am_recentmanager_OBJECTS = recentmanager.$(OBJEXT) ++recentmanager_OBJECTS = $(am_recentmanager_OBJECTS) ++recentmanager_DEPENDENCIES = $(progs_ldadd) ++am_testing_OBJECTS = testing.$(OBJEXT) ++testing_OBJECTS = $(am_testing_OBJECTS) ++testing_DEPENDENCIES = $(progs_ldadd) ++am_textbuffer_OBJECTS = textbuffer.$(OBJEXT) pixbuf-init.$(OBJEXT) ++textbuffer_OBJECTS = $(am_textbuffer_OBJECTS) ++textbuffer_DEPENDENCIES = $(progs_ldadd) ++am_treestore_OBJECTS = treestore.$(OBJEXT) ++treestore_OBJECTS = $(am_treestore_OBJECTS) ++treestore_DEPENDENCIES = $(progs_ldadd) ++am_treeview_scrolling_OBJECTS = treeview-scrolling.$(OBJEXT) ++treeview_scrolling_OBJECTS = $(am_treeview_scrolling_OBJECTS) ++treeview_scrolling_DEPENDENCIES = $(progs_ldadd) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) \ ++ $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) \ ++ $(recentmanager_SOURCES) $(testing_SOURCES) \ ++ $(textbuffer_SOURCES) $(treestore_SOURCES) \ ++ $(treeview_scrolling_SOURCES) ++DIST_SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) \ ++ $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) \ ++ $(recentmanager_SOURCES) $(testing_SOURCES) \ ++ $(textbuffer_SOURCES) $(treestore_SOURCES) \ ++ $(treeview_scrolling_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -52,22 +122,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -82,8 +147,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -91,10 +154,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +180,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -139,8 +199,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -151,91 +209,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,24 +238,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,8 +257,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -298,28 +268,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -328,22 +280,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -366,6 +321,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -374,16 +330,19 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending + EXTRA_DIST = +- +-TEST_PROGS = testing liststore treestore treeview-scrolling recentmanager floating object builder $(am__append_1) textbuffer ++TEST_PROGS = testing liststore treestore treeview-scrolling \ ++ recentmanager floating object builder $(am__append_1) \ ++ textbuffer + + ### testing rules + +@@ -408,7 +367,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -418,20 +376,16 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + progs_ldadd = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- +-noinst_PROGRAMS = $(TEST_PROGS) + testing_SOURCES = testing.c + testing_LDADD = $(progs_ldadd) + liststore_SOURCES = liststore.c +@@ -466,128 +420,39 @@ defaultvalue_SOURCES = defaultvalue.c pi + defaultvalue_LDADD = $(progs_ldadd) + textbuffer_SOURCES = textbuffer.c pixbuf-init.c + textbuffer_LDADD = $(progs_ldadd) +-subdir = gtk/tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@OS_UNIX_TRUE@noinst_PROGRAMS = testing$(EXEEXT) liststore$(EXEEXT) \ +-@OS_UNIX_TRUE@ treestore$(EXEEXT) treeview-scrolling$(EXEEXT) \ +-@OS_UNIX_TRUE@ recentmanager$(EXEEXT) floating$(EXEEXT) \ +-@OS_UNIX_TRUE@ object$(EXEEXT) builder$(EXEEXT) \ +-@OS_UNIX_TRUE@ defaultvalue$(EXEEXT) textbuffer$(EXEEXT) +-@OS_UNIX_FALSE@noinst_PROGRAMS = testing$(EXEEXT) liststore$(EXEEXT) \ +-@OS_UNIX_FALSE@ treestore$(EXEEXT) treeview-scrolling$(EXEEXT) \ +-@OS_UNIX_FALSE@ recentmanager$(EXEEXT) floating$(EXEEXT) \ +-@OS_UNIX_FALSE@ object$(EXEEXT) builder$(EXEEXT) \ +-@OS_UNIX_FALSE@ textbuffer$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_builder_OBJECTS = builder.$(OBJEXT) +-builder_OBJECTS = $(am_builder_OBJECTS) +-builder_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_defaultvalue_OBJECTS = defaultvalue.$(OBJEXT) pixbuf-init.$(OBJEXT) +-defaultvalue_OBJECTS = $(am_defaultvalue_OBJECTS) +-defaultvalue_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-defaultvalue_LDFLAGS = +-am_floating_OBJECTS = floating.$(OBJEXT) +-floating_OBJECTS = $(am_floating_OBJECTS) +-floating_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-floating_LDFLAGS = +-am_liststore_OBJECTS = liststore.$(OBJEXT) +-liststore_OBJECTS = $(am_liststore_OBJECTS) +-liststore_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-liststore_LDFLAGS = +-am_object_OBJECTS = object.$(OBJEXT) pixbuf-init.$(OBJEXT) +-object_OBJECTS = $(am_object_OBJECTS) +-object_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-object_LDFLAGS = +-am_recentmanager_OBJECTS = recentmanager.$(OBJEXT) +-recentmanager_OBJECTS = $(am_recentmanager_OBJECTS) +-recentmanager_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-recentmanager_LDFLAGS = +-am_testing_OBJECTS = testing.$(OBJEXT) +-testing_OBJECTS = $(am_testing_OBJECTS) +-testing_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-testing_LDFLAGS = +-am_textbuffer_OBJECTS = textbuffer.$(OBJEXT) pixbuf-init.$(OBJEXT) +-textbuffer_OBJECTS = $(am_textbuffer_OBJECTS) +-textbuffer_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-textbuffer_LDFLAGS = +-am_treestore_OBJECTS = treestore.$(OBJEXT) +-treestore_OBJECTS = $(am_treestore_OBJECTS) +-treestore_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-treestore_LDFLAGS = +-am_treeview_scrolling_OBJECTS = treeview-scrolling.$(OBJEXT) +-treeview_scrolling_OBJECTS = $(am_treeview_scrolling_OBJECTS) +-treeview_scrolling_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-treeview_scrolling_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/builder.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/defaultvalue.Po ./$(DEPDIR)/floating.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/liststore.Po ./$(DEPDIR)/object.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-init.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/recentmanager.Po ./$(DEPDIR)/testing.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/textbuffer.Po ./$(DEPDIR)/treestore.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/treeview-scrolling.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) \ +- $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) \ +- $(recentmanager_SOURCES) $(testing_SOURCES) \ +- $(textbuffer_SOURCES) $(treestore_SOURCES) \ +- $(treeview_scrolling_SOURCES) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) $(recentmanager_SOURCES) $(testing_SOURCES) $(textbuffer_SOURCES) $(treestore_SOURCES) $(treeview_scrolling_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -597,37 +462,37 @@ clean-noinstPROGRAMS: + done + builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) + @rm -f builder$(EXEEXT) +- $(LINK) $(builder_LDFLAGS) $(builder_OBJECTS) $(builder_LDADD) $(LIBS) ++ $(builder_LINK) $(builder_OBJECTS) $(builder_LDADD) $(LIBS) + defaultvalue$(EXEEXT): $(defaultvalue_OBJECTS) $(defaultvalue_DEPENDENCIES) + @rm -f defaultvalue$(EXEEXT) +- $(LINK) $(defaultvalue_LDFLAGS) $(defaultvalue_OBJECTS) $(defaultvalue_LDADD) $(LIBS) ++ $(LINK) $(defaultvalue_OBJECTS) $(defaultvalue_LDADD) $(LIBS) + floating$(EXEEXT): $(floating_OBJECTS) $(floating_DEPENDENCIES) + @rm -f floating$(EXEEXT) +- $(LINK) $(floating_LDFLAGS) $(floating_OBJECTS) $(floating_LDADD) $(LIBS) ++ $(LINK) $(floating_OBJECTS) $(floating_LDADD) $(LIBS) + liststore$(EXEEXT): $(liststore_OBJECTS) $(liststore_DEPENDENCIES) + @rm -f liststore$(EXEEXT) +- $(LINK) $(liststore_LDFLAGS) $(liststore_OBJECTS) $(liststore_LDADD) $(LIBS) ++ $(LINK) $(liststore_OBJECTS) $(liststore_LDADD) $(LIBS) + object$(EXEEXT): $(object_OBJECTS) $(object_DEPENDENCIES) + @rm -f object$(EXEEXT) +- $(LINK) $(object_LDFLAGS) $(object_OBJECTS) $(object_LDADD) $(LIBS) ++ $(LINK) $(object_OBJECTS) $(object_LDADD) $(LIBS) + recentmanager$(EXEEXT): $(recentmanager_OBJECTS) $(recentmanager_DEPENDENCIES) + @rm -f recentmanager$(EXEEXT) +- $(LINK) $(recentmanager_LDFLAGS) $(recentmanager_OBJECTS) $(recentmanager_LDADD) $(LIBS) ++ $(LINK) $(recentmanager_OBJECTS) $(recentmanager_LDADD) $(LIBS) + testing$(EXEEXT): $(testing_OBJECTS) $(testing_DEPENDENCIES) + @rm -f testing$(EXEEXT) +- $(LINK) $(testing_LDFLAGS) $(testing_OBJECTS) $(testing_LDADD) $(LIBS) ++ $(LINK) $(testing_OBJECTS) $(testing_LDADD) $(LIBS) + textbuffer$(EXEEXT): $(textbuffer_OBJECTS) $(textbuffer_DEPENDENCIES) + @rm -f textbuffer$(EXEEXT) +- $(LINK) $(textbuffer_LDFLAGS) $(textbuffer_OBJECTS) $(textbuffer_LDADD) $(LIBS) ++ $(LINK) $(textbuffer_OBJECTS) $(textbuffer_LDADD) $(LIBS) + treestore$(EXEEXT): $(treestore_OBJECTS) $(treestore_DEPENDENCIES) + @rm -f treestore$(EXEEXT) +- $(LINK) $(treestore_LDFLAGS) $(treestore_OBJECTS) $(treestore_LDADD) $(LIBS) ++ $(LINK) $(treestore_OBJECTS) $(treestore_LDADD) $(LIBS) + treeview-scrolling$(EXEEXT): $(treeview_scrolling_OBJECTS) $(treeview_scrolling_DEPENDENCIES) + @rm -f treeview-scrolling$(EXEEXT) +- $(LINK) $(treeview_scrolling_LDFLAGS) $(treeview_scrolling_OBJECTS) $(treeview_scrolling_LDADD) $(LIBS) ++ $(LINK) $(treeview_scrolling_OBJECTS) $(treeview_scrolling_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -645,37 +510,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview-scrolling.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -683,26 +536,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -712,23 +554,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -740,29 +582,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -777,7 +613,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -798,7 +633,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -812,24 +647,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -850,18 +695,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/gtk/theme-bits/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gtk/theme-bits/Makefile.in 2009-02-17 23:15:21.051090059 +0100 ++++ gtk+-2.14.7/gtk/theme-bits/Makefile.in 2009-02-21 14:58:45.511082880 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,42 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +noinst_PROGRAMS = decompose-bits$(EXEEXT) +subdir = gtk/theme-bits -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -45326,12 +52196,14 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +75,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +78,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -45348,7 +52220,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +100,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +103,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -45357,7 +52229,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +107,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +110,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -45368,7 +52240,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +130,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +136,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -45376,7 +52248,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +149,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +155,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -45385,7 +52257,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +159,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +165,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -45396,6 +52268,10 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -45407,16 +52283,48 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -45442,7 +52350,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +194,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -45468,7 +52376,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +213,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -45477,7 +52385,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +214,10 @@ SED = @SED@ +@@ -297,28 +224,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -45506,7 +52414,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +236,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -45536,7 +52444,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +267,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +277,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -45544,17 +52452,34 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,57 +276,51 @@ program_transform_name = @program_transf +@@ -373,14 +286,17 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png ++EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png \ ++ radio-13-inconsistent.png + TEST_PROGS = + + ### testing rules +@@ -406,56 +322,46 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ $(GDK_PIXBUF_DEP_CFLAGS) - @@ -45562,8 +52487,6 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in - decompose_bits_SOURCES = decompose-bits.c 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 -subdir = gtk/theme-bits -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -45590,15 +52513,16 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(decompose_bits_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -SOURCES = $(decompose_bits_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -45632,7 +52556,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -388,10 +330,10 @@ clean-noinstPROGRAMS: +@@ -465,10 +371,10 @@ clean-noinstPROGRAMS: done decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES) @rm -f decompose-bits$(EXEEXT) @@ -45645,7 +52569,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -399,37 +341,25 @@ distclean-compile: +@@ -476,37 +382,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompose-bits.Po@am__quote@ .c.o: @@ -45695,7 +52619,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -437,26 +367,15 @@ mostlyclean-libtool: +@@ -514,26 +408,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -45725,7 +52649,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -466,23 +385,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -543,23 +426,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -45758,7 +52682,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -494,28 +413,23 @@ GTAGS: +@@ -571,29 +454,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -45768,6 +52692,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -45800,15 +52725,15 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -529,7 +443,6 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -608,7 +485,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) - installdirs: install: install-am install-exec: install-exec-am -@@ -550,7 +463,7 @@ mostlyclean-generic: +@@ -629,7 +505,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -45817,7 +52742,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -564,24 +477,34 @@ distclean: distclean-am +@@ -643,24 +519,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -45853,7 +52778,7 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -602,18 +525,22 @@ ps: ps-am +@@ -681,18 +567,23 @@ ps: ps-am ps-am: @@ -45862,686 +52787,17 @@ Index: gtk+-2.12.12/gtk/theme-bits/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/gtk/xdgmime/Makefile.in -=================================================================== ---- gtk+-2.12.12.orig/gtk/xdgmime/Makefile.in 2008-09-13 02:03:27.000000000 +0200 -+++ gtk+-2.12.12/gtk/xdgmime/Makefile.in 2008-12-09 21:03:27.841715566 +0100 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ - - @SET_MAKE@ - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,46 @@ POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+noinst_PROGRAMS = test-mime$(EXEEXT) -+subdir = gtk/xdgmime -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libxdgmime_la_LIBADD = -+am_libxdgmime_la_OBJECTS = xdgmime.lo xdgmimealias.lo xdgmimecache.lo \ -+ xdgmimeglob.lo xdgmimeint.lo xdgmimemagic.lo xdgmimeparent.lo -+libxdgmime_la_OBJECTS = $(am_libxdgmime_la_OBJECTS) -+PROGRAMS = $(noinst_PROGRAMS) -+am_test_mime_OBJECTS = test-mime.$(OBJEXT) -+test_mime_OBJECTS = $(am_test_mime_OBJECTS) -+test_mime_DEPENDENCIES = libxdgmime.la -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libxdgmime_la_SOURCES) $(test_mime_SOURCES) -+DIST_SOURCES = $(libxdgmime_la_SOURCES) $(test_mime_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -49,20 +81,17 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +106,6 @@ DATADIRNAME = @DATADIRNAME@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -86,10 +113,6 @@ ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -113,6 +136,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +155,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +165,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +190,15 @@ LTLIBOBJS = @LTLIBOBJS@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +209,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +220,10 @@ SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +232,25 @@ X_CFLAGS = @X_CFLAGS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -320,6 +273,7 @@ libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -328,12 +282,13 @@ program_transform_name = @program_transf - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - INCLUDES = -DXDG_PREFIX=_gtk_xdg -- - noinst_LTLIBRARIES = libxdgmime.la -- - libxdgmime_la_SOURCES = \ - xdgmime.c \ - xdgmime.h \ -@@ -350,72 +305,52 @@ libxdgmime_la_SOURCES = \ - xdgmimeparent.c \ - xdgmimeparent.h - -- --noinst_PROGRAMS = test-mime -- - test_mime_LDADD = libxdgmime.la - test_mime_SOURCES = test-mime.c --subdir = gtk/xdgmime --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libxdgmime_la_LDFLAGS = --libxdgmime_la_LIBADD = --am_libxdgmime_la_OBJECTS = xdgmime.lo xdgmimealias.lo xdgmimecache.lo \ -- xdgmimeglob.lo xdgmimeint.lo xdgmimemagic.lo xdgmimeparent.lo --libxdgmime_la_OBJECTS = $(am_libxdgmime_la_OBJECTS) --noinst_PROGRAMS = test-mime$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am_test_mime_OBJECTS = test-mime.$(OBJEXT) --test_mime_OBJECTS = $(am_test_mime_OBJECTS) --test_mime_DEPENDENCIES = libxdgmime.la --test_mime_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/test-mime.Po ./$(DEPDIR)/xdgmime.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xdgmimealias.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xdgmimecache.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xdgmimeglob.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xdgmimeint.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xdgmimemagic.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xdgmimeparent.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libxdgmime_la_SOURCES) $(test_mime_SOURCES) --DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am --SOURCES = $(libxdgmime_la_SOURCES) $(test_mime_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/xdgmime/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gtk/xdgmime/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libxdgmime.la: $(libxdgmime_la_OBJECTS) $(libxdgmime_la_DEPENDENCIES) -- $(LINK) $(libxdgmime_la_LDFLAGS) $(libxdgmime_la_OBJECTS) $(libxdgmime_la_LIBADD) $(LIBS) -+ $(LINK) $(libxdgmime_la_OBJECTS) $(libxdgmime_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -425,10 +360,10 @@ clean-noinstPROGRAMS: - done - test-mime$(EXEEXT): $(test_mime_OBJECTS) $(test_mime_DEPENDENCIES) - @rm -f test-mime$(EXEEXT) -- $(LINK) $(test_mime_LDFLAGS) $(test_mime_OBJECTS) $(test_mime_LDADD) $(LIBS) -+ $(LINK) $(test_mime_OBJECTS) $(test_mime_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -443,37 +378,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdgmimeparent.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -481,26 +404,15 @@ mostlyclean-libtool: - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -510,23 +422,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -538,28 +450,23 @@ GTAGS: - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -573,7 +480,6 @@ distdir: $(DISTFILES) - check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -594,7 +500,7 @@ mostlyclean-generic: - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -608,24 +514,34 @@ distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -646,19 +562,23 @@ ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - ctags distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am info \ -- info-am install install-am install-data install-data-am \ -- install-exec install-exec-am install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ @@ -46553,12 +52809,721 @@ Index: gtk+-2.12.12/gtk/xdgmime/Makefile.in + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/ltmain.sh + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/install-sh =================================================================== ---- gtk+-2.12.12.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 -+++ gtk+-2.12.12/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 +--- gtk+-2.14.7.orig/install-sh 2009-02-17 23:15:21.023088456 +0100 ++++ gtk+-2.14.7/install-sh 2009-02-21 14:58:40.127084285 +0100 +@@ -1,7 +1,8 @@ + #!/bin/sh +-# + # install - install a program, script, or datafile +-# ++ ++scriptversion=2006-12-25.00 ++ + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the + # following copyright and license. +@@ -38,257 +39,481 @@ + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. It can only install one file at a time, a restriction +-# shared with many OS's install programs. ++# from scratch. + ++nl=' ++' ++IFS=" "" $nl" + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" +- ++doit=${DOITPROG-} ++if test -z "$doit"; then ++ doit_exec=exec ++else ++ doit_exec=$doit ++fi + +-# put in absolute paths if you don't have them in your path; or use env. vars. ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" +- +-transformbasename="" +-transform_arg="" +-instcmd="$mvprog" +-chmodcmd="$chmodprog 0755" +-chowncmd="" +-chgrpcmd="" +-stripcmd="" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} ++ ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' ++ ++posix_mkdir= ++ ++# Desired mode of installed file. ++mode=0755 ++ ++chgrpcmd= ++chmodcmd=$chmodprog ++chowncmd= ++mvcmd=$mvprog + rmcmd="$rmprog -f" +-mvcmd="$mvprog" +-src="" +-dst="" +-dir_arg="" +- +-while [ x"$1" != x ]; do +- case $1 in +- -c) instcmd=$cpprog +- shift +- continue;; +- +- -d) dir_arg=true +- shift +- continue;; +- +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; +- +- -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; +- +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; ++stripcmd= + +- *) if [ x"$src" = x ] +- then +- src=$1 +- else +- # this colon is to work around a 386BSD /bin/sh bug +- : +- dst=$1 +- fi +- shift +- continue;; +- esac +-done ++src= ++dst= ++dir_arg= ++dst_arg= + +-if [ x"$src" = x ] +-then +- echo "$0: no input file specified" >&2 +- exit 1 +-else +- : +-fi ++copy_on_change=false ++no_target_directory= + +-if [ x"$dir_arg" != x ]; then +- dst=$src +- src="" +- +- if [ -d "$dst" ]; then +- instcmd=: +- chmodcmd="" +- else +- instcmd=$mkdirprog +- fi +-else ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... + +-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad +-# if $src (and thus $dsttmp) contains '*'. +- +- if [ -f "$src" ] || [ -d "$src" ] +- then +- : +- else +- echo "$0: $src does not exist" >&2 +- exit 1 +- fi ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. + +- if [ x"$dst" = x ] +- then +- echo "$0: no destination specified" >&2 +- exit 1 +- else +- : +- fi ++Options: ++ --help display this help and exit. ++ --version display version info and exit. + +-# If destination is a directory, append the input filename; if your system +-# does not like double slashes in filenames, you may need to add some logic ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + +- if [ -d "$dst" ] +- then +- dst=$dst/`basename "$src"` +- else +- : +- fi +-fi ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG ++" + +-## this sed command emulates the dirname command +-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ++while test $# -ne 0; do ++ case $1 in ++ -c) ;; + +-# Make sure that the destination directory exists. +-# this part is taken from Noah Friedman's mkinstalldirs script ++ -C) copy_on_change=true;; + +-# Skip lots of stat calls in the usual case. +-if [ ! -d "$dstdir" ]; then +-defaultIFS=' +- ' +-IFS="${IFS-$defaultIFS}" +- +-oIFS=$IFS +-# Some sh's can't handle IFS=/ for some reason. +-IFS='%' +-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS=$oIFS +- +-pathcomp='' +- +-while [ $# -ne 0 ] ; do +- pathcomp=$pathcomp$1 +- shift +- +- if [ ! -d "$pathcomp" ] ; +- then +- $mkdirprog "$pathcomp" +- else +- : +- fi ++ -d) dir_arg=true;; + +- pathcomp=$pathcomp/ +-done +-fi ++ -g) chgrpcmd="$chgrpprog $2" ++ shift;; + +-if [ x"$dir_arg" != x ] +-then +- $doit $instcmd "$dst" && +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi +-else ++ --help) echo "$usage"; exit $?;; + +-# If we're going to rename the final executable, determine the name now. ++ -m) mode=$2 ++ case $mode in ++ *' '* | *' '* | *' ++'* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + +- if [ x"$transformarg" = x ] +- then +- dstfile=`basename "$dst"` +- else +- dstfile=`basename "$dst" $transformbasename | +- sed $transformarg`$transformbasename +- fi ++ -o) chowncmd="$chownprog $2" ++ shift;; + +-# don't allow the sed command to completely eliminate the filename ++ -s) stripcmd=$stripprog;; + +- if [ x"$dstfile" = x ] +- then +- dstfile=`basename "$dst"` +- else +- : +- fi ++ -t) dst_arg=$2 ++ shift;; + +-# Make a couple of temp file names in the proper directory. ++ -T) no_target_directory=true;; + +- dsttmp=$dstdir/_inst.$$_ +- rmtmp=$dstdir/_rm.$$_ ++ --version) echo "$0 $scriptversion"; exit $?;; + +-# Trap to clean up temp files at exit. ++ --) shift ++ break;; + +- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 +- trap '(exit $?); exit' 1 2 13 15 ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; + +-# Move or copy the file name to the temp name ++ *) break;; ++ esac ++ shift ++done + +- $doit $instcmd "$src" "$dsttmp" && ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ done ++fi + +-# and set any options; do chmod last to preserve setuid bits ++if test $# -eq 0; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + +-# If any of these fail, we abort the whole thing. If we want to +-# ignore errors from any of these, just make sure not to ignore +-# errors from the above "$doit $instcmd $src $dsttmp" command. ++if test -z "$dir_arg"; then ++ trap '(exit $?); exit' 1 2 13 15 + +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi + +-# Now remove or move aside any old file at destination location. We try this +-# two ways since rm can't unlink itself on some systems and the destination +-# file might be busy for other reasons. In this case, the final cleanup +-# might fail but the new file should still install successfully. ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? ++ else ++ ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dst_arg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dst_arg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst;; ++ esac + +-{ +- if [ -f "$dstdir/$dstfile" ] +- then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || +- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || +- { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit +- } ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dst_arg: Is a directory" >&2 ++ exit 1 ++ fi ++ dstdir=$dst ++ dst=$dstdir/`basename "$src"` ++ dstdir_status=0 ++ else ++ # Prefer dirname, but fall back on a substitute if dirname fails. ++ dstdir=` ++ (dirname "$dst") 2>/dev/null || ++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$dst" : 'X\(//\)[^/]' \| \ ++ X"$dst" : 'X\(//\)$' \| \ ++ X"$dst" : 'X\(/\)' \| . 2>/dev/null || ++ echo X"$dst" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q' ++ ` ++ ++ test -d "$dstdir" ++ dstdir_status=$? ++ fi ++ fi ++ ++ obsolete_mkdir_used=false ++ ++ if test $dstdir_status != 0; then ++ case $posix_mkdir in ++ '') ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ++ ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac ++ ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode + else +- : ++ mkdir_mode= + fi +-} && + +-# Now rename the file to the real destination. ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writeable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; ++ esac + +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ if ++ $posix_mkdir && ( ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ ) ++ then : ++ else ++ ++ # The umask is ridiculous, or mkdir does not conform to POSIX, ++ # or it failed possibly due to a race condition. Create the ++ # directory the slow way, step by step, checking for races as we go. ++ ++ case $dstdir in ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; ++ esac ++ ++ eval "$initialize_posix_glob" ++ ++ oIFS=$IFS ++ IFS=/ ++ $posix_glob set -f ++ set fnord $dstdir ++ shift ++ $posix_glob set +f ++ IFS=$oIFS ++ ++ prefixes= ++ ++ for d ++ do ++ test -z "$d" && continue ++ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ ++ done + +-fi && ++ if test -n "$prefixes"; then ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true ++ fi ++ fi ++ fi ++ ++ if test -n "$dir_arg"; then ++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 ++ else ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ ++ # Copy the file name to the temp name. ++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || ++ ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 + +-# The final little trick to "correctly" pass the exit status to the exit trap. ++ trap '' 0 ++ fi ++done + +-{ +- (exit 0); exit +-} ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +Index: gtk+-2.14.7/ltmain.sh +=================================================================== +--- gtk+-2.14.7.orig/ltmain.sh 2009-02-17 23:15:20.999087919 +0100 ++++ gtk+-2.14.7/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 @@ -43,7 +43,7 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh @@ -46592,10 +53557,10 @@ Index: gtk+-2.12.12/ltmain.sh esac ;; no) -Index: gtk+-2.12.12/m4macros/Makefile.in +Index: gtk+-2.14.7/m4macros/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/m4macros/Makefile.in 2008-09-13 02:03:27.000000000 +0200 -+++ gtk+-2.12.12/m4macros/Makefile.in 2008-12-09 21:03:28.013214877 +0100 +--- gtk+-2.14.7.orig/m4macros/Makefile.in 2009-02-17 23:15:20.971083871 +0100 ++++ gtk+-2.14.7/m4macros/Makefile.in 2009-02-21 14:58:45.674583478 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -46608,9 +53573,9 @@ Index: gtk+-2.12.12/m4macros/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -46625,14 +53590,15 @@ Index: gtk+-2.12.12/m4macros/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,31 @@ POST_INSTALL = : +@@ -37,10 +32,32 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = m4macros -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -46659,12 +53625,14 @@ Index: gtk+-2.12.12/m4macros/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +65,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -46681,7 +53649,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +90,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -46690,7 +53658,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +97,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -46701,7 +53669,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +120,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -46709,7 +53677,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +139,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -46718,7 +53686,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +149,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -46729,6 +53697,10 @@ Index: gtk+-2.12.12/m4macros/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -46740,16 +53712,48 @@ Index: gtk+-2.12.12/m4macros/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -46775,7 +53779,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -46801,7 +53805,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -46810,7 +53814,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +204,10 @@ SED = @SED@ +@@ -297,28 +214,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -46839,7 +53843,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -46869,7 +53873,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +257,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -46877,7 +53881,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,59 +266,69 @@ program_transform_name = @program_transf +@@ -373,9 +276,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -46887,9 +53891,15 @@ Index: gtk+-2.12.12/m4macros/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - installed_m4 = gtk-2.0.m4 + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,56 +311,63 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + - - EXTRA_DIST = $(installed_m4) + installed_m4 = gtk-2.0.m4 - m4datadir = $(datadir)/aclocal m4data_DATA = $(installed_m4) @@ -46901,12 +53911,13 @@ Index: gtk+-2.12.12/m4macros/Makefile.in -DIST_SOURCES = -DATA = $(m4data_DATA) - --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -46974,7 +53985,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in done tags: TAGS TAGS: -@@ -388,28 +336,23 @@ TAGS: +@@ -463,29 +375,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -46984,6 +53995,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -47016,8 +54028,8 @@ Index: gtk+-2.12.12/m4macros/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -423,9 +366,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -500,9 +406,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) - @@ -47029,7 +54041,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -445,7 +389,7 @@ mostlyclean-generic: +@@ -522,7 +429,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -47038,7 +54050,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -456,24 +400,34 @@ clean-am: clean-generic clean-libtool mo +@@ -533,24 +440,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -47074,7 +54086,7 @@ Index: gtk+-2.12.12/m4macros/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -492,17 +446,21 @@ ps: ps-am +@@ -569,17 +486,22 @@ ps: ps-am ps-am: @@ -47083,31 +54095,30 @@ Index: gtk+-2.12.12/m4macros/Makefile.in + +.MAKE: install-am install-strip - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am info info-am install install-am install-data \ + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-m4dataDATA install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-m4dataDATA install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-m4dataDATA -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-m4dataDATA install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-m4dataDATA ++ uninstall-m4dataDATA - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/Makefile.in 2008-09-13 02:03:24.000000000 +0200 -+++ gtk+-2.12.12/Makefile.in 2008-12-09 21:03:30.525716396 +0100 +--- gtk+-2.14.7.orig/Makefile.in 2009-02-17 23:15:20.915088486 +0100 ++++ gtk+-2.14.7/Makefile.in 2009-02-21 14:58:50.122581688 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -47120,9 +54131,9 @@ Index: gtk+-2.12.12/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -47137,25 +54148,26 @@ Index: gtk+-2.12.12/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,11 +30,70 @@ POST_INSTALL = : +@@ -37,11 +32,71 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ - @OS_UNIX_TRUE@am__append_1 = gtk+-unix-print-2.0.pc -+subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -+ $(srcdir)/config.h.win32.in \ -+ $(srcdir)/gdk-2.0-uninstalled.pc.in $(srcdir)/gdk-2.0.pc.in \ ++ $(srcdir)/config.h.win32.in $(srcdir)/gail-uninstalled.pc.in \ ++ $(srcdir)/gail.pc.in $(srcdir)/gdk-2.0-uninstalled.pc.in \ ++ $(srcdir)/gdk-2.0.pc.in \ + $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in \ + $(srcdir)/gdk-pixbuf-2.0.pc.in \ + $(srcdir)/gtk+-2.0-uninstalled.pc.in $(srcdir)/gtk+-2.0.pc.in \ + $(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \ -+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ -+ acconfig.h compile config.guess config.sub depcomp install-sh \ -+ ltmain.sh missing mkinstalldirs ++ $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \ ++ COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ ++ depcomp install-sh ltmain.sh missing mkinstalldirs + @OS_UNIX_TRUE@am__append_1 = gtk+-unix-print-2.0.pc ++subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -47166,9 +54178,9 @@ Index: gtk+-2.12.12/Makefile.in +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ -+ gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc \ ++ gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ + gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc \ -+ gtk+-2.0-uninstalled.pc ++ gtk+-2.0-uninstalled.pc gail-uninstalled.pc +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -47210,12 +54222,14 @@ Index: gtk+-2.12.12/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -50,20 +104,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +107,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -47232,7 +54246,7 @@ Index: gtk+-2.12.12/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -78,8 +129,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,8 +132,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -47241,7 +54255,7 @@ Index: gtk+-2.12.12/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -87,10 +136,6 @@ ECHO_C = @ECHO_C@ +@@ -91,10 +139,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -47252,7 +54266,7 @@ Index: gtk+-2.12.12/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -114,6 +159,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -121,6 +165,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -47260,7 +54274,7 @@ Index: gtk+-2.12.12/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -132,8 +178,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +184,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -47269,7 +54283,7 @@ Index: gtk+-2.12.12/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -144,55 +188,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,91 +194,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -47280,6 +54294,10 @@ Index: gtk+-2.12.12/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -47291,16 +54309,48 @@ Index: gtk+-2.12.12/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -47326,7 +54376,7 @@ Index: gtk+-2.12.12/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -212,24 +213,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +223,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -47352,7 +54402,7 @@ Index: gtk+-2.12.12/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -240,8 +232,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -285,8 +242,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -47361,7 +54411,7 @@ Index: gtk+-2.12.12/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -253,28 +243,10 @@ SED = @SED@ +@@ -298,28 +253,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -47390,7 +54440,7 @@ Index: gtk+-2.12.12/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -283,22 +255,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -328,22 +265,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -47420,7 +54470,7 @@ Index: gtk+-2.12.12/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -321,6 +296,7 @@ libexecdir = @libexecdir@ +@@ -366,6 +306,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -47428,15 +54478,190 @@ Index: gtk+-2.12.12/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -329,15 +305,19 @@ program_transform_name = @program_transf +@@ -374,122 +315,70 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- HACKING \ +- makecopyright \ +- NEWS.pre-1-0 \ +- ChangeLog.pre-1-0 \ +- ChangeLog.pre-1-2 \ +- ChangeLog.pre-2-0 \ +- ChangeLog.pre-2-2 \ +- ChangeLog.pre-2-4 \ +- ChangeLog.pre-2-6 \ +- ChangeLog.pre-2-8 \ +- ChangeLog.pre-2-10 \ +- ChangeLog.gtk-async-file-chooser \ +- ChangeLog.gtk-printing \ +- README.commits \ +- README.win32 \ +- config.h.win32 \ +- makefile.msc \ +- gtk-zip.sh.in \ +- sanitize-la.sh \ +- po/README.translators \ +- po/po2tbl.sed.in \ +- examples/aspectframe/Makefile \ +- examples/aspectframe/aspectframe.c \ +- examples/Makefile \ +- examples/README.1ST \ +- examples/extract.awk \ +- examples/extract.sh \ +- examples/arrow/Makefile \ +- examples/arrow/arrow.c \ +- examples/base/Makefile \ +- examples/base/base.c \ +- examples/buttonbox/Makefile \ +- examples/buttonbox/buttonbox.c \ +- examples/buttons/Makefile \ +- examples/buttons/buttons.c \ +- examples/buttons/info.xpm \ +- examples/calendar/Makefile \ +- examples/calendar/calendar.c \ +- examples/clist/Makefile \ +- examples/clist/clist.c \ +- examples/entry/Makefile \ +- examples/entry/entry.c \ +- examples/eventbox/Makefile \ +- examples/eventbox/eventbox.c \ +- examples/filesel/Makefile \ +- examples/filesel/filesel.c \ +- examples/gtkdial/Makefile \ +- examples/gtkdial/dial_test.c \ +- examples/gtkdial/gtkdial.c \ +- examples/gtkdial/gtkdial.h \ +- examples/helloworld/Makefile \ +- examples/helloworld/helloworld.c \ +- examples/helloworld2/Makefile \ +- examples/helloworld2/helloworld2.c \ +- examples/label/Makefile \ +- examples/label/label.c \ +- examples/list/Makefile \ +- examples/list/list.c \ +- examples/menu/Makefile \ +- examples/menu/menu.c \ +- examples/menu/itemfactory.c \ +- examples/notebook/Makefile \ +- examples/notebook/notebook.c \ +- examples/packbox/Makefile \ +- examples/packbox/packbox.c \ +- examples/paned/Makefile \ +- examples/paned/paned.c \ +- examples/pixmap/Makefile \ +- examples/pixmap/pixmap.c \ +- examples/progressbar/Makefile \ +- examples/progressbar/progressbar.c \ +- examples/radiobuttons/Makefile \ +- examples/radiobuttons/radiobuttons.c \ +- examples/rangewidgets/Makefile \ +- examples/rangewidgets/rangewidgets.c \ +- examples/rulers/Makefile \ +- examples/rulers/rulers.c \ +- examples/scribble-simple/Makefile \ +- examples/scribble-simple/scribble-simple.c \ +- examples/scribble-xinput/Makefile \ +- examples/scribble-xinput/scribble-xinput.c \ +- examples/scrolledwin/Makefile \ +- examples/scrolledwin/scrolledwin.c \ +- examples/selection/Makefile \ +- examples/selection/gettargets.c \ +- examples/selection/setselection.c \ +- examples/statusbar/Makefile \ +- examples/statusbar/statusbar.c \ +- examples/table/Makefile \ +- examples/table/table.c \ +- examples/text/Makefile \ +- examples/text/text.c \ +- examples/tictactoe/Makefile \ +- examples/tictactoe/tictactoe.c \ +- examples/tictactoe/tictactoe.h \ +- examples/tictactoe/ttt_test.c \ +- examples/tree/Makefile \ +- examples/tree/tree.c \ +- examples/wheelbarrow/Makefile \ +- examples/wheelbarrow/wheelbarrow.c \ +- examples/fixed/fixed.c \ +- examples/fixed/Makefile \ +- examples/frame/frame.c \ +- examples/frame/Makefile \ +- examples/spinbutton/spinbutton.c \ +- examples/spinbutton/Makefile \ +- examples/find-examples.sh +- ++EXTRA_DIST = HACKING makecopyright NEWS.pre-1-0 ChangeLog.pre-1-0 \ ++ ChangeLog.pre-1-2 ChangeLog.pre-2-0 ChangeLog.pre-2-2 \ ++ ChangeLog.pre-2-4 ChangeLog.pre-2-6 ChangeLog.pre-2-8 \ ++ ChangeLog.pre-2-10 ChangeLog.gtk-async-file-chooser \ ++ ChangeLog.gtk-printing README.commits README.win32 \ ++ config.h.win32 makefile.msc gtk-zip.sh.in sanitize-la.sh \ ++ po/README.translators po/po2tbl.sed.in \ ++ examples/aspectframe/Makefile \ ++ examples/aspectframe/aspectframe.c examples/Makefile \ ++ examples/README.1ST examples/extract.awk examples/extract.sh \ ++ examples/arrow/Makefile examples/arrow/arrow.c \ ++ examples/base/Makefile examples/base/base.c \ ++ examples/buttonbox/Makefile examples/buttonbox/buttonbox.c \ ++ examples/buttons/Makefile examples/buttons/buttons.c \ ++ examples/buttons/info.xpm examples/calendar/Makefile \ ++ examples/calendar/calendar.c examples/clist/Makefile \ ++ examples/clist/clist.c examples/entry/Makefile \ ++ examples/entry/entry.c examples/eventbox/Makefile \ ++ examples/eventbox/eventbox.c examples/filesel/Makefile \ ++ examples/filesel/filesel.c examples/gtkdial/Makefile \ ++ examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c \ ++ examples/gtkdial/gtkdial.h examples/helloworld/Makefile \ ++ examples/helloworld/helloworld.c examples/helloworld2/Makefile \ ++ examples/helloworld2/helloworld2.c examples/label/Makefile \ ++ examples/label/label.c examples/list/Makefile \ ++ examples/list/list.c examples/menu/Makefile \ ++ examples/menu/menu.c examples/menu/itemfactory.c \ ++ examples/notebook/Makefile examples/notebook/notebook.c \ ++ examples/packbox/Makefile examples/packbox/packbox.c \ ++ examples/paned/Makefile examples/paned/paned.c \ ++ examples/pixmap/Makefile examples/pixmap/pixmap.c \ ++ examples/progressbar/Makefile \ ++ examples/progressbar/progressbar.c \ ++ examples/radiobuttons/Makefile \ ++ examples/radiobuttons/radiobuttons.c \ ++ examples/rangewidgets/Makefile \ ++ examples/rangewidgets/rangewidgets.c examples/rulers/Makefile \ ++ examples/rulers/rulers.c examples/scribble-simple/Makefile \ ++ examples/scribble-simple/scribble-simple.c \ ++ examples/scribble-xinput/Makefile \ ++ examples/scribble-xinput/scribble-xinput.c \ ++ examples/scrolledwin/Makefile \ ++ examples/scrolledwin/scrolledwin.c examples/selection/Makefile \ ++ examples/selection/gettargets.c \ ++ examples/selection/setselection.c examples/statusbar/Makefile \ ++ examples/statusbar/statusbar.c examples/table/Makefile \ ++ examples/table/table.c examples/text/Makefile \ ++ examples/text/text.c examples/tictactoe/Makefile \ ++ examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h \ ++ examples/tictactoe/ttt_test.c examples/tree/Makefile \ ++ examples/tree/tree.c examples/wheelbarrow/Makefile \ ++ examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c \ ++ examples/fixed/Makefile examples/frame/frame.c \ ++ examples/frame/Makefile examples/spinbutton/spinbutton.c \ ++ examples/spinbutton/Makefile examples/find-examples.sh + TEST_PROGS = + + ### testing rules +@@ -516,17 +405,17 @@ XVFB_START = \ + && DISPLAY=:$$XID && export DISPLAY + -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +# don't build perf measurement tools in static builds @@ -47446,28 +54671,20 @@ Index: gtk+-2.12.12/Makefile.in # require automake 1.4 AUTOMAKE_OPTIONS = 1.7 -- - EXTRA_DIST = \ - HACKING \ - makecopyright \ -@@ -447,12 +427,10 @@ EXTRA_DIST = \ - examples/spinbutton/Makefile \ - examples/find-examples.sh - - GDKTARGET = @gdktarget@ - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc $(am__append_1) +-pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc $(am__append_1) - +pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc \ -+ gtk+-$(GDKTARGET)-2.0.pc $(am__append_1) ++ gtk+-$(GDKTARGET)-2.0.pc gail.pc $(am__append_1) DISTCLEANFILES = \ gtk+-unix-print-2.0.pc \ gtk+-$(GDKTARGET)-2.0.pc \ -@@ -460,91 +438,79 @@ DISTCLEANFILES = \ - gtk+-$(GDKTARGET)-2.0-uninstalled.pc \ - gdk-$(GDKTARGET)-2.0-uninstalled.pc +@@ -537,96 +426,83 @@ DISTCLEANFILES = \ + gail-uninstalled.pc \ + config.lt - DEFAULT_GDKTARGET = x11 @@ -47478,9 +54695,9 @@ Index: gtk+-2.12.12/Makefile.in -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ -- gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc \ +- gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ - gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc \ -- gtk+-2.0-uninstalled.pc +- gtk+-2.0-uninstalled.pc gail-uninstalled.pc -DIST_SOURCES = -DATA = $(pkgconfig_DATA) - @@ -47490,10 +54707,11 @@ Index: gtk+-2.12.12/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ -- COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \ -- acinclude.m4 aclocal.m4 compile config.guess config.h.in \ -- config.h.win32.in config.sub configure.in depcomp \ +-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ +- $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog INSTALL \ +- Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \ +- config.h.in config.h.win32.in config.sub configure configure.in \ +- depcomp gail-uninstalled.pc.in gail.pc.in \ - gdk-2.0-uninstalled.pc.in gdk-2.0.pc.in \ - gdk-pixbuf-2.0-uninstalled.pc.in gdk-pixbuf-2.0.pc.in \ - gtk+-2.0-uninstalled.pc.in gtk+-2.0.pc.in \ @@ -47507,10 +54725,10 @@ Index: gtk+-2.12.12/Makefile.in - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) +am--refresh: + @: -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -47559,8 +54777,8 @@ Index: gtk+-2.12.12/Makefile.in @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h - --$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h +-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 @@ -47586,6 +54804,9 @@ Index: gtk+-2.12.12/Makefile.in -gtk+-unix-print-2.0.pc: $(top_builddir)/config.status gtk+-unix-print-2.0.pc.in +gtk+-unix-print-2.0.pc: $(top_builddir)/config.status $(srcdir)/gtk+-unix-print-2.0.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +-gail.pc: $(top_builddir)/config.status gail.pc.in ++gail.pc: $(top_builddir)/config.status $(srcdir)/gail.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ -gdk-pixbuf-2.0-uninstalled.pc: $(top_builddir)/config.status gdk-pixbuf-2.0-uninstalled.pc.in +gdk-pixbuf-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -47595,9 +54816,12 @@ Index: gtk+-2.12.12/Makefile.in -gtk+-2.0-uninstalled.pc: $(top_builddir)/config.status gtk+-2.0-uninstalled.pc.in +gtk+-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gtk+-2.0-uninstalled.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ +-gail-uninstalled.pc: $(top_builddir)/config.status gail-uninstalled.pc.in ++gail-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gail-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -@@ -555,24 +521,22 @@ clean-libtool: +@@ -637,24 +513,22 @@ clean-libtool: distclean-libtool: -rm -f libtool @@ -47629,7 +54853,7 @@ Index: gtk+-2.12.12/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -582,7 +546,13 @@ uninstall-pkgconfigDATA: +@@ -664,7 +538,13 @@ uninstall-pkgconfigDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -47644,7 +54868,7 @@ Index: gtk+-2.12.12/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -594,15 +564,20 @@ $(RECURSIVE_TARGETS): +@@ -676,15 +556,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -47669,7 +54893,7 @@ Index: gtk+-2.12.12/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -623,7 +598,7 @@ maintainer-clean-recursive: +@@ -705,7 +590,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -47678,7 +54902,7 @@ Index: gtk+-2.12.12/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -634,35 +609,30 @@ ctags-recursive: +@@ -716,35 +601,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -47721,7 +54945,7 @@ Index: gtk+-2.12.12/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -670,23 +640,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -752,23 +632,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -47754,7 +54978,7 @@ Index: gtk+-2.12.12/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -698,40 +668,25 @@ GTAGS: +@@ -780,40 +660,25 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -47809,7 +55033,7 @@ Index: gtk+-2.12.12/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -742,15 +697,19 @@ distdir: $(DISTFILES) +@@ -824,15 +689,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -47834,7 +55058,7 @@ Index: gtk+-2.12.12/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -761,22 +720,55 @@ distdir: $(DISTFILES) +@@ -843,22 +712,55 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -47895,7 +55119,7 @@ Index: gtk+-2.12.12/Makefile.in chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst -@@ -796,19 +788,20 @@ distcheck: dist +@@ -878,19 +780,20 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ @@ -47921,7 +55145,7 @@ Index: gtk+-2.12.12/Makefile.in distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -832,8 +825,9 @@ check: check-recursive +@@ -915,8 +818,9 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: @@ -47933,7 +55157,7 @@ Index: gtk+-2.12.12/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -853,7 +847,7 @@ mostlyclean-generic: +@@ -936,7 +840,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -47942,7 +55166,7 @@ Index: gtk+-2.12.12/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -866,13 +860,15 @@ clean-am: clean-generic clean-libtool mo +@@ -949,13 +853,15 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile @@ -47960,7 +55184,7 @@ Index: gtk+-2.12.12/Makefile.in info: info-recursive info-am: -@@ -881,12 +877,20 @@ install-data-am: install-pkgconfigDATA +@@ -964,12 +870,20 @@ install-data-am: install-pkgconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -47981,7 +55205,7 @@ Index: gtk+-2.12.12/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -907,29 +911,28 @@ ps: ps-recursive +@@ -990,29 +904,28 @@ ps: ps-recursive ps-am: @@ -47992,10 +55216,10 @@ Index: gtk+-2.12.12/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-data-am install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive dist dist-all dist-gzip distcheck distclean \ -- distclean-generic distclean-hdr distclean-libtool \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive dist dist-all dist-gzip distcheck \ +- distclean distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am dvi-recursive info info-am \ - info-recursive install install-am install-data install-data-am \ @@ -48012,13 +55236,13 @@ Index: gtk+-2.12.12/Makefile.in - uninstall-info-recursive uninstall-local \ - uninstall-pkgconfigDATA uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am am--refresh check check-am clean clean-generic \ -+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ -+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ -+ distcheck distclean distclean-generic distclean-hdr \ -+ distclean-libtool distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am \ ++ all all-am am--refresh check check-am check-local clean \ ++ clean-generic clean-libtool ctags ctags-recursive dist \ ++ dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ ++ dist-tarZ dist-zip distcheck distclean distclean-generic \ ++ distclean-hdr distclean-libtool distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ @@ -48029,12 +55253,575 @@ Index: gtk+-2.12.12/Makefile.in + tags tags-recursive uninstall uninstall-am uninstall-local \ + uninstall-pkgconfigDATA + # call as: $(XVFB_START) && someprogram - gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc -Index: gtk+-2.12.12/modules/engines/Makefile.in +Index: gtk+-2.14.7/missing =================================================================== ---- gtk+-2.12.12.orig/modules/engines/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/engines/Makefile.in 2008-12-09 21:03:28.273714466 +0100 +--- gtk+-2.14.7.orig/missing 2009-02-17 23:15:20.847087456 +0100 ++++ gtk+-2.14.7/missing 2009-02-21 14:58:40.135083486 +0100 +@@ -1,6 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. ++ ++scriptversion=2006-05-10.23 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. + # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -15,8 +19,8 @@ + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -29,6 +33,8 @@ if test $# -eq 0; then + fi + + run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -38,18 +44,24 @@ else + configure_ac=configure.in + fi + +-case "$1" in ++msg="missing on your system" ++ ++case $1 in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi + ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -67,6 +79,7 @@ Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -74,11 +87,15 @@ Supported PROGRAM values: + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to <bug-automake@gnu.org>." ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing 0.4 - GNU automake" ++ echo "missing $scriptversion (GNU Automake)" ++ exit $? + ;; + + -*) +@@ -87,14 +104,44 @@ Supported PROGRAM values: + exit 1 + ;; + +- aclocal*) ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case $1 in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 + fi ++ ;; ++esac + ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case $1 in ++ aclocal*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." +@@ -102,13 +149,8 @@ WARNING: \`$1' is missing on your system + ;; + + autoconf) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." +@@ -116,13 +158,8 @@ WARNING: \`$1' is missing on your system + ;; + + autoheader) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +@@ -130,7 +167,7 @@ WARNING: \`$1' is missing on your system + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -140,13 +177,8 @@ WARNING: \`$1' is missing on your system + ;; + + automake*) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." +@@ -156,20 +188,15 @@ WARNING: \`$1' is missing on your system + ;; + + autom4te) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else +@@ -185,74 +212,67 @@ WARNING: \`$1' is needed, and you do not + + bison|yacc) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` +- if test -z "$file"; then +- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` +- fi +- if [ -f "$file" ]; then ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file +@@ -262,32 +282,36 @@ WARNING: \`$1' is missing on your system + ;; + + makeinfo) +- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then +- # We have makeinfo, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` +- fi ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + + tar) + shift +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error +@@ -300,13 +324,13 @@ WARNING: \`$1' is missing on your system + fi + firstarg="$1" + if shift; then +- case "$firstarg" in ++ case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case "$firstarg" in ++ case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +@@ -323,8 +347,8 @@ WARNING: I can't seem to be able to run + + *) + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case +@@ -334,3 +358,10 @@ WARNING: \`$1' is needed, and you do not + esac + + exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +Index: gtk+-2.14.7/mkinstalldirs +=================================================================== +--- gtk+-2.14.7.orig/mkinstalldirs 2009-02-17 23:15:20.823088386 +0100 ++++ gtk+-2.14.7/mkinstalldirs 2009-02-21 14:58:50.030585009 +0100 +@@ -1,21 +1,36 @@ + #! /bin/sh + # mkinstalldirs --- make directory hierarchy +-# Author: Noah Friedman <friedman@prep.ai.mit.edu> +-# Created: 1993-05-16 +-# Public domain + ++scriptversion=2006-05-11.19 ++ ++# Original author: Noah Friedman <friedman@prep.ai.mit.edu> ++# Created: 1993-05-16 ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to <bug-automake@gnu.org> or send patches to ++# <automake-patches@gnu.org>. ++ ++nl=' ++' ++IFS=" "" $nl" + errstatus=0 +-dirmode="" ++dirmode= + + usage="\ +-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to <bug-automake@gnu.org>." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help +- echo "$usage" 1>&2 +- exit 0 ++ echo "$usage" ++ exit $? + ;; + -m) # -m PERM arg + shift +@@ -23,6 +38,10 @@ while test $# -gt 0 ; do + dirmode=$1 + shift + ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit $? ++ ;; + --) # stop option processing + shift + break +@@ -50,30 +69,58 @@ case $# in + 0) exit 0 ;; + esac + ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. + case $dirmode in + '') +- if mkdir -p -- . 2>/dev/null; then ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version + fi + ;; + *) +- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done + fi + ;; + esac + + for file + do +- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ case $file in ++ /*) pathcomp=/ ;; ++ *) pathcomp= ;; ++ esac ++ oIFS=$IFS ++ IFS=/ ++ set fnord $file + shift ++ IFS=$oIFS + +- pathcomp= + for d + do +- pathcomp="$pathcomp$d" ++ test "x$d" = x && continue ++ ++ pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac +@@ -84,21 +131,21 @@ do + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then +- errstatus=$lasterr ++ errstatus=$lasterr + else +- if test ! -z "$dirmode"; then ++ if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" +- lasterr="" +- chmod "$dirmode" "$pathcomp" || lasterr=$? ++ lasterr= ++ chmod "$dirmode" "$pathcomp" || lasterr=$? + +- if test ! -z "$lasterr"; then +- errstatus=$lasterr +- fi +- fi ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi + fi + fi + +- pathcomp="$pathcomp/" ++ pathcomp=$pathcomp/ + done + done + +@@ -107,5 +154,8 @@ exit $errstatus + # Local Variables: + # mode: shell-script + # sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" + # End: +-# mkinstalldirs ends here +Index: gtk+-2.14.7/modules/engines/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/engines/Makefile.in 2009-02-17 23:15:20.803088428 +0100 ++++ gtk+-2.14.7/modules/engines/Makefile.in 2009-02-21 14:58:46.018582856 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -48047,10 +55834,10 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -48065,14 +55852,15 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,34 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = modules/engines -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -48102,12 +55890,14 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +67,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -48124,7 +55914,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +92,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -48133,7 +55923,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +99,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -48144,7 +55934,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -48152,7 +55942,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -48161,7 +55951,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +151,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -48172,6 +55962,10 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -48183,16 +55977,48 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -48218,7 +56044,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -48244,7 +56070,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -48253,7 +56079,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +206,10 @@ SED = @SED@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -48282,7 +56108,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -48312,7 +56138,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +259,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -48320,15 +56146,24 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,33 +268,45 @@ program_transform_name = @program_transf +@@ -373,9 +278,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,33 +313,40 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @USE_WIN32_TRUE@wimp = ms-windows - SUBDIRS = $(wimp) pixbuf @@ -48344,13 +56179,14 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -DIST_SUBDIRS = ms-windows pixbuf all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -48384,7 +56220,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -362,10 +314,6 @@ mostlyclean-libtool: +@@ -440,10 +354,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -48395,7 +56231,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -373,7 +321,13 @@ uninstall-info-am: +@@ -451,7 +361,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -48410,7 +56246,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -385,15 +339,20 @@ $(RECURSIVE_TARGETS): +@@ -463,15 +379,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -48435,7 +56271,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -414,7 +373,7 @@ maintainer-clean-recursive: +@@ -492,7 +413,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -48444,7 +56280,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -425,35 +384,30 @@ ctags-recursive: +@@ -503,35 +424,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -48487,7 +56323,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -461,23 +415,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -539,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -48520,7 +56356,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -489,28 +443,23 @@ GTAGS: +@@ -567,29 +483,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -48530,6 +56366,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -48562,7 +56399,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -523,13 +472,17 @@ distdir: $(DISTFILES) +@@ -602,13 +512,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -48584,7 +56421,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -539,7 +492,6 @@ check: check-recursive +@@ -619,7 +533,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -48592,7 +56429,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -559,7 +511,7 @@ mostlyclean-generic: +@@ -639,7 +552,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -48601,7 +56438,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -570,25 +522,34 @@ clean-am: clean-generic clean-libtool mo +@@ -650,25 +563,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -48638,7 +56475,7 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -607,26 +568,24 @@ ps: ps-recursive +@@ -687,26 +609,24 @@ ps: ps-recursive ps-am: @@ -48649,12 +56486,12 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -48666,25 +56503,25 @@ Index: gtk+-2.12.12/modules/engines/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/engines/ms-windows/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/engines/ms-windows/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/engines/ms-windows/Makefile.in 2008-12-09 21:03:28.433715109 +0100 +--- gtk+-2.14.7.orig/modules/engines/ms-windows/Makefile.in 2009-02-17 23:15:20.755082466 +0100 ++++ gtk+-2.14.7/modules/engines/ms-windows/Makefile.in 2009-02-21 14:58:46.215086393 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -48697,9 +56534,9 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -48714,14 +56551,15 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,66 @@ POST_INSTALL = : +@@ -37,10 +32,67 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = modules/engines/ms-windows -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -48783,12 +56621,14 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +100,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -48805,7 +56645,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +125,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -48814,7 +56654,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +132,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -48825,7 +56665,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -48833,7 +56673,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -48842,7 +56682,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +184,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -48853,6 +56693,10 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -48864,16 +56708,48 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -48899,7 +56775,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -48925,7 +56801,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -48934,7 +56810,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +239,10 @@ SED = @SED@ +@@ -297,28 +249,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -48963,7 +56839,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -48993,7 +56869,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +292,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -49001,24 +56877,31 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,12 +301,13 @@ program_transform_name = @program_transf +@@ -373,9 +311,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +346,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- SUBDIRS = Theme -- - EXTRA_DIST = Makefile.msc - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ -@@ -342,18 +316,14 @@ INCLUDES = \ - -DGDK_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -416,18 +354,14 @@ INCLUDES = \ + -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) - @@ -49036,7 +56919,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in libwimp_la_SOURCES = \ msw_rc_style.c \ msw_rc_style.h \ -@@ -364,94 +334,75 @@ libwimp_la_SOURCES = \ +@@ -438,95 +372,75 @@ libwimp_la_SOURCES = \ xp_theme_defs.h \ xp_theme.h @@ -49082,7 +56965,8 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(libwimp_la_SOURCES) - @@ -49090,8 +56974,8 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -49168,7 +57052,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -462,37 +413,25 @@ distclean-compile: +@@ -537,37 +451,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xp_theme.Plo@am__quote@ .c.o: @@ -49218,7 +57102,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -500,10 +439,6 @@ mostlyclean-libtool: +@@ -575,10 +477,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -49229,7 +57113,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -511,7 +446,13 @@ uninstall-info-am: +@@ -586,7 +484,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -49244,7 +57128,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -523,15 +464,20 @@ $(RECURSIVE_TARGETS): +@@ -598,15 +502,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -49269,7 +57153,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -552,7 +498,7 @@ maintainer-clean-recursive: +@@ -627,7 +536,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -49278,7 +57162,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -563,35 +509,30 @@ ctags-recursive: +@@ -638,35 +547,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -49321,7 +57205,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -599,23 +540,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -674,23 +578,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -49354,7 +57238,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -627,28 +568,23 @@ GTAGS: +@@ -702,29 +606,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -49364,6 +57248,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -49396,7 +57281,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -659,15 +595,19 @@ distdir: $(DISTFILES) +@@ -735,15 +633,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -49421,7 +57306,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -677,8 +617,9 @@ check: check-recursive +@@ -754,8 +656,9 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: @@ -49433,7 +57318,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -698,7 +639,7 @@ mostlyclean-generic: +@@ -775,7 +678,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -49442,7 +57327,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -712,24 +653,34 @@ distclean: distclean-recursive +@@ -789,24 +692,34 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -49478,7 +57363,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -750,28 +701,26 @@ ps: ps-recursive +@@ -827,28 +740,27 @@ ps: ps-recursive ps-am: @@ -49489,17 +57374,21 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-engineLTLIBRARIES clean-generic clean-libtool \ -- clean-recursive ctags ctags-recursive distclean \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-engineLTLIBRARIES \ -+ clean-generic clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-engineLTLIBRARIES clean-generic \ +- clean-libtool clean-recursive ctags ctags-recursive distclean \ +- distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ -- install-engineLTLIBRARIES install-exec install-exec-am \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean \ ++ clean-engineLTLIBRARIES clean-generic clean-libtool ctags \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am \ + install-engineLTLIBRARIES install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ @@ -49510,24 +57399,21 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Makefile.in - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-engineLTLIBRARIES uninstall-info-am \ - uninstall-info-recursive uninstall-recursive -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-engineLTLIBRARIES install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-engineLTLIBRARIES - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-12-09 21:03:28.669715495 +0100 +--- gtk+-2.14.7.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-02-17 23:15:20.627088406 +0100 ++++ gtk+-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-02-21 14:58:46.531082699 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -49540,9 +57426,9 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -49557,14 +57443,15 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,31 @@ POST_INSTALL = : +@@ -37,10 +32,32 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = modules/engines/ms-windows/Theme/gtk-2.0 -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -49591,12 +57478,14 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +65,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -49613,7 +57502,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +90,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -49622,7 +57511,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +97,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -49633,7 +57522,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +120,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -49641,7 +57530,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +139,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -49650,7 +57539,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +149,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -49661,6 +57550,10 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -49672,16 +57565,48 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -49707,7 +57632,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -49733,7 +57658,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -49742,7 +57667,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +204,10 @@ SED = @SED@ +@@ -297,28 +214,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -49771,7 +57696,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -49801,7 +57726,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +257,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -49809,19 +57734,26 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,56 +266,68 @@ program_transform_name = @program_transf +@@ -373,9 +276,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,54 +311,62 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- themedir = $(datadir)/themes/MS-Windows/gtk-2.0 theme_DATA = gtkrc -- - EXTRA_DIST = $(theme_DATA) -subdir = modules/engines/ms-windows/Theme/gtk-2.0 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -49830,12 +57762,13 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -DIST_SOURCES = -DATA = $(theme_DATA) - --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am all: all-am .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -49903,7 +57836,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in done tags: TAGS TAGS: -@@ -385,28 +335,23 @@ TAGS: +@@ -461,29 +374,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -49913,6 +57846,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -49945,8 +57879,8 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -420,9 +365,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -498,9 +405,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) - @@ -49958,7 +57892,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -442,7 +388,7 @@ mostlyclean-generic: +@@ -520,7 +428,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -49967,7 +57901,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -453,24 +399,34 @@ clean-am: clean-generic clean-libtool mo +@@ -531,24 +439,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -50003,7 +57937,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -489,17 +445,21 @@ ps: ps-am +@@ -567,17 +485,21 @@ ps: ps-am ps-am: @@ -50012,31 +57946,31 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in + +.MAKE: install-am install-strip - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ -- dvi-am info info-am install install-am install-data \ + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip install-themeDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-themeDATA -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ install-themeDATA installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am uninstall-themeDATA ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-themeDATA installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-themeDATA - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/engines/ms-windows/Theme/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in 2008-12-09 21:03:28.545713701 +0100 +--- gtk+-2.14.7.orig/modules/engines/ms-windows/Theme/Makefile.in 2009-02-17 23:15:20.595086713 +0100 ++++ gtk+-2.14.7/modules/engines/ms-windows/Theme/Makefile.in 2009-02-21 14:58:46.366582812 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -50049,10 +57983,10 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -50067,14 +58001,15 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,34 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +subdir = modules/engines/ms-windows/Theme -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -50104,12 +58039,14 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +67,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -50126,7 +58063,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +92,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -50135,7 +58072,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +99,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -50146,7 +58083,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -50154,7 +58091,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -50163,7 +58100,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +151,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -50174,6 +58111,10 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -50185,16 +58126,48 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -50220,7 +58193,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -50246,7 +58219,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -50255,7 +58228,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +206,10 @@ SED = @SED@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -50284,7 +58257,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -50314,7 +58287,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +259,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -50322,15 +58295,24 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,31 +268,44 @@ program_transform_name = @program_transf +@@ -373,9 +278,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,31 +313,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- SUBDIRS = gtk-2.0 -subdir = modules/engines/ms-windows/Theme -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -50344,13 +58326,14 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -50384,7 +58367,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -360,10 +313,6 @@ mostlyclean-libtool: +@@ -438,10 +353,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -50395,7 +58378,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -371,7 +320,13 @@ uninstall-info-am: +@@ -449,7 +360,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -50410,7 +58393,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -383,15 +338,20 @@ $(RECURSIVE_TARGETS): +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -50435,7 +58418,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -412,7 +372,7 @@ maintainer-clean-recursive: +@@ -490,7 +412,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -50444,7 +58427,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -423,35 +383,30 @@ ctags-recursive: +@@ -501,35 +423,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -50487,7 +58470,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -459,23 +414,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -50520,7 +58503,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -487,28 +442,23 @@ GTAGS: +@@ -565,29 +482,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -50530,6 +58513,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -50562,7 +58546,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -519,15 +469,19 @@ distdir: $(DISTFILES) +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -50587,7 +58571,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -537,7 +491,6 @@ check: check-recursive +@@ -617,7 +532,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -50595,7 +58579,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -557,7 +510,7 @@ mostlyclean-generic: +@@ -637,7 +551,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -50604,7 +58588,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -568,25 +521,34 @@ clean-am: clean-generic clean-libtool mo +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -50641,7 +58625,7 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -605,26 +567,24 @@ ps: ps-recursive +@@ -685,26 +608,24 @@ ps: ps-recursive ps-am: @@ -50652,12 +58636,12 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -50669,25 +58653,25 @@ Index: gtk+-2.12.12/modules/engines/ms-windows/Theme/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/engines/pixbuf/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/engines/pixbuf/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/engines/pixbuf/Makefile.in 2008-12-09 21:03:28.805213022 +0100 +--- gtk+-2.14.7.orig/modules/engines/pixbuf/Makefile.in 2009-02-17 23:15:20.571086666 +0100 ++++ gtk+-2.14.7/modules/engines/pixbuf/Makefile.in 2009-02-21 14:58:46.719082500 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -50700,9 +58684,9 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -50717,15 +58701,15 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,58 @@ POST_INSTALL = : +@@ -37,10 +32,58 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = modules/engines/pixbuf +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ ChangeLog ++ $(top_srcdir)/Makefile.decl ChangeLog ++subdir = modules/engines/pixbuf +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -50778,12 +58762,14 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +92,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +94,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -50800,7 +58786,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +117,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -50809,7 +58795,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +124,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +126,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -50820,7 +58806,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +147,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +152,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -50828,7 +58814,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +166,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +171,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -50837,7 +58823,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +176,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +181,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -50848,6 +58834,10 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -50859,16 +58849,48 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -50894,7 +58916,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +201,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +210,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -50920,7 +58942,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +220,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +229,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -50929,7 +58951,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +231,10 @@ SED = @SED@ +@@ -297,28 +240,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -50958,7 +58980,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +243,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +252,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -50988,7 +59010,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +284,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +293,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -50996,22 +59018,31 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,10 +293,12 @@ program_transform_name = @program_transf +@@ -373,9 +302,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +337,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ -@@ -340,18 +307,14 @@ INCLUDES = \ - -DGDK_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -416,18 +345,14 @@ INCLUDES = \ + -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) - @@ -51029,7 +59060,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in libpixmap_la_SOURCES = \ pixbuf-draw.c \ pixbuf-main.c \ -@@ -361,84 +324,73 @@ libpixmap_la_SOURCES = \ +@@ -437,85 +362,73 @@ libpixmap_la_SOURCES = \ pixbuf-style.h \ pixbuf.h @@ -51066,15 +59097,16 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(libpixmap_la_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- ChangeLog Makefile.am -SOURCES = $(libpixmap_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -51151,7 +59183,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -449,37 +401,25 @@ distclean-compile: +@@ -526,37 +439,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-render.Plo@am__quote@ .c.o: @@ -51201,7 +59233,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -487,26 +427,15 @@ mostlyclean-libtool: +@@ -564,26 +465,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -51231,7 +59263,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -516,23 +445,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -593,23 +483,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -51264,7 +59296,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -544,28 +473,23 @@ GTAGS: +@@ -621,29 +511,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -51274,6 +59306,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -51306,8 +59339,8 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -579,9 +503,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -658,9 +542,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) - @@ -51319,7 +59352,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -601,7 +526,7 @@ mostlyclean-generic: +@@ -680,7 +565,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -51328,7 +59361,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -615,24 +540,34 @@ distclean: distclean-am +@@ -694,24 +579,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -51364,7 +59397,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -653,20 +588,24 @@ ps: ps-am +@@ -732,20 +627,24 @@ ps: ps-am ps-am: @@ -51373,7 +59406,7 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ clean-engineLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ @@ -51397,12 +59430,12 @@ Index: gtk+-2.12.12/modules/engines/pixbuf/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-engineLTLIBRARIES - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/input/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/input/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/input/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/input/Makefile.in 2008-12-09 21:03:29.029217539 +0100 +--- gtk+-2.14.7.orig/modules/input/Makefile.in 2009-02-17 23:15:20.547089552 +0100 ++++ gtk+-2.14.7/modules/input/Makefile.in 2009-02-21 14:58:47.126585129 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -51415,9 +59448,9 @@ Index: gtk+-2.12.12/modules/input/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -51433,15 +59466,15 @@ Index: gtk+-2.12.12/modules/input/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,140 @@ POST_INSTALL = : +@@ -37,10 +33,256 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = modules/input +DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/input +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -51459,7 +59492,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in +am__installdirs = "$(DESTDIR)$(moduledir)" \ + "$(DESTDIR)$(imconffiledir)" +moduleLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(module_LTLIBRARIES) ++LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = +am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ @@ -51470,12 +59503,18 @@ Index: gtk+-2.12.12/modules/input/Makefile.in +im_am_et_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_am_et_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@am_im_am_et_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@ $(moduledir) +im_cedilla_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_cedilla_la_OBJECTS = imcedilla.lo +im_cedilla_la_OBJECTS = $(am_im_cedilla_la_OBJECTS) +im_cedilla_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_cedilla_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@am_im_cedilla_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@ $(moduledir) +im_cyrillic_translit_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_cyrillic_translit_la_OBJECTS = imcyrillic-translit.lo +im_cyrillic_translit_la_OBJECTS = \ @@ -51483,25 +59522,33 @@ Index: gtk+-2.12.12/modules/input/Makefile.in +im_cyrillic_translit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_cyrillic_translit_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@am_im_cyrillic_translit_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ $(moduledir) +im_ime_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_ime_la_OBJECTS = gtkimcontextime.lo imime.lo +im_ime_la_OBJECTS = $(am_im_ime_la_OBJECTS) +im_ime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_ime_la_LDFLAGS) $(LDFLAGS) -o $@ -+@USE_WIN32_TRUE@am_im_ime_la_rpath = -rpath $(moduledir) ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@am_im_ime_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@ $(moduledir) +im_inuktitut_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_inuktitut_la_OBJECTS = iminuktitut.lo +im_inuktitut_la_OBJECTS = $(am_im_inuktitut_la_OBJECTS) +im_inuktitut_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_inuktitut_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_INUKTITUT_FALSE@am_im_inuktitut_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_INUKTITUT_FALSE@ $(moduledir) +im_ipa_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_ipa_la_OBJECTS = imipa.lo +im_ipa_la_OBJECTS = $(am_im_ipa_la_OBJECTS) +im_ipa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_ipa_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@am_im_ipa_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@ $(moduledir) +im_multipress_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_multipress_la_OBJECTS = \ + im_multipress_la-gtkimcontextmultipress.lo \ @@ -51510,37 +59557,117 @@ Index: gtk+-2.12.12/modules/input/Makefile.in +im_multipress_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_multipress_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_MULTIPRESS_FALSE@am_im_multipress_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_MULTIPRESS_FALSE@ $(moduledir) +im_thai_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_thai_la_OBJECTS = thai-charprop.lo gtkimcontextthai.lo imthai.lo +im_thai_la_OBJECTS = $(am_im_thai_la_OBJECTS) +im_thai_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_thai_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@am_im_thai_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@ $(moduledir) +im_ti_er_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_ti_er_la_OBJECTS = imti-er.lo +im_ti_er_la_OBJECTS = $(am_im_ti_er_la_OBJECTS) +im_ti_er_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_ti_er_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@am_im_ti_er_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@ $(moduledir) +im_ti_et_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_ti_et_la_OBJECTS = imti-et.lo +im_ti_et_la_OBJECTS = $(am_im_ti_et_la_OBJECTS) +im_ti_et_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_ti_et_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@am_im_ti_et_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@ $(moduledir) +im_viqr_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_viqr_la_OBJECTS = imviqr.lo +im_viqr_la_OBJECTS = $(am_im_viqr_la_OBJECTS) +im_viqr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_viqr_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@am_im_viqr_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@ $(moduledir) +im_xim_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_im_xim_la_OBJECTS = gtkimcontextxim.lo imxim.lo +im_xim_la_OBJECTS = $(am_im_xim_la_OBJECTS) +im_xim_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(im_xim_la_LDFLAGS) $(LDFLAGS) -o $@ -+@HAVE_X11R6_TRUE@am_im_xim_la_rpath = -rpath $(moduledir) ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@am_im_xim_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@ $(moduledir) ++libstatic_im_am_et_la_LIBADD = ++am__objects_1 = imam-et.lo ++am_libstatic_im_am_et_la_OBJECTS = $(am__objects_1) ++libstatic_im_am_et_la_OBJECTS = $(am_libstatic_im_am_et_la_OBJECTS) ++@INCLUDE_IM_AM_ET_TRUE@am_libstatic_im_am_et_la_rpath = ++libstatic_im_cedilla_la_LIBADD = ++am__objects_2 = imcedilla.lo ++am_libstatic_im_cedilla_la_OBJECTS = $(am__objects_2) ++libstatic_im_cedilla_la_OBJECTS = \ ++ $(am_libstatic_im_cedilla_la_OBJECTS) ++@INCLUDE_IM_CEDILLA_TRUE@am_libstatic_im_cedilla_la_rpath = ++libstatic_im_cyrillic_translit_la_LIBADD = ++am__objects_3 = imcyrillic-translit.lo ++am_libstatic_im_cyrillic_translit_la_OBJECTS = $(am__objects_3) ++libstatic_im_cyrillic_translit_la_OBJECTS = \ ++ $(am_libstatic_im_cyrillic_translit_la_OBJECTS) ++@INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@am_libstatic_im_cyrillic_translit_la_rpath = ++libstatic_im_ime_la_DEPENDENCIES = ++am__objects_4 = gtkimcontextime.lo imime.lo ++am_libstatic_im_ime_la_OBJECTS = $(am__objects_4) ++libstatic_im_ime_la_OBJECTS = $(am_libstatic_im_ime_la_OBJECTS) ++@INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@am_libstatic_im_ime_la_rpath = ++libstatic_im_inuktitut_la_LIBADD = ++am__objects_5 = iminuktitut.lo ++am_libstatic_im_inuktitut_la_OBJECTS = $(am__objects_5) ++libstatic_im_inuktitut_la_OBJECTS = \ ++ $(am_libstatic_im_inuktitut_la_OBJECTS) ++@INCLUDE_IM_INUKTITUT_TRUE@am_libstatic_im_inuktitut_la_rpath = ++libstatic_im_ipa_la_LIBADD = ++am__objects_6 = imipa.lo ++am_libstatic_im_ipa_la_OBJECTS = $(am__objects_6) ++libstatic_im_ipa_la_OBJECTS = $(am_libstatic_im_ipa_la_OBJECTS) ++@INCLUDE_IM_IPA_TRUE@am_libstatic_im_ipa_la_rpath = ++libstatic_im_multipress_la_LIBADD = ++am__objects_7 = libstatic_im_multipress_la-gtkimcontextmultipress.lo \ ++ libstatic_im_multipress_la-immultipress.lo ++am_libstatic_im_multipress_la_OBJECTS = $(am__objects_7) ++libstatic_im_multipress_la_OBJECTS = \ ++ $(am_libstatic_im_multipress_la_OBJECTS) ++@INCLUDE_IM_MULTIPRESS_TRUE@am_libstatic_im_multipress_la_rpath = ++libstatic_im_thai_la_LIBADD = ++am__objects_8 = thai-charprop.lo gtkimcontextthai.lo imthai.lo ++am_libstatic_im_thai_la_OBJECTS = $(am__objects_8) ++libstatic_im_thai_la_OBJECTS = $(am_libstatic_im_thai_la_OBJECTS) ++@INCLUDE_IM_THAI_TRUE@am_libstatic_im_thai_la_rpath = ++libstatic_im_ti_er_la_LIBADD = ++am__objects_9 = imti-er.lo ++am_libstatic_im_ti_er_la_OBJECTS = $(am__objects_9) ++libstatic_im_ti_er_la_OBJECTS = $(am_libstatic_im_ti_er_la_OBJECTS) ++@INCLUDE_IM_TI_ER_TRUE@am_libstatic_im_ti_er_la_rpath = ++libstatic_im_ti_et_la_LIBADD = ++am__objects_10 = imti-et.lo ++am_libstatic_im_ti_et_la_OBJECTS = $(am__objects_10) ++libstatic_im_ti_et_la_OBJECTS = $(am_libstatic_im_ti_et_la_OBJECTS) ++@INCLUDE_IM_TI_ET_TRUE@am_libstatic_im_ti_et_la_rpath = ++libstatic_im_viqr_la_LIBADD = ++am__objects_11 = imviqr.lo ++am_libstatic_im_viqr_la_OBJECTS = $(am__objects_11) ++libstatic_im_viqr_la_OBJECTS = $(am_libstatic_im_viqr_la_OBJECTS) ++@INCLUDE_IM_VIQR_TRUE@am_libstatic_im_viqr_la_rpath = ++libstatic_im_xim_la_LIBADD = ++am__objects_12 = gtkimcontextxim.lo imxim.lo ++am_libstatic_im_xim_la_OBJECTS = $(am__objects_12) ++libstatic_im_xim_la_OBJECTS = $(am_libstatic_im_xim_la_OBJECTS) ++@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@am_libstatic_im_xim_la_rpath = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles @@ -51558,13 +59685,35 @@ Index: gtk+-2.12.12/modules/input/Makefile.in + $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ + $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ + $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ -+ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) ++ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ ++ $(libstatic_im_am_et_la_SOURCES) \ ++ $(libstatic_im_cedilla_la_SOURCES) \ ++ $(libstatic_im_cyrillic_translit_la_SOURCES) \ ++ $(libstatic_im_ime_la_SOURCES) \ ++ $(libstatic_im_inuktitut_la_SOURCES) \ ++ $(libstatic_im_ipa_la_SOURCES) \ ++ $(libstatic_im_multipress_la_SOURCES) \ ++ $(libstatic_im_thai_la_SOURCES) \ ++ $(libstatic_im_ti_er_la_SOURCES) \ ++ $(libstatic_im_ti_et_la_SOURCES) \ ++ $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) +DIST_SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ + $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ + $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ + $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ + $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ -+ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) ++ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ ++ $(libstatic_im_am_et_la_SOURCES) \ ++ $(libstatic_im_cedilla_la_SOURCES) \ ++ $(libstatic_im_cyrillic_translit_la_SOURCES) \ ++ $(libstatic_im_ime_la_SOURCES) \ ++ $(libstatic_im_inuktitut_la_SOURCES) \ ++ $(libstatic_im_ipa_la_SOURCES) \ ++ $(libstatic_im_multipress_la_SOURCES) \ ++ $(libstatic_im_thai_la_SOURCES) \ ++ $(libstatic_im_ti_er_la_SOURCES) \ ++ $(libstatic_im_ti_et_la_SOURCES) \ ++ $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) +dist_imconffileDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_imconffile_DATA) +ETAGS = etags @@ -51576,12 +59725,14 @@ Index: gtk+-2.12.12/modules/input/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +175,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +293,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -51598,7 +59749,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +200,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +318,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -51607,7 +59758,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +207,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +325,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -51618,7 +59769,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +230,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +351,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -51626,7 +59777,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +249,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +370,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -51635,7 +59786,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +259,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +380,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -51646,6 +59797,10 @@ Index: gtk+-2.12.12/modules/input/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -51657,16 +59812,48 @@ Index: gtk+-2.12.12/modules/input/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -51692,7 +59879,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +284,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +409,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -51718,7 +59905,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +303,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +428,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -51727,7 +59914,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +314,10 @@ SED = @SED@ +@@ -297,28 +439,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -51756,7 +59943,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +326,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +451,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -51786,7 +59973,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +367,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +492,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -51794,7 +59981,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,11 +376,12 @@ program_transform_name = @program_transf +@@ -373,9 +501,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -51804,14 +59991,22 @@ Index: gtk+-2.12.12/modules/input/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +536,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ -@@ -344,22 +393,18 @@ INCLUDES = \ - $(GTK_XIM_FLAGS) \ - $(GTK_DEP_CFLAGS) + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -420,22 +548,18 @@ INCLUDES = \ + $(GTK_DEP_CFLAGS) \ + $(INCLUDED_IMMODULE_DEFINE) - DEPS = \ @@ -51832,66 +60027,90 @@ Index: gtk+-2.12.12/modules/input/Makefile.in im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_xim_la_SOURCES = \ gtkimcontextxim.c \ -@@ -368,27 +413,21 @@ im_xim_la_SOURCES = \ - +@@ -446,42 +570,36 @@ libstatic_im_xim_la_SOURCES = $(im_xim_l im_xim_la_LIBADD = $(LDADDS) - @HAVE_X11R6_TRUE@IM_XIM_MODULE = im-xim.la + @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@STATIC_XIM_MODULE = libstatic-im-xim.la + @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@XIM_MODULE = im-xim.la - im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_am_et_la_SOURCES = imam-et.c + libstatic_im_am_et_la_SOURCES = $(im_am_et_la_SOURCES) im_am_et_la_LIBADD = $(LDADDS) + @INCLUDE_IM_AM_ET_TRUE@STATIC_AM_ET_MODULE = libstatic-im-am-et.la + @INCLUDE_IM_AM_ET_FALSE@AM_ET_MODULE = im-am-et.la - im_cedilla_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_cedilla_la_SOURCES = imcedilla.c + libstatic_im_cedilla_la_SOURCES = $(im_cedilla_la_SOURCES) im_cedilla_la_LIBADD = $(LDADDS) + @INCLUDE_IM_CEDILLA_TRUE@STATIC_CEDILLA_MODULE = libstatic-im-cedilla.la + @INCLUDE_IM_CEDILLA_FALSE@CEDILLA_MODULE = im-cedilla.la - im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c + libstatic_im_cyrillic_translit_la_SOURCES = $(im_cyrillic_translit_la_SOURCES) im_cyrillic_translit_la_LIBADD = $(LDADDS) + @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@STATIC_CYRILLIC_TRANSLIT_MODULE = libstatic-im-cyrillic-translit.la + @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@CYRILLIC_TRANSLIT_MODULE = im-cyrillic-translit.la - im_ti_er_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ti_er_la_SOURCES = imti-er.c + libstatic_im_ti_er_la_SOURCES = $(im_ti_er_la_SOURCES) im_ti_er_la_LIBADD = $(LDADDS) + @INCLUDE_IM_TI_ER_TRUE@STATIC_TI_ER_MODULE = libstatic-im-ti-er.la + @INCLUDE_IM_TI_ER_FALSE@TI_ER_MODULE = im-ti-er.la - im_ti_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ti_et_la_SOURCES = imti-et.c + libstatic_im_ti_et_la_SOURCES = $(im_ti_et_la_SOURCES) im_ti_et_la_LIBADD = $(LDADDS) + @INCLUDE_IM_TI_ET_TRUE@STATIC_TI_ET_MODULE = libstatic-im-ti-et.la + @INCLUDE_IM_TI_ET_FALSE@TI_ET_MODULE = im-ti-et.la - im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_thai_la_SOURCES = \ thai-charprop.c \ -@@ -398,19 +437,15 @@ im_thai_la_SOURCES = \ - imthai.c - +@@ -494,28 +612,24 @@ libstatic_im_thai_la_SOURCES = $(im_thai im_thai_la_LIBADD = $(LDADDS) + @INCLUDE_IM_THAI_TRUE@STATIC_THAI_MODULE = libstatic-im-thai.la + @INCLUDE_IM_THAI_FALSE@THAI_MODULE = im-thai.la - im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_viqr_la_SOURCES = imviqr.c + libstatic_im_viqr_la_SOURCES = $(im_viqr_la_SOURCES) im_viqr_la_LIBADD = $(LDADDS) + @INCLUDE_IM_VIQR_TRUE@STATIC_VIQR_MODULE = libstatic-im-viqr.la + @INCLUDE_IM_VIQR_FALSE@VIQR_MODULE = im-viqr.la - im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_inuktitut_la_SOURCES = iminuktitut.c + libstatic_im_inuktitut_la_SOURCES = $(im_inuktitut_la_SOURCES) im_inuktitut_la_LIBADD = $(LDADDS) + @INCLUDE_IM_INUKTITUT_TRUE@STATIC_INUKTITUT_MODULE = libstatic-im-inuktitut.la + @INCLUDE_IM_INUKTITUT_FALSE@INUKTITUT_MODULE = im-inuktitut.la - im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ipa_la_SOURCES = imipa.c + libstatic_im_ipa_la_SOURCES = $(im_ipa_la_SOURCES) im_ipa_la_LIBADD = $(LDADDS) + @INCLUDE_IM_IPA_TRUE@STATIC_IPA_MODULE = libstatic-im-ipa.la + @INCLUDE_IM_IPA_FALSE@IPA_MODULE = im-ipa.la - im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ime_la_SOURCES = \ gtkimcontextime.c \ -@@ -420,7 +455,6 @@ im_ime_la_SOURCES = \ - - im_ime_la_LIBADD = -limm32 $(LDADDS) - @USE_WIN32_TRUE@IM_IME_MODULE = im-ime.la +@@ -528,7 +642,6 @@ im_ime_la_LIBADD = -limm32 $(LDADDS) + libstatic_im_ime_la_LIBADD = -limm32 + @INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@STATIC_IME_MODULE = libstatic-im-ime.la + @INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@IME_MODULE = im-ime.la - multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" im_multipress_la_CPPFLAGS = $(multipress_defs) - im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) -@@ -430,13 +464,11 @@ im_multipress_la_SOURCES = \ - immultipress.c - + libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) +@@ -542,13 +655,11 @@ libstatic_im_multipress_la_SOURCES = $(i im_multipress_la_LIBADD = $(LDADDS) + @INCLUDE_IM_MULTIPRESS_TRUE@STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la + @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la - imconffiledir = $(sysconfdir)/gtk-2.0 dist_imconffile_DATA = im-multipress.conf @@ -51901,12 +60120,20 @@ Index: gtk+-2.12.12/modules/input/Makefile.in @CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false -@CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)" - - module_LTLIBRARIES = \ - $(IM_XIM_MODULE) \ - im-am-et.la \ -@@ -451,186 +483,94 @@ module_LTLIBRARIES = \ - im-multipress.la \ - $(IM_IME_MODULE) + @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ + @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ + @BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \ +@@ -563,7 +674,6 @@ dist_imconffile_DATA = im-multipress.con + @BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \ + @BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE) + +- + noinst_LTLIBRARIES = \ + $(STATIC_AM_ET_MODULE) \ + $(STATIC_CEDILLA_MODULE) \ +@@ -578,234 +688,64 @@ noinst_LTLIBRARIES = \ + $(STATIC_VIQR_MODULE) \ + $(STATIC_XIM_MODULE) - CLEANFILES = gtk.immodules @@ -51915,7 +60142,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = --LTLIBRARIES = $(module_LTLIBRARIES) +-LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) - -im_am_et_la_DEPENDENCIES = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ @@ -51990,6 +60217,70 @@ Index: gtk+-2.12.12/modules/input/Makefile.in - $(top_builddir)/gtk/$(gtktargetlib) -am_im_xim_la_OBJECTS = gtkimcontextxim.lo imxim.lo -im_xim_la_OBJECTS = $(am_im_xim_la_OBJECTS) +-libstatic_im_am_et_la_LDFLAGS = +-libstatic_im_am_et_la_LIBADD = +-am__objects_1 = imam-et.lo +-am_libstatic_im_am_et_la_OBJECTS = $(am__objects_1) +-libstatic_im_am_et_la_OBJECTS = $(am_libstatic_im_am_et_la_OBJECTS) +-libstatic_im_cedilla_la_LDFLAGS = +-libstatic_im_cedilla_la_LIBADD = +-am__objects_2 = imcedilla.lo +-am_libstatic_im_cedilla_la_OBJECTS = $(am__objects_2) +-libstatic_im_cedilla_la_OBJECTS = $(am_libstatic_im_cedilla_la_OBJECTS) +-libstatic_im_cyrillic_translit_la_LDFLAGS = +-libstatic_im_cyrillic_translit_la_LIBADD = +-am__objects_3 = imcyrillic-translit.lo +-am_libstatic_im_cyrillic_translit_la_OBJECTS = $(am__objects_3) +-libstatic_im_cyrillic_translit_la_OBJECTS = \ +- $(am_libstatic_im_cyrillic_translit_la_OBJECTS) +-libstatic_im_ime_la_LDFLAGS = +-libstatic_im_ime_la_DEPENDENCIES = +-am__objects_4 = gtkimcontextime.lo imime.lo +-am_libstatic_im_ime_la_OBJECTS = $(am__objects_4) +-libstatic_im_ime_la_OBJECTS = $(am_libstatic_im_ime_la_OBJECTS) +-libstatic_im_inuktitut_la_LDFLAGS = +-libstatic_im_inuktitut_la_LIBADD = +-am__objects_5 = iminuktitut.lo +-am_libstatic_im_inuktitut_la_OBJECTS = $(am__objects_5) +-libstatic_im_inuktitut_la_OBJECTS = \ +- $(am_libstatic_im_inuktitut_la_OBJECTS) +-libstatic_im_ipa_la_LDFLAGS = +-libstatic_im_ipa_la_LIBADD = +-am__objects_6 = imipa.lo +-am_libstatic_im_ipa_la_OBJECTS = $(am__objects_6) +-libstatic_im_ipa_la_OBJECTS = $(am_libstatic_im_ipa_la_OBJECTS) +-libstatic_im_multipress_la_LDFLAGS = +-libstatic_im_multipress_la_LIBADD = +-am__objects_7 = libstatic_im_multipress_la-gtkimcontextmultipress.lo \ +- libstatic_im_multipress_la-immultipress.lo +-am_libstatic_im_multipress_la_OBJECTS = $(am__objects_7) +-libstatic_im_multipress_la_OBJECTS = \ +- $(am_libstatic_im_multipress_la_OBJECTS) +-libstatic_im_thai_la_LDFLAGS = +-libstatic_im_thai_la_LIBADD = +-am__objects_8 = thai-charprop.lo gtkimcontextthai.lo imthai.lo +-am_libstatic_im_thai_la_OBJECTS = $(am__objects_8) +-libstatic_im_thai_la_OBJECTS = $(am_libstatic_im_thai_la_OBJECTS) +-libstatic_im_ti_er_la_LDFLAGS = +-libstatic_im_ti_er_la_LIBADD = +-am__objects_9 = imti-er.lo +-am_libstatic_im_ti_er_la_OBJECTS = $(am__objects_9) +-libstatic_im_ti_er_la_OBJECTS = $(am_libstatic_im_ti_er_la_OBJECTS) +-libstatic_im_ti_et_la_LDFLAGS = +-libstatic_im_ti_et_la_LIBADD = +-am__objects_10 = imti-et.lo +-am_libstatic_im_ti_et_la_OBJECTS = $(am__objects_10) +-libstatic_im_ti_et_la_OBJECTS = $(am_libstatic_im_ti_et_la_OBJECTS) +-libstatic_im_viqr_la_LDFLAGS = +-libstatic_im_viqr_la_LIBADD = +-am__objects_11 = imviqr.lo +-am_libstatic_im_viqr_la_OBJECTS = $(am__objects_11) +-libstatic_im_viqr_la_OBJECTS = $(am_libstatic_im_viqr_la_OBJECTS) +-libstatic_im_xim_la_LDFLAGS = +-libstatic_im_xim_la_LIBADD = +-am__objects_12 = gtkimcontextxim.lo imxim.lo +-am_libstatic_im_xim_la_OBJECTS = $(am__objects_12) +-libstatic_im_xim_la_OBJECTS = $(am_libstatic_im_xim_la_OBJECTS) - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -52005,6 +60296,8 @@ Index: gtk+-2.12.12/modules/input/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/imipa.Plo ./$(DEPDIR)/imthai.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/imti-er.Plo ./$(DEPDIR)/imti-et.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/imviqr.Plo ./$(DEPDIR)/imxim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/thai-charprop.Plo -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -52018,18 +60311,30 @@ Index: gtk+-2.12.12/modules/input/Makefile.in - $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ - $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ - $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ -- $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) +- $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ +- $(libstatic_im_am_et_la_SOURCES) \ +- $(libstatic_im_cedilla_la_SOURCES) \ +- $(libstatic_im_cyrillic_translit_la_SOURCES) \ +- $(libstatic_im_ime_la_SOURCES) \ +- $(libstatic_im_inuktitut_la_SOURCES) \ +- $(libstatic_im_ipa_la_SOURCES) \ +- $(libstatic_im_multipress_la_SOURCES) \ +- $(libstatic_im_thai_la_SOURCES) \ +- $(libstatic_im_ti_er_la_SOURCES) \ +- $(libstatic_im_ti_et_la_SOURCES) \ +- $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) -DATA = $(dist_imconffile_DATA) - --DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.in Makefile.am --SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) +-DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) $(libstatic_im_am_et_la_SOURCES) $(libstatic_im_cedilla_la_SOURCES) $(libstatic_im_cyrillic_translit_la_SOURCES) $(libstatic_im_ime_la_SOURCES) $(libstatic_im_inuktitut_la_SOURCES) $(libstatic_im_ipa_la_SOURCES) $(libstatic_im_multipress_la_SOURCES) $(libstatic_im_thai_la_SOURCES) $(libstatic_im_ti_er_la_SOURCES) $(libstatic_im_ti_et_la_SOURCES) $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -52092,46 +60397,91 @@ Index: gtk+-2.12.12/modules/input/Makefile.in @list='$(module_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -814,61 +754,61 @@ clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ + test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done im-am-et.la: $(im_am_et_la_OBJECTS) $(im_am_et_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_am_et_la_LDFLAGS) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) -+ $(im_am_et_la_LINK) -rpath $(moduledir) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) ++ $(im_am_et_la_LINK) $(am_im_am_et_la_rpath) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) im-cedilla.la: $(im_cedilla_la_OBJECTS) $(im_cedilla_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_cedilla_la_LDFLAGS) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) -+ $(im_cedilla_la_LINK) -rpath $(moduledir) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) ++ $(im_cedilla_la_LINK) $(am_im_cedilla_la_rpath) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) im-cyrillic-translit.la: $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_cyrillic_translit_la_LDFLAGS) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) -+ $(im_cyrillic_translit_la_LINK) -rpath $(moduledir) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) ++ $(im_cyrillic_translit_la_LINK) $(am_im_cyrillic_translit_la_rpath) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) im-ime.la: $(im_ime_la_OBJECTS) $(im_ime_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_ime_la_LDFLAGS) $(im_ime_la_OBJECTS) $(im_ime_la_LIBADD) $(LIBS) + $(im_ime_la_LINK) $(am_im_ime_la_rpath) $(im_ime_la_OBJECTS) $(im_ime_la_LIBADD) $(LIBS) im-inuktitut.la: $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_inuktitut_la_LDFLAGS) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) -+ $(im_inuktitut_la_LINK) -rpath $(moduledir) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) ++ $(im_inuktitut_la_LINK) $(am_im_inuktitut_la_rpath) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) im-ipa.la: $(im_ipa_la_OBJECTS) $(im_ipa_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_ipa_la_LDFLAGS) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) -+ $(im_ipa_la_LINK) -rpath $(moduledir) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) ++ $(im_ipa_la_LINK) $(am_im_ipa_la_rpath) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) im-multipress.la: $(im_multipress_la_OBJECTS) $(im_multipress_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_multipress_la_LDFLAGS) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) -+ $(im_multipress_la_LINK) -rpath $(moduledir) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) ++ $(im_multipress_la_LINK) $(am_im_multipress_la_rpath) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) im-thai.la: $(im_thai_la_OBJECTS) $(im_thai_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_thai_la_LDFLAGS) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) -+ $(im_thai_la_LINK) -rpath $(moduledir) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) ++ $(im_thai_la_LINK) $(am_im_thai_la_rpath) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) im-ti-er.la: $(im_ti_er_la_OBJECTS) $(im_ti_er_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_ti_er_la_LDFLAGS) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) -+ $(im_ti_er_la_LINK) -rpath $(moduledir) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) ++ $(im_ti_er_la_LINK) $(am_im_ti_er_la_rpath) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) im-ti-et.la: $(im_ti_et_la_OBJECTS) $(im_ti_et_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_ti_et_la_LDFLAGS) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) -+ $(im_ti_et_la_LINK) -rpath $(moduledir) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) ++ $(im_ti_et_la_LINK) $(am_im_ti_et_la_rpath) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) im-viqr.la: $(im_viqr_la_OBJECTS) $(im_viqr_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_viqr_la_LDFLAGS) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) -+ $(im_viqr_la_LINK) -rpath $(moduledir) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) ++ $(im_viqr_la_LINK) $(am_im_viqr_la_rpath) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) im-xim.la: $(im_xim_la_OBJECTS) $(im_xim_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(im_xim_la_LDFLAGS) $(im_xim_la_OBJECTS) $(im_xim_la_LIBADD) $(LIBS) + $(im_xim_la_LINK) $(am_im_xim_la_rpath) $(im_xim_la_OBJECTS) $(im_xim_la_LIBADD) $(LIBS) + libstatic-im-am-et.la: $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_am_et_la_LDFLAGS) $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_am_et_la_rpath) $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_LIBADD) $(LIBS) + libstatic-im-cedilla.la: $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_cedilla_la_LDFLAGS) $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_cedilla_la_rpath) $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_LIBADD) $(LIBS) + libstatic-im-cyrillic-translit.la: $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_cyrillic_translit_la_LDFLAGS) $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_cyrillic_translit_la_rpath) $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_LIBADD) $(LIBS) + libstatic-im-ime.la: $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ime_la_LDFLAGS) $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ime_la_rpath) $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_LIBADD) $(LIBS) + libstatic-im-inuktitut.la: $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_inuktitut_la_LDFLAGS) $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_inuktitut_la_rpath) $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_LIBADD) $(LIBS) + libstatic-im-ipa.la: $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ipa_la_LDFLAGS) $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ipa_la_rpath) $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_LIBADD) $(LIBS) + libstatic-im-multipress.la: $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_multipress_la_LDFLAGS) $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_multipress_la_rpath) $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_LIBADD) $(LIBS) + libstatic-im-thai.la: $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_thai_la_LDFLAGS) $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_thai_la_rpath) $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_LIBADD) $(LIBS) + libstatic-im-ti-er.la: $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ti_er_la_LDFLAGS) $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ti_er_la_rpath) $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_LIBADD) $(LIBS) + libstatic-im-ti-et.la: $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ti_et_la_LDFLAGS) $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ti_et_la_rpath) $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_LIBADD) $(LIBS) + libstatic-im-viqr.la: $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_viqr_la_LDFLAGS) $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_viqr_la_rpath) $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_LIBADD) $(LIBS) + libstatic-im-xim.la: $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_xim_la_LDFLAGS) $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_xim_la_rpath) $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_LIBADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core @@ -52139,7 +60489,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -654,148 +594,72 @@ distclean-compile: +@@ -894,214 +834,86 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thai-charprop.Plo@am__quote@ .c.o: @@ -52258,9 +60608,83 @@ Index: gtk+-2.12.12/modules/input/Makefile.in -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Plo' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPlo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c +- +-libstatic_im_multipress_la-gtkimcontextmultipress.o: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.o -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c +- +-libstatic_im_multipress_la-gtkimcontextmultipress.obj: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.obj -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c + libstatic_im_multipress_la-gtkimcontextmultipress.lo: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c +- +-libstatic_im_multipress_la-immultipress.o: immultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.o -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c +- +-libstatic_im_multipress_la-immultipress.obj: immultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.obj -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c + + libstatic_im_multipress_la-immultipress.lo: immultipress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.lo -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.lo -MD -MP -MF $(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo $(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c + mostlyclean-libtool: -rm -f *.lo @@ -52318,7 +60742,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -805,23 +669,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -1111,23 +923,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -52351,7 +60775,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -833,28 +697,23 @@ GTAGS: +@@ -1139,29 +951,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -52361,6 +60785,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -52393,9 +60818,9 @@ Index: gtk+-2.12.12/modules/input/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -867,10 +726,12 @@ distdir: $(DISTFILES) - done +@@ -1175,10 +981,12 @@ distdir: $(DISTFILES) check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am +@CROSS_COMPILING_TRUE@all-local: all-am: Makefile $(LTLIBRARIES) $(DATA) all-local @@ -52408,7 +60833,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -891,7 +752,7 @@ clean-generic: +@@ -1199,7 +1007,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -52417,7 +60842,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -905,12 +766,14 @@ distclean: distclean-am +@@ -1213,12 +1021,14 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -52433,7 +60858,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in info: info-am info-am: -@@ -919,12 +782,20 @@ install-data-am: install-dist_imconffile +@@ -1227,12 +1037,20 @@ install-data-am: install-dist_imconffile @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -52454,7 +60879,7 @@ Index: gtk+-2.12.12/modules/input/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -945,22 +816,26 @@ ps: ps-am +@@ -1253,22 +1071,27 @@ ps: ps-am ps-am: @@ -52465,34 +60890,32 @@ Index: gtk+-2.12.12/modules/input/Makefile.in + +.MAKE: install-am install-data-am install-strip - .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-libtool clean-moduleLTLIBRARIES ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am \ -- install-dist_imconffileDATA install-exec install-exec-am \ -- install-info install-info-am install-man \ + .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ + clean clean-generic clean-libtool clean-moduleLTLIBRARIES \ + clean-noinstLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-dist_imconffileDATA install-exec \ +- install-exec-am install-info install-info-am install-man \ - install-moduleLTLIBRARIES install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-data-hook install-dist_imconffileDATA \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-moduleLTLIBRARIES install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-hook \ ++ install-dist_imconffileDATA install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man \ ++ install-moduleLTLIBRARIES install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-dist_imconffileDATA \ - uninstall-info-am uninstall-local uninstall-moduleLTLIBRARIES + uninstall-local uninstall-moduleLTLIBRARIES + # call as: $(XVFB_START) && someprogram - # Running this if cross compiling or if DESTDIR is set is going to -@@ -988,7 +863,18 @@ uninstall-local: - rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules +@@ -1351,7 +1174,18 @@ uninstall-local: + included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules @@ -52511,10 +60934,10 @@ Index: gtk+-2.12.12/modules/input/Makefile.in @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: gtk+-2.12.12/modules/Makefile.in +Index: gtk+-2.14.7/modules/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/Makefile.in 2008-12-09 21:03:28.157216140 +0100 +--- gtk+-2.14.7.orig/modules/Makefile.in 2009-02-17 23:15:20.519086481 +0100 ++++ gtk+-2.14.7/modules/Makefile.in 2009-02-21 14:58:45.847082567 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -52527,10 +60950,10 @@ Index: gtk+-2.12.12/modules/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -52545,14 +60968,16 @@ Index: gtk+-2.12.12/modules/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +29,33 @@ POST_INSTALL = : +@@ -37,11 +31,36 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl + @OS_UNIX_TRUE@am__append_1 = printbackends +subdir = modules -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -52574,6 +60999,7 @@ Index: gtk+-2.12.12/modules/Makefile.in + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags ++DIST_SUBDIRS = input engines other printbackends +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ @@ -52581,12 +61007,14 @@ Index: gtk+-2.12.12/modules/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +66,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -52603,7 +61031,7 @@ Index: gtk+-2.12.12/modules/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +91,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -52612,7 +61040,7 @@ Index: gtk+-2.12.12/modules/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +98,6 @@ ECHO_C = @ECHO_C@ +@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -52623,7 +61051,7 @@ Index: gtk+-2.12.12/modules/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +121,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -52631,7 +61059,7 @@ Index: gtk+-2.12.12/modules/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +140,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -52640,7 +61068,7 @@ Index: gtk+-2.12.12/modules/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +150,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -52651,6 +61079,10 @@ Index: gtk+-2.12.12/modules/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -52662,16 +61094,48 @@ Index: gtk+-2.12.12/modules/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -52697,7 +61161,7 @@ Index: gtk+-2.12.12/modules/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +175,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -52723,7 +61187,7 @@ Index: gtk+-2.12.12/modules/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +194,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -52732,7 +61196,7 @@ Index: gtk+-2.12.12/modules/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +205,10 @@ SED = @SED@ +@@ -298,28 +217,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -52761,7 +61225,7 @@ Index: gtk+-2.12.12/modules/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +217,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -52791,7 +61255,7 @@ Index: gtk+-2.12.12/modules/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +258,7 @@ libexecdir = @libexecdir@ +@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -52799,19 +61263,25 @@ Index: gtk+-2.12.12/modules/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,33 +267,46 @@ program_transform_name = @program_transf +@@ -374,9 +279,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ - @OS_UNIX_TRUE@PRINTBACKENDS_SUBDIR = printbackends + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -407,31 +314,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + - - SUBDIRS = input engines $(PRINTBACKENDS_SUBDIR) - DIST_SUBDIRS = input engines printbackends + SUBDIRS = input engines other $(am__append_1) -subdir = modules -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -52824,12 +61294,14 @@ Index: gtk+-2.12.12/modules/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = input engines other printbackends all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -52863,7 +61335,7 @@ Index: gtk+-2.12.12/modules/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -362,10 +314,6 @@ mostlyclean-libtool: +@@ -439,10 +354,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -52874,7 +61346,7 @@ Index: gtk+-2.12.12/modules/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -373,7 +321,13 @@ uninstall-info-am: +@@ -450,7 +361,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -52889,7 +61361,7 @@ Index: gtk+-2.12.12/modules/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -385,15 +339,20 @@ $(RECURSIVE_TARGETS): +@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -52914,7 +61386,7 @@ Index: gtk+-2.12.12/modules/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -414,7 +373,7 @@ maintainer-clean-recursive: +@@ -491,7 +413,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -52923,7 +61395,7 @@ Index: gtk+-2.12.12/modules/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -425,35 +384,30 @@ ctags-recursive: +@@ -502,35 +424,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -52966,7 +61438,7 @@ Index: gtk+-2.12.12/modules/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -461,23 +415,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -52999,7 +61471,7 @@ Index: gtk+-2.12.12/modules/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -489,28 +443,23 @@ GTAGS: +@@ -566,29 +483,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -53009,6 +61481,7 @@ Index: gtk+-2.12.12/modules/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -53041,7 +61514,7 @@ Index: gtk+-2.12.12/modules/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -523,13 +472,17 @@ distdir: $(DISTFILES) +@@ -601,13 +512,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -53063,7 +61536,7 @@ Index: gtk+-2.12.12/modules/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -539,7 +492,6 @@ check: check-recursive +@@ -618,7 +533,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -53071,7 +61544,7 @@ Index: gtk+-2.12.12/modules/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -559,7 +511,7 @@ mostlyclean-generic: +@@ -638,7 +552,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -53080,7 +61553,7 @@ Index: gtk+-2.12.12/modules/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -570,25 +522,34 @@ clean-am: clean-generic clean-libtool mo +@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -53117,7 +61590,7 @@ Index: gtk+-2.12.12/modules/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -607,26 +568,24 @@ ps: ps-recursive +@@ -686,26 +609,24 @@ ps: ps-recursive ps-am: @@ -53128,12 +61601,12 @@ Index: gtk+-2.12.12/modules/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -53145,25 +61618,25 @@ Index: gtk+-2.12.12/modules/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/printbackends/cups/Makefile.in 2008-09-13 02:03:29.000000000 +0200 -+++ gtk+-2.12.12/modules/printbackends/cups/Makefile.in 2008-12-09 21:03:29.353214514 +0100 +--- gtk+-2.14.7.orig/modules/other/gail/libgail-util/Makefile.in 2009-02-17 23:15:20.499084568 +0100 ++++ gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in 2009-02-21 14:58:48.074581872 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -53176,9 +61649,899 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,13 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +34,60 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgailutilinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/other/gail/libgail-util ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" \ ++ "$(DESTDIR)$(libgailutilincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libgailutil_la_DEPENDENCIES = $(top_builddir)/gtk/$(gtktargetlib) \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) ++am__objects_1 = libgailutil_la-gailmisc.lo \ ++ libgailutil_la-gailtextutil.lo ++am_libgailutil_la_OBJECTS = $(am__objects_1) ++libgailutil_la_OBJECTS = $(am_libgailutil_la_OBJECTS) ++libgailutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgailutil_la_CFLAGS) \ ++ $(CFLAGS) $(libgailutil_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgailutil_la_SOURCES) ++DIST_SOURCES = $(libgailutil_la_SOURCES) ++DATA = $(noinst_DATA) ++libgailutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgailutilinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +98,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +123,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +130,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +156,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +175,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +185,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +214,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +233,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +244,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +256,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +297,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +306,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -408,32 +343,24 @@ XVFB_START = \ + + @OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def + @OS_WIN32_TRUE@no_undefined = -no-undefined +- + @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gailutil.lib +- + lib_LTLIBRARIES = libgailutil.la +- + util_c_sources = \ + gailmisc.c \ + gailtextutil.c + +- + libgailutilincludedir = $(includedir)/gail-1.0/libgail-util +- + util_public_h_sources = \ + gailmisc.h \ + gailtextutil.h \ + gail-util.h + +- + libgailutil_la_SOURCES = \ + $(util_c_sources) + +- + libgailutilinclude_HEADERS = \ + $(util_public_h_sources) + +- + libgailutil_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -444,102 +371,87 @@ libgailutil_la_CPPFLAGS = \ + -DGDK_DISABLE_DEPRECATED\ + -DGTK_DISABLE_DEPRECATED + +- + libgailutil_la_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) \ + $(AM_CFLAGS) + +- + libgailutil_la_LIBADD = \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(GTK_DEP_LIBS) + +- + libgailutil_la_LDFLAGS = \ + -version-info $(GAIL_LT_VERSION_INFO) \ + $(no_undefined) \ + $(export_symbols) \ + $(LDFLAGS) + +-subdir = modules/other/gail/libgail-util +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(lib_LTLIBRARIES) +- +-libgailutil_la_DEPENDENCIES = $(top_builddir)/gtk/$(gtktargetlib) \ +- $(top_builddir)/gdk/$(gdktargetlib) +-am__objects_1 = libgailutil_la-gailmisc.lo \ +- libgailutil_la-gailtextutil.lo +-am_libgailutil_la_OBJECTS = $(am__objects_1) +-libgailutil_la_OBJECTS = $(am_libgailutil_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libgailutil_la-gailmisc.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgailutil_la-gailtextutil.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgailutil_la_SOURCES) +-DATA = $(noinst_DATA) +- +-HEADERS = $(libgailutilinclude_HEADERS) +- +-DIST_COMMON = $(libgailutilinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libgailutil_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/gail/libgail-util/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/gail/libgail-util/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-libLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgailutil.la: $(libgailutil_la_OBJECTS) $(libgailutil_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgailutil_la_LDFLAGS) $(libgailutil_la_OBJECTS) $(libgailutil_la_LIBADD) $(LIBS) ++ $(libgailutil_la_LINK) -rpath $(libdir) $(libgailutil_la_OBJECTS) $(libgailutil_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -548,148 +460,72 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgailutil_la-gailtextutil.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-libgailutil_la-gailmisc.o: gailmisc.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.o -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailmisc.o `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" "$(DEPDIR)/libgailutil_la-gailmisc.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmisc.c' object='libgailutil_la-gailmisc.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailmisc.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailmisc.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.o `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c +- +-libgailutil_la-gailmisc.obj: gailmisc.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.obj -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailmisc.obj `if test -f 'gailmisc.c'; then $(CYGPATH_W) 'gailmisc.c'; else $(CYGPATH_W) '$(srcdir)/gailmisc.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" "$(DEPDIR)/libgailutil_la-gailmisc.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmisc.c' object='libgailutil_la-gailmisc.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailmisc.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailmisc.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.obj `if test -f 'gailmisc.c'; then $(CYGPATH_W) 'gailmisc.c'; else $(CYGPATH_W) '$(srcdir)/gailmisc.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libgailutil_la-gailmisc.lo: gailmisc.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.lo -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" "$(DEPDIR)/libgailutil_la-gailmisc.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.lo -MD -MP -MF $(DEPDIR)/libgailutil_la-gailmisc.Tpo -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgailutil_la-gailmisc.Tpo $(DEPDIR)/libgailutil_la-gailmisc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmisc.c' object='libgailutil_la-gailmisc.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailmisc.Plo' tmpdepfile='$(DEPDIR)/libgailutil_la-gailmisc.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c +- +-libgailutil_la-gailtextutil.o: gailtextutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.o -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailtextutil.o `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" "$(DEPDIR)/libgailutil_la-gailtextutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextutil.c' object='libgailutil_la-gailtextutil.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailtextutil.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailtextutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.o `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c +- +-libgailutil_la-gailtextutil.obj: gailtextutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.obj -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailtextutil.obj `if test -f 'gailtextutil.c'; then $(CYGPATH_W) 'gailtextutil.c'; else $(CYGPATH_W) '$(srcdir)/gailtextutil.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" "$(DEPDIR)/libgailutil_la-gailtextutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextutil.c' object='libgailutil_la-gailtextutil.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailtextutil.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailtextutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.obj `if test -f 'gailtextutil.c'; then $(CYGPATH_W) 'gailtextutil.c'; else $(CYGPATH_W) '$(srcdir)/gailtextutil.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c + + libgailutil_la-gailtextutil.lo: gailtextutil.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.lo -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" "$(DEPDIR)/libgailutil_la-gailtextutil.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.lo -MD -MP -MF $(DEPDIR)/libgailutil_la-gailtextutil.Tpo -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgailutil_la-gailtextutil.Tpo $(DEPDIR)/libgailutil_la-gailtextutil.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextutil.c' object='libgailutil_la-gailtextutil.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailtextutil.Plo' tmpdepfile='$(DEPDIR)/libgailutil_la-gailtextutil.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgailutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgailutilincludeHEADERS: $(libgailutilinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgailutilincludedir) ++ test -z "$(libgailutilincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgailutilincludedir)" + @list='$(libgailutilinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgailutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailutilincludedir)/$$f"; \ +- $(libgailutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailutilincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgailutilincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgailutilincludedir)/$$f'"; \ ++ $(libgailutilincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgailutilincludedir)/$$f"; \ + done + + uninstall-libgailutilincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgailutilinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgailutilincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgailutilincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgailutilincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgailutilincludedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -699,23 +535,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -727,29 +563,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -764,9 +594,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libgailutilincludedir) ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgailutilincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -786,7 +617,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -800,24 +631,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local install-libgailutilincludeHEADERS + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -838,21 +679,25 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ ++uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-libgailutilincludeHEADERS uninstall-local + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-data-local \ +- install-exec install-exec-am install-info install-info-am \ +- install-libLTLIBRARIES install-libgailutilincludeHEADERS \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-libLTLIBRARIES \ ++ install-libgailutilincludeHEADERS install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libgailutilincludeHEADERS uninstall-local + + # call as: $(XVFB_START) && someprogram +Index: gtk+-2.14.7/modules/other/gail/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/gail/Makefile.in 2009-02-17 23:15:20.463089141 +0100 ++++ gtk+-2.14.7/modules/other/gail/Makefile.in 2009-02-21 14:58:47.839084066 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -53194,15 +62557,5106 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,59 @@ POST_INSTALL = : +@@ -37,10 +33,100 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgailinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog ++subdir = modules/other/gail ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(moduledir)" \ ++ "$(DESTDIR)$(libgailincludedir)" ++moduleLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(module_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libgail_la_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) \ ++ $(top_builddir)/gtk/$(gtktargetlib) \ ++ $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am__objects_1 = libgail_la-gail.lo libgail_la-gailadjustment.lo \ ++ libgail_la-gailarrow.lo libgail_la-gailbooleancell.lo \ ++ libgail_la-gailbox.lo libgail_la-gailbutton.lo \ ++ libgail_la-gailcalendar.lo libgail_la-gailcell.lo \ ++ libgail_la-gailcellparent.lo libgail_la-gailcheckmenuitem.lo \ ++ libgail_la-gailchecksubmenuitem.lo libgail_la-gailclist.lo \ ++ libgail_la-gailclistcell.lo libgail_la-gailcombo.lo \ ++ libgail_la-gailcombobox.lo libgail_la-gailcontainer.lo \ ++ libgail_la-gailcontainercell.lo libgail_la-gailentry.lo \ ++ libgail_la-gailexpander.lo libgail_la-gailframe.lo \ ++ libgail_la-gailimage.lo libgail_la-gailimagecell.lo \ ++ libgail_la-gailitem.lo libgail_la-gaillabel.lo \ ++ libgail_la-gaillist.lo libgail_la-gailmenu.lo \ ++ libgail_la-gailmenushell.lo libgail_la-gailmenuitem.lo \ ++ libgail_la-gailnotebook.lo libgail_la-gailnotebookpage.lo \ ++ libgail_la-gailobject.lo libgail_la-gailoptionmenu.lo \ ++ libgail_la-gailpaned.lo libgail_la-gailpixmap.lo \ ++ libgail_la-gailprogressbar.lo libgail_la-gailradiobutton.lo \ ++ libgail_la-gailradiomenuitem.lo \ ++ libgail_la-gailradiosubmenuitem.lo libgail_la-gailrange.lo \ ++ libgail_la-gailrenderercell.lo libgail_la-gailscale.lo \ ++ libgail_la-gailscrollbar.lo libgail_la-gailscrolledwindow.lo \ ++ libgail_la-gailseparator.lo libgail_la-gailspinbutton.lo \ ++ libgail_la-gailsubmenuitem.lo libgail_la-gailstatusbar.lo \ ++ libgail_la-gailtextcell.lo libgail_la-gailtextview.lo \ ++ libgail_la-gailtogglebutton.lo libgail_la-gailtoplevel.lo \ ++ libgail_la-gailtreeview.lo libgail_la-gailutil.lo \ ++ libgail_la-gailwidget.lo libgail_la-gailwindow.lo ++am__objects_2 = ++am_libgail_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ ++ $(am__objects_2) ++libgail_la_OBJECTS = $(am_libgail_la_OBJECTS) ++libgail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgail_la_CFLAGS) \ ++ $(CFLAGS) $(libgail_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgail_la_SOURCES) ++DIST_SOURCES = $(libgail_la_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++libgailincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgailinclude_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +137,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +162,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +169,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +195,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +214,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +224,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +253,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +272,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +283,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +295,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +336,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +345,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,14 +380,10 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = libgail-util tests +- + @OS_WIN32_TRUE@no_undefined = -no-undefined +- + moduledir = $(libdir)/gtk-2.0/modules + module_LTLIBRARIES = libgail.la +- + gail_c_sources = \ + gail-private-macros.h \ + gail.c \ +@@ -472,9 +442,7 @@ gail_c_sources = \ + gailwidget.c \ + gailwindow.c + +- + libgailincludedir = $(includedir)/gail-1.0/gail +- + gail_private_h_sources = \ + gail.h \ + gailadjustment.h \ +@@ -532,21 +500,17 @@ gail_private_h_sources = \ + gailutil.h \ + gailwindow.h + +- + gail_public_h_sources = \ + gailwidget.h + +- + libgail_la_SOURCES = \ + $(gail_c_sources) \ + $(gail_public_h_sources) \ + $(gail_private_h_sources) + +- + libgailinclude_HEADERS = \ + $(gail_public_h_sources) + +- + libgail_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/modules/other \ +@@ -558,13 +522,11 @@ libgail_la_CPPFLAGS = \ + -DGDK_DISABLE_DEPRECATED \ + $(AM_CPPFLAGS) + +- + libgail_la_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) \ + $(AM_CFLAGS) + +- + libgail_la_LIBADD = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ +@@ -573,178 +535,76 @@ libgail_la_LIBADD = \ + $(GTK_DEP_LIBS) \ + $(INTLLIBS) + +- + libgail_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version \ + $(no_undefined) \ + $(LDFLAGS) + +-subdir = modules/other/gail +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(module_LTLIBRARIES) +- +-libgail_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) \ +- $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la +-am__objects_1 = libgail_la-gail.lo libgail_la-gailadjustment.lo \ +- libgail_la-gailarrow.lo libgail_la-gailbooleancell.lo \ +- libgail_la-gailbox.lo libgail_la-gailbutton.lo \ +- libgail_la-gailcalendar.lo libgail_la-gailcell.lo \ +- libgail_la-gailcellparent.lo libgail_la-gailcheckmenuitem.lo \ +- libgail_la-gailchecksubmenuitem.lo libgail_la-gailclist.lo \ +- libgail_la-gailclistcell.lo libgail_la-gailcombo.lo \ +- libgail_la-gailcombobox.lo libgail_la-gailcontainer.lo \ +- libgail_la-gailcontainercell.lo libgail_la-gailentry.lo \ +- libgail_la-gailexpander.lo libgail_la-gailframe.lo \ +- libgail_la-gailimage.lo libgail_la-gailimagecell.lo \ +- libgail_la-gailitem.lo libgail_la-gaillabel.lo \ +- libgail_la-gaillist.lo libgail_la-gailmenu.lo \ +- libgail_la-gailmenushell.lo libgail_la-gailmenuitem.lo \ +- libgail_la-gailnotebook.lo libgail_la-gailnotebookpage.lo \ +- libgail_la-gailobject.lo libgail_la-gailoptionmenu.lo \ +- libgail_la-gailpaned.lo libgail_la-gailpixmap.lo \ +- libgail_la-gailprogressbar.lo libgail_la-gailradiobutton.lo \ +- libgail_la-gailradiomenuitem.lo \ +- libgail_la-gailradiosubmenuitem.lo libgail_la-gailrange.lo \ +- libgail_la-gailrenderercell.lo libgail_la-gailscale.lo \ +- libgail_la-gailscrollbar.lo libgail_la-gailscrolledwindow.lo \ +- libgail_la-gailseparator.lo libgail_la-gailspinbutton.lo \ +- libgail_la-gailsubmenuitem.lo libgail_la-gailstatusbar.lo \ +- libgail_la-gailtextcell.lo libgail_la-gailtextview.lo \ +- libgail_la-gailtogglebutton.lo libgail_la-gailtoplevel.lo \ +- libgail_la-gailtreeview.lo libgail_la-gailutil.lo \ +- libgail_la-gailwidget.lo libgail_la-gailwindow.lo +-am__objects_2 = +-am_libgail_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ +- $(am__objects_2) +-libgail_la_OBJECTS = $(am_libgail_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libgail_la-gail.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailadjustment.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailarrow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailbooleancell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailbox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcalendar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcellparent.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcheckmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailclist.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailclistcell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcombo.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcombobox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcontainer.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcontainercell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailentry.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailexpander.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailframe.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailimage.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailimagecell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gaillabel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gaillist.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailmenushell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailnotebook.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailnotebookpage.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailobject.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailoptionmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailpaned.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailpixmap.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailprogressbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailradiobutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailradiomenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailrange.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailrenderercell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailscale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailscrollbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailscrolledwindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailseparator.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailspinbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailstatusbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailsubmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtextcell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtextview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtogglebutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtoplevel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtreeview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailutil.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailwindow.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgail_la_SOURCES) +-HEADERS = $(libgailinclude_HEADERS) +- +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(libgailinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl ChangeLog Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(libgail_la_SOURCES) +- + all: all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/gail/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/gail/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-moduleLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-moduleLTLIBRARIES: $(module_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \ +- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + else :; fi; \ + done + + uninstall-moduleLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + done + + clean-moduleLTLIBRARIES: + -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgail.la: $(libgail_la_OBJECTS) $(libgail_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(libgail_la_LDFLAGS) $(libgail_la_OBJECTS) $(libgail_la_LIBADD) $(LIBS) ++ $(libgail_la_LINK) -rpath $(moduledir) $(libgail_la_OBJECTS) $(libgail_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -806,1879 +666,432 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgail_la-gailwindow.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-libgail_la-gail.o: gail.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.o -MD -MP -MF "$(DEPDIR)/libgail_la-gail.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gail.o `test -f 'gail.c' || echo '$(srcdir)/'`gail.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gail.Tpo" "$(DEPDIR)/libgail_la-gail.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gail.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gail.c' object='libgail_la-gail.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gail.Po' tmpdepfile='$(DEPDIR)/libgail_la-gail.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.o `test -f 'gail.c' || echo '$(srcdir)/'`gail.c +- +-libgail_la-gail.obj: gail.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gail.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gail.obj `if test -f 'gail.c'; then $(CYGPATH_W) 'gail.c'; else $(CYGPATH_W) '$(srcdir)/gail.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gail.Tpo" "$(DEPDIR)/libgail_la-gail.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gail.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gail.c' object='libgail_la-gail.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gail.Po' tmpdepfile='$(DEPDIR)/libgail_la-gail.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.obj `if test -f 'gail.c'; then $(CYGPATH_W) 'gail.c'; else $(CYGPATH_W) '$(srcdir)/gail.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libgail_la-gail.lo: gail.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gail.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gail.Tpo" "$(DEPDIR)/libgail_la-gail.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gail.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.lo -MD -MP -MF $(DEPDIR)/libgail_la-gail.Tpo -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gail.Tpo $(DEPDIR)/libgail_la-gail.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gail.c' object='libgail_la-gail.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gail.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gail.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c +- +-libgail_la-gailadjustment.o: gailadjustment.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailadjustment.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailadjustment.o `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo" "$(DEPDIR)/libgail_la-gailadjustment.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailadjustment.c' object='libgail_la-gailadjustment.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailadjustment.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailadjustment.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.o `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c +- +-libgail_la-gailadjustment.obj: gailadjustment.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailadjustment.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailadjustment.obj `if test -f 'gailadjustment.c'; then $(CYGPATH_W) 'gailadjustment.c'; else $(CYGPATH_W) '$(srcdir)/gailadjustment.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo" "$(DEPDIR)/libgail_la-gailadjustment.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailadjustment.c' object='libgail_la-gailadjustment.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailadjustment.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailadjustment.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.obj `if test -f 'gailadjustment.c'; then $(CYGPATH_W) 'gailadjustment.c'; else $(CYGPATH_W) '$(srcdir)/gailadjustment.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c + + libgail_la-gailadjustment.lo: gailadjustment.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailadjustment.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo" "$(DEPDIR)/libgail_la-gailadjustment.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailadjustment.Tpo -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailadjustment.Tpo $(DEPDIR)/libgail_la-gailadjustment.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailadjustment.c' object='libgail_la-gailadjustment.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailadjustment.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailadjustment.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c +- +-libgail_la-gailarrow.o: gailarrow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailarrow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailarrow.o `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailarrow.Tpo" "$(DEPDIR)/libgail_la-gailarrow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailarrow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailarrow.c' object='libgail_la-gailarrow.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailarrow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailarrow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.o `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c +- +-libgail_la-gailarrow.obj: gailarrow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailarrow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailarrow.obj `if test -f 'gailarrow.c'; then $(CYGPATH_W) 'gailarrow.c'; else $(CYGPATH_W) '$(srcdir)/gailarrow.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailarrow.Tpo" "$(DEPDIR)/libgail_la-gailarrow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailarrow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailarrow.c' object='libgail_la-gailarrow.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailarrow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailarrow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.obj `if test -f 'gailarrow.c'; then $(CYGPATH_W) 'gailarrow.c'; else $(CYGPATH_W) '$(srcdir)/gailarrow.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c + + libgail_la-gailarrow.lo: gailarrow.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailarrow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailarrow.Tpo" "$(DEPDIR)/libgail_la-gailarrow.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailarrow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailarrow.Tpo -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailarrow.Tpo $(DEPDIR)/libgail_la-gailarrow.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailarrow.c' object='libgail_la-gailarrow.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailarrow.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailarrow.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c +- +-libgail_la-gailbooleancell.o: gailbooleancell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbooleancell.o `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" "$(DEPDIR)/libgail_la-gailbooleancell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbooleancell.c' object='libgail_la-gailbooleancell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbooleancell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbooleancell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.o `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c +- +-libgail_la-gailbooleancell.obj: gailbooleancell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbooleancell.obj `if test -f 'gailbooleancell.c'; then $(CYGPATH_W) 'gailbooleancell.c'; else $(CYGPATH_W) '$(srcdir)/gailbooleancell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" "$(DEPDIR)/libgail_la-gailbooleancell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbooleancell.c' object='libgail_la-gailbooleancell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbooleancell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbooleancell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.obj `if test -f 'gailbooleancell.c'; then $(CYGPATH_W) 'gailbooleancell.c'; else $(CYGPATH_W) '$(srcdir)/gailbooleancell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c + + libgail_la-gailbooleancell.lo: gailbooleancell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" "$(DEPDIR)/libgail_la-gailbooleancell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailbooleancell.Tpo -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailbooleancell.Tpo $(DEPDIR)/libgail_la-gailbooleancell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbooleancell.c' object='libgail_la-gailbooleancell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbooleancell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailbooleancell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c +- +-libgail_la-gailbox.o: gailbox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailbox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbox.o `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbox.Tpo" "$(DEPDIR)/libgail_la-gailbox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbox.c' object='libgail_la-gailbox.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.o `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c +- +-libgail_la-gailbox.obj: gailbox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailbox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbox.obj `if test -f 'gailbox.c'; then $(CYGPATH_W) 'gailbox.c'; else $(CYGPATH_W) '$(srcdir)/gailbox.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbox.Tpo" "$(DEPDIR)/libgail_la-gailbox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbox.c' object='libgail_la-gailbox.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.obj `if test -f 'gailbox.c'; then $(CYGPATH_W) 'gailbox.c'; else $(CYGPATH_W) '$(srcdir)/gailbox.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c + + libgail_la-gailbox.lo: gailbox.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailbox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbox.Tpo" "$(DEPDIR)/libgail_la-gailbox.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailbox.Tpo -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailbox.Tpo $(DEPDIR)/libgail_la-gailbox.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbox.c' object='libgail_la-gailbox.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbox.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailbox.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c +- +-libgail_la-gailbutton.o: gailbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbutton.o `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbutton.Tpo" "$(DEPDIR)/libgail_la-gailbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbutton.c' object='libgail_la-gailbutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.o `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c +- +-libgail_la-gailbutton.obj: gailbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbutton.obj `if test -f 'gailbutton.c'; then $(CYGPATH_W) 'gailbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailbutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbutton.Tpo" "$(DEPDIR)/libgail_la-gailbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbutton.c' object='libgail_la-gailbutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.obj `if test -f 'gailbutton.c'; then $(CYGPATH_W) 'gailbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailbutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c + + libgail_la-gailbutton.lo: gailbutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbutton.Tpo" "$(DEPDIR)/libgail_la-gailbutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailbutton.Tpo -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailbutton.Tpo $(DEPDIR)/libgail_la-gailbutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbutton.c' object='libgail_la-gailbutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailbutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c +- +-libgail_la-gailcalendar.o: gailcalendar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcalendar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcalendar.o `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo" "$(DEPDIR)/libgail_la-gailcalendar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcalendar.c' object='libgail_la-gailcalendar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcalendar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcalendar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.o `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c +- +-libgail_la-gailcalendar.obj: gailcalendar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcalendar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcalendar.obj `if test -f 'gailcalendar.c'; then $(CYGPATH_W) 'gailcalendar.c'; else $(CYGPATH_W) '$(srcdir)/gailcalendar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo" "$(DEPDIR)/libgail_la-gailcalendar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcalendar.c' object='libgail_la-gailcalendar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcalendar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcalendar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.obj `if test -f 'gailcalendar.c'; then $(CYGPATH_W) 'gailcalendar.c'; else $(CYGPATH_W) '$(srcdir)/gailcalendar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c + + libgail_la-gailcalendar.lo: gailcalendar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcalendar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo" "$(DEPDIR)/libgail_la-gailcalendar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcalendar.Tpo -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcalendar.Tpo $(DEPDIR)/libgail_la-gailcalendar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcalendar.c' object='libgail_la-gailcalendar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcalendar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcalendar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c +- +-libgail_la-gailcell.o: gailcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcell.o `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcell.Tpo" "$(DEPDIR)/libgail_la-gailcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcell.c' object='libgail_la-gailcell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.o `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c +- +-libgail_la-gailcell.obj: gailcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcell.obj `if test -f 'gailcell.c'; then $(CYGPATH_W) 'gailcell.c'; else $(CYGPATH_W) '$(srcdir)/gailcell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcell.Tpo" "$(DEPDIR)/libgail_la-gailcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcell.c' object='libgail_la-gailcell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.obj `if test -f 'gailcell.c'; then $(CYGPATH_W) 'gailcell.c'; else $(CYGPATH_W) '$(srcdir)/gailcell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c + + libgail_la-gailcell.lo: gailcell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcell.Tpo" "$(DEPDIR)/libgail_la-gailcell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcell.Tpo -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcell.Tpo $(DEPDIR)/libgail_la-gailcell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcell.c' object='libgail_la-gailcell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c +- +-libgail_la-gailcellparent.o: gailcellparent.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcellparent.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcellparent.o `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo" "$(DEPDIR)/libgail_la-gailcellparent.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcellparent.c' object='libgail_la-gailcellparent.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcellparent.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcellparent.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.o `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c +- +-libgail_la-gailcellparent.obj: gailcellparent.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcellparent.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcellparent.obj `if test -f 'gailcellparent.c'; then $(CYGPATH_W) 'gailcellparent.c'; else $(CYGPATH_W) '$(srcdir)/gailcellparent.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo" "$(DEPDIR)/libgail_la-gailcellparent.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcellparent.c' object='libgail_la-gailcellparent.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcellparent.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcellparent.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.obj `if test -f 'gailcellparent.c'; then $(CYGPATH_W) 'gailcellparent.c'; else $(CYGPATH_W) '$(srcdir)/gailcellparent.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c + + libgail_la-gailcellparent.lo: gailcellparent.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcellparent.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo" "$(DEPDIR)/libgail_la-gailcellparent.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcellparent.Tpo -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcellparent.Tpo $(DEPDIR)/libgail_la-gailcellparent.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcellparent.c' object='libgail_la-gailcellparent.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcellparent.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcellparent.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c +- +-libgail_la-gailcheckmenuitem.o: gailcheckmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcheckmenuitem.o `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailcheckmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcheckmenuitem.c' object='libgail_la-gailcheckmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.o `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c +- +-libgail_la-gailcheckmenuitem.obj: gailcheckmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcheckmenuitem.obj `if test -f 'gailcheckmenuitem.c'; then $(CYGPATH_W) 'gailcheckmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailcheckmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailcheckmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcheckmenuitem.c' object='libgail_la-gailcheckmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.obj `if test -f 'gailcheckmenuitem.c'; then $(CYGPATH_W) 'gailcheckmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailcheckmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c + + libgail_la-gailcheckmenuitem.lo: gailcheckmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailcheckmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo $(DEPDIR)/libgail_la-gailcheckmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcheckmenuitem.c' object='libgail_la-gailcheckmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c +- +-libgail_la-gailchecksubmenuitem.o: gailchecksubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailchecksubmenuitem.o `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailchecksubmenuitem.c' object='libgail_la-gailchecksubmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.o `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c +- +-libgail_la-gailchecksubmenuitem.obj: gailchecksubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailchecksubmenuitem.obj `if test -f 'gailchecksubmenuitem.c'; then $(CYGPATH_W) 'gailchecksubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailchecksubmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailchecksubmenuitem.c' object='libgail_la-gailchecksubmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.obj `if test -f 'gailchecksubmenuitem.c'; then $(CYGPATH_W) 'gailchecksubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailchecksubmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c + + libgail_la-gailchecksubmenuitem.lo: gailchecksubmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo $(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailchecksubmenuitem.c' object='libgail_la-gailchecksubmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c +- +-libgail_la-gailclist.o: gailclist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailclist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclist.o `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclist.Tpo" "$(DEPDIR)/libgail_la-gailclist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclist.c' object='libgail_la-gailclist.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.o `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c +- +-libgail_la-gailclist.obj: gailclist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailclist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclist.obj `if test -f 'gailclist.c'; then $(CYGPATH_W) 'gailclist.c'; else $(CYGPATH_W) '$(srcdir)/gailclist.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclist.Tpo" "$(DEPDIR)/libgail_la-gailclist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclist.c' object='libgail_la-gailclist.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.obj `if test -f 'gailclist.c'; then $(CYGPATH_W) 'gailclist.c'; else $(CYGPATH_W) '$(srcdir)/gailclist.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c + + libgail_la-gailclist.lo: gailclist.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailclist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclist.Tpo" "$(DEPDIR)/libgail_la-gailclist.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailclist.Tpo -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailclist.Tpo $(DEPDIR)/libgail_la-gailclist.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclist.c' object='libgail_la-gailclist.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclist.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailclist.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c +- +-libgail_la-gailclistcell.o: gailclistcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailclistcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclistcell.o `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo" "$(DEPDIR)/libgail_la-gailclistcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclistcell.c' object='libgail_la-gailclistcell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclistcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclistcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.o `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c +- +-libgail_la-gailclistcell.obj: gailclistcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailclistcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclistcell.obj `if test -f 'gailclistcell.c'; then $(CYGPATH_W) 'gailclistcell.c'; else $(CYGPATH_W) '$(srcdir)/gailclistcell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo" "$(DEPDIR)/libgail_la-gailclistcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclistcell.c' object='libgail_la-gailclistcell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclistcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclistcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.obj `if test -f 'gailclistcell.c'; then $(CYGPATH_W) 'gailclistcell.c'; else $(CYGPATH_W) '$(srcdir)/gailclistcell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c + + libgail_la-gailclistcell.lo: gailclistcell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailclistcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo" "$(DEPDIR)/libgail_la-gailclistcell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailclistcell.Tpo -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailclistcell.Tpo $(DEPDIR)/libgail_la-gailclistcell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclistcell.c' object='libgail_la-gailclistcell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclistcell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailclistcell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c +- +-libgail_la-gailcombo.o: gailcombo.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombo.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombo.o `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombo.Tpo" "$(DEPDIR)/libgail_la-gailcombo.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombo.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombo.c' object='libgail_la-gailcombo.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombo.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombo.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.o `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c +- +-libgail_la-gailcombo.obj: gailcombo.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombo.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombo.obj `if test -f 'gailcombo.c'; then $(CYGPATH_W) 'gailcombo.c'; else $(CYGPATH_W) '$(srcdir)/gailcombo.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombo.Tpo" "$(DEPDIR)/libgail_la-gailcombo.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombo.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombo.c' object='libgail_la-gailcombo.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombo.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombo.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.obj `if test -f 'gailcombo.c'; then $(CYGPATH_W) 'gailcombo.c'; else $(CYGPATH_W) '$(srcdir)/gailcombo.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c + + libgail_la-gailcombo.lo: gailcombo.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombo.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombo.Tpo" "$(DEPDIR)/libgail_la-gailcombo.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombo.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcombo.Tpo -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcombo.Tpo $(DEPDIR)/libgail_la-gailcombo.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombo.c' object='libgail_la-gailcombo.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombo.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcombo.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c +- +-libgail_la-gailcombobox.o: gailcombobox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombobox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombobox.o `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo" "$(DEPDIR)/libgail_la-gailcombobox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombobox.c' object='libgail_la-gailcombobox.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombobox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombobox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.o `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c +- +-libgail_la-gailcombobox.obj: gailcombobox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombobox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombobox.obj `if test -f 'gailcombobox.c'; then $(CYGPATH_W) 'gailcombobox.c'; else $(CYGPATH_W) '$(srcdir)/gailcombobox.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo" "$(DEPDIR)/libgail_la-gailcombobox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombobox.c' object='libgail_la-gailcombobox.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombobox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombobox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.obj `if test -f 'gailcombobox.c'; then $(CYGPATH_W) 'gailcombobox.c'; else $(CYGPATH_W) '$(srcdir)/gailcombobox.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c + + libgail_la-gailcombobox.lo: gailcombobox.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombobox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo" "$(DEPDIR)/libgail_la-gailcombobox.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcombobox.Tpo -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcombobox.Tpo $(DEPDIR)/libgail_la-gailcombobox.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombobox.c' object='libgail_la-gailcombobox.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombobox.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcombobox.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c +- +-libgail_la-gailcontainer.o: gailcontainer.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainer.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainer.o `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo" "$(DEPDIR)/libgail_la-gailcontainer.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainer.c' object='libgail_la-gailcontainer.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainer.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainer.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.o `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c +- +-libgail_la-gailcontainer.obj: gailcontainer.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainer.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainer.obj `if test -f 'gailcontainer.c'; then $(CYGPATH_W) 'gailcontainer.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainer.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo" "$(DEPDIR)/libgail_la-gailcontainer.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainer.c' object='libgail_la-gailcontainer.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainer.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainer.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.obj `if test -f 'gailcontainer.c'; then $(CYGPATH_W) 'gailcontainer.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainer.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c + + libgail_la-gailcontainer.lo: gailcontainer.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainer.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo" "$(DEPDIR)/libgail_la-gailcontainer.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcontainer.Tpo -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcontainer.Tpo $(DEPDIR)/libgail_la-gailcontainer.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainer.c' object='libgail_la-gailcontainer.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainer.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainer.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c +- +-libgail_la-gailcontainercell.o: gailcontainercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainercell.o `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" "$(DEPDIR)/libgail_la-gailcontainercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainercell.c' object='libgail_la-gailcontainercell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.o `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c +- +-libgail_la-gailcontainercell.obj: gailcontainercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainercell.obj `if test -f 'gailcontainercell.c'; then $(CYGPATH_W) 'gailcontainercell.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainercell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" "$(DEPDIR)/libgail_la-gailcontainercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainercell.c' object='libgail_la-gailcontainercell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.obj `if test -f 'gailcontainercell.c'; then $(CYGPATH_W) 'gailcontainercell.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainercell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c + + libgail_la-gailcontainercell.lo: gailcontainercell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" "$(DEPDIR)/libgail_la-gailcontainercell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcontainercell.Tpo -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcontainercell.Tpo $(DEPDIR)/libgail_la-gailcontainercell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainercell.c' object='libgail_la-gailcontainercell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainercell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainercell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c +- +-libgail_la-gailentry.o: gailentry.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailentry.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailentry.o `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailentry.Tpo" "$(DEPDIR)/libgail_la-gailentry.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailentry.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailentry.c' object='libgail_la-gailentry.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailentry.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailentry.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.o `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c +- +-libgail_la-gailentry.obj: gailentry.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailentry.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailentry.obj `if test -f 'gailentry.c'; then $(CYGPATH_W) 'gailentry.c'; else $(CYGPATH_W) '$(srcdir)/gailentry.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailentry.Tpo" "$(DEPDIR)/libgail_la-gailentry.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailentry.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailentry.c' object='libgail_la-gailentry.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailentry.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailentry.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.obj `if test -f 'gailentry.c'; then $(CYGPATH_W) 'gailentry.c'; else $(CYGPATH_W) '$(srcdir)/gailentry.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c + + libgail_la-gailentry.lo: gailentry.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailentry.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailentry.Tpo" "$(DEPDIR)/libgail_la-gailentry.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailentry.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailentry.Tpo -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailentry.Tpo $(DEPDIR)/libgail_la-gailentry.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailentry.c' object='libgail_la-gailentry.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailentry.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailentry.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c +- +-libgail_la-gailexpander.o: gailexpander.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailexpander.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailexpander.o `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailexpander.Tpo" "$(DEPDIR)/libgail_la-gailexpander.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailexpander.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailexpander.c' object='libgail_la-gailexpander.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailexpander.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailexpander.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.o `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c +- +-libgail_la-gailexpander.obj: gailexpander.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailexpander.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailexpander.obj `if test -f 'gailexpander.c'; then $(CYGPATH_W) 'gailexpander.c'; else $(CYGPATH_W) '$(srcdir)/gailexpander.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailexpander.Tpo" "$(DEPDIR)/libgail_la-gailexpander.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailexpander.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailexpander.c' object='libgail_la-gailexpander.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailexpander.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailexpander.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.obj `if test -f 'gailexpander.c'; then $(CYGPATH_W) 'gailexpander.c'; else $(CYGPATH_W) '$(srcdir)/gailexpander.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c + + libgail_la-gailexpander.lo: gailexpander.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailexpander.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailexpander.Tpo" "$(DEPDIR)/libgail_la-gailexpander.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailexpander.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailexpander.Tpo -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailexpander.Tpo $(DEPDIR)/libgail_la-gailexpander.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailexpander.c' object='libgail_la-gailexpander.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailexpander.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailexpander.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c +- +-libgail_la-gailframe.o: gailframe.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailframe.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailframe.o `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailframe.Tpo" "$(DEPDIR)/libgail_la-gailframe.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailframe.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailframe.c' object='libgail_la-gailframe.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailframe.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailframe.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.o `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c +- +-libgail_la-gailframe.obj: gailframe.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailframe.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailframe.obj `if test -f 'gailframe.c'; then $(CYGPATH_W) 'gailframe.c'; else $(CYGPATH_W) '$(srcdir)/gailframe.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailframe.Tpo" "$(DEPDIR)/libgail_la-gailframe.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailframe.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailframe.c' object='libgail_la-gailframe.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailframe.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailframe.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.obj `if test -f 'gailframe.c'; then $(CYGPATH_W) 'gailframe.c'; else $(CYGPATH_W) '$(srcdir)/gailframe.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c + + libgail_la-gailframe.lo: gailframe.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailframe.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailframe.Tpo" "$(DEPDIR)/libgail_la-gailframe.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailframe.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailframe.Tpo -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailframe.Tpo $(DEPDIR)/libgail_la-gailframe.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailframe.c' object='libgail_la-gailframe.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailframe.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailframe.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c +- +-libgail_la-gailimage.o: gailimage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailimage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimage.o `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimage.Tpo" "$(DEPDIR)/libgail_la-gailimage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimage.c' object='libgail_la-gailimage.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.o `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c +- +-libgail_la-gailimage.obj: gailimage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailimage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimage.obj `if test -f 'gailimage.c'; then $(CYGPATH_W) 'gailimage.c'; else $(CYGPATH_W) '$(srcdir)/gailimage.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimage.Tpo" "$(DEPDIR)/libgail_la-gailimage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimage.c' object='libgail_la-gailimage.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.obj `if test -f 'gailimage.c'; then $(CYGPATH_W) 'gailimage.c'; else $(CYGPATH_W) '$(srcdir)/gailimage.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c + + libgail_la-gailimage.lo: gailimage.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailimage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimage.Tpo" "$(DEPDIR)/libgail_la-gailimage.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailimage.Tpo -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailimage.Tpo $(DEPDIR)/libgail_la-gailimage.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimage.c' object='libgail_la-gailimage.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimage.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailimage.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c +- +-libgail_la-gailimagecell.o: gailimagecell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailimagecell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimagecell.o `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo" "$(DEPDIR)/libgail_la-gailimagecell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimagecell.c' object='libgail_la-gailimagecell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimagecell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimagecell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.o `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c +- +-libgail_la-gailimagecell.obj: gailimagecell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailimagecell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimagecell.obj `if test -f 'gailimagecell.c'; then $(CYGPATH_W) 'gailimagecell.c'; else $(CYGPATH_W) '$(srcdir)/gailimagecell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo" "$(DEPDIR)/libgail_la-gailimagecell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimagecell.c' object='libgail_la-gailimagecell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimagecell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimagecell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.obj `if test -f 'gailimagecell.c'; then $(CYGPATH_W) 'gailimagecell.c'; else $(CYGPATH_W) '$(srcdir)/gailimagecell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c + + libgail_la-gailimagecell.lo: gailimagecell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailimagecell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo" "$(DEPDIR)/libgail_la-gailimagecell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailimagecell.Tpo -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailimagecell.Tpo $(DEPDIR)/libgail_la-gailimagecell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimagecell.c' object='libgail_la-gailimagecell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimagecell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailimagecell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c +- +-libgail_la-gailitem.o: gailitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailitem.o `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailitem.Tpo" "$(DEPDIR)/libgail_la-gailitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailitem.c' object='libgail_la-gailitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.o `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c +- +-libgail_la-gailitem.obj: gailitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailitem.obj `if test -f 'gailitem.c'; then $(CYGPATH_W) 'gailitem.c'; else $(CYGPATH_W) '$(srcdir)/gailitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailitem.Tpo" "$(DEPDIR)/libgail_la-gailitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailitem.c' object='libgail_la-gailitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.obj `if test -f 'gailitem.c'; then $(CYGPATH_W) 'gailitem.c'; else $(CYGPATH_W) '$(srcdir)/gailitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c + + libgail_la-gailitem.lo: gailitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailitem.Tpo" "$(DEPDIR)/libgail_la-gailitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailitem.Tpo -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailitem.Tpo $(DEPDIR)/libgail_la-gailitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailitem.c' object='libgail_la-gailitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c +- +-libgail_la-gaillabel.o: gaillabel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.o -MD -MP -MF "$(DEPDIR)/libgail_la-gaillabel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillabel.o `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillabel.Tpo" "$(DEPDIR)/libgail_la-gaillabel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillabel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillabel.c' object='libgail_la-gaillabel.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillabel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillabel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.o `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c +- +-libgail_la-gaillabel.obj: gaillabel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gaillabel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillabel.obj `if test -f 'gaillabel.c'; then $(CYGPATH_W) 'gaillabel.c'; else $(CYGPATH_W) '$(srcdir)/gaillabel.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillabel.Tpo" "$(DEPDIR)/libgail_la-gaillabel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillabel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillabel.c' object='libgail_la-gaillabel.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillabel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillabel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.obj `if test -f 'gaillabel.c'; then $(CYGPATH_W) 'gaillabel.c'; else $(CYGPATH_W) '$(srcdir)/gaillabel.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c + + libgail_la-gaillabel.lo: gaillabel.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gaillabel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillabel.Tpo" "$(DEPDIR)/libgail_la-gaillabel.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillabel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.lo -MD -MP -MF $(DEPDIR)/libgail_la-gaillabel.Tpo -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gaillabel.Tpo $(DEPDIR)/libgail_la-gaillabel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillabel.c' object='libgail_la-gaillabel.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillabel.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gaillabel.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c +- +-libgail_la-gaillist.o: gaillist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.o -MD -MP -MF "$(DEPDIR)/libgail_la-gaillist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillist.o `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillist.Tpo" "$(DEPDIR)/libgail_la-gaillist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillist.c' object='libgail_la-gaillist.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.o `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c +- +-libgail_la-gaillist.obj: gaillist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gaillist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillist.obj `if test -f 'gaillist.c'; then $(CYGPATH_W) 'gaillist.c'; else $(CYGPATH_W) '$(srcdir)/gaillist.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillist.Tpo" "$(DEPDIR)/libgail_la-gaillist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillist.c' object='libgail_la-gaillist.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.obj `if test -f 'gaillist.c'; then $(CYGPATH_W) 'gaillist.c'; else $(CYGPATH_W) '$(srcdir)/gaillist.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c + + libgail_la-gaillist.lo: gaillist.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gaillist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillist.Tpo" "$(DEPDIR)/libgail_la-gaillist.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.lo -MD -MP -MF $(DEPDIR)/libgail_la-gaillist.Tpo -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gaillist.Tpo $(DEPDIR)/libgail_la-gaillist.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillist.c' object='libgail_la-gaillist.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillist.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gaillist.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c +- +-libgail_la-gailmenu.o: gailmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenu.o `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenu.Tpo" "$(DEPDIR)/libgail_la-gailmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenu.c' object='libgail_la-gailmenu.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.o `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c +- +-libgail_la-gailmenu.obj: gailmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenu.obj `if test -f 'gailmenu.c'; then $(CYGPATH_W) 'gailmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailmenu.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenu.Tpo" "$(DEPDIR)/libgail_la-gailmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenu.c' object='libgail_la-gailmenu.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.obj `if test -f 'gailmenu.c'; then $(CYGPATH_W) 'gailmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailmenu.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c + + libgail_la-gailmenu.lo: gailmenu.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenu.Tpo" "$(DEPDIR)/libgail_la-gailmenu.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailmenu.Tpo -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailmenu.Tpo $(DEPDIR)/libgail_la-gailmenu.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenu.c' object='libgail_la-gailmenu.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenu.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailmenu.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c +- +-libgail_la-gailmenushell.o: gailmenushell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenushell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenushell.o `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo" "$(DEPDIR)/libgail_la-gailmenushell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenushell.c' object='libgail_la-gailmenushell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenushell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenushell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.o `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c +- +-libgail_la-gailmenushell.obj: gailmenushell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenushell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenushell.obj `if test -f 'gailmenushell.c'; then $(CYGPATH_W) 'gailmenushell.c'; else $(CYGPATH_W) '$(srcdir)/gailmenushell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo" "$(DEPDIR)/libgail_la-gailmenushell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenushell.c' object='libgail_la-gailmenushell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenushell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenushell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.obj `if test -f 'gailmenushell.c'; then $(CYGPATH_W) 'gailmenushell.c'; else $(CYGPATH_W) '$(srcdir)/gailmenushell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c + + libgail_la-gailmenushell.lo: gailmenushell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenushell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo" "$(DEPDIR)/libgail_la-gailmenushell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailmenushell.Tpo -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailmenushell.Tpo $(DEPDIR)/libgail_la-gailmenushell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenushell.c' object='libgail_la-gailmenushell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenushell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailmenushell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c +- +-libgail_la-gailmenuitem.o: gailmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenuitem.o `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenuitem.c' object='libgail_la-gailmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.o `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c +- +-libgail_la-gailmenuitem.obj: gailmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenuitem.obj `if test -f 'gailmenuitem.c'; then $(CYGPATH_W) 'gailmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenuitem.c' object='libgail_la-gailmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.obj `if test -f 'gailmenuitem.c'; then $(CYGPATH_W) 'gailmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c + + libgail_la-gailmenuitem.lo: gailmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailmenuitem.Tpo -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailmenuitem.Tpo $(DEPDIR)/libgail_la-gailmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenuitem.c' object='libgail_la-gailmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c +- +-libgail_la-gailnotebook.o: gailnotebook.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebook.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebook.o `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo" "$(DEPDIR)/libgail_la-gailnotebook.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebook.c' object='libgail_la-gailnotebook.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebook.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebook.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.o `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c +- +-libgail_la-gailnotebook.obj: gailnotebook.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebook.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebook.obj `if test -f 'gailnotebook.c'; then $(CYGPATH_W) 'gailnotebook.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebook.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo" "$(DEPDIR)/libgail_la-gailnotebook.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebook.c' object='libgail_la-gailnotebook.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebook.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebook.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.obj `if test -f 'gailnotebook.c'; then $(CYGPATH_W) 'gailnotebook.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebook.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c + + libgail_la-gailnotebook.lo: gailnotebook.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebook.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo" "$(DEPDIR)/libgail_la-gailnotebook.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailnotebook.Tpo -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailnotebook.Tpo $(DEPDIR)/libgail_la-gailnotebook.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebook.c' object='libgail_la-gailnotebook.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebook.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebook.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c +- +-libgail_la-gailnotebookpage.o: gailnotebookpage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebookpage.o `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" "$(DEPDIR)/libgail_la-gailnotebookpage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebookpage.c' object='libgail_la-gailnotebookpage.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebookpage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebookpage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.o `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c +- +-libgail_la-gailnotebookpage.obj: gailnotebookpage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebookpage.obj `if test -f 'gailnotebookpage.c'; then $(CYGPATH_W) 'gailnotebookpage.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebookpage.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" "$(DEPDIR)/libgail_la-gailnotebookpage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebookpage.c' object='libgail_la-gailnotebookpage.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebookpage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebookpage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.obj `if test -f 'gailnotebookpage.c'; then $(CYGPATH_W) 'gailnotebookpage.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebookpage.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c + + libgail_la-gailnotebookpage.lo: gailnotebookpage.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" "$(DEPDIR)/libgail_la-gailnotebookpage.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailnotebookpage.Tpo -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailnotebookpage.Tpo $(DEPDIR)/libgail_la-gailnotebookpage.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebookpage.c' object='libgail_la-gailnotebookpage.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebookpage.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebookpage.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c +- +-libgail_la-gailobject.o: gailobject.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailobject.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailobject.o `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailobject.Tpo" "$(DEPDIR)/libgail_la-gailobject.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailobject.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailobject.c' object='libgail_la-gailobject.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailobject.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailobject.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.o `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c +- +-libgail_la-gailobject.obj: gailobject.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailobject.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailobject.obj `if test -f 'gailobject.c'; then $(CYGPATH_W) 'gailobject.c'; else $(CYGPATH_W) '$(srcdir)/gailobject.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailobject.Tpo" "$(DEPDIR)/libgail_la-gailobject.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailobject.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailobject.c' object='libgail_la-gailobject.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailobject.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailobject.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.obj `if test -f 'gailobject.c'; then $(CYGPATH_W) 'gailobject.c'; else $(CYGPATH_W) '$(srcdir)/gailobject.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c + + libgail_la-gailobject.lo: gailobject.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailobject.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailobject.Tpo" "$(DEPDIR)/libgail_la-gailobject.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailobject.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailobject.Tpo -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailobject.Tpo $(DEPDIR)/libgail_la-gailobject.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailobject.c' object='libgail_la-gailobject.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailobject.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailobject.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c +- +-libgail_la-gailoptionmenu.o: gailoptionmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailoptionmenu.o `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" "$(DEPDIR)/libgail_la-gailoptionmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailoptionmenu.c' object='libgail_la-gailoptionmenu.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailoptionmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailoptionmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.o `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c +- +-libgail_la-gailoptionmenu.obj: gailoptionmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailoptionmenu.obj `if test -f 'gailoptionmenu.c'; then $(CYGPATH_W) 'gailoptionmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailoptionmenu.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" "$(DEPDIR)/libgail_la-gailoptionmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailoptionmenu.c' object='libgail_la-gailoptionmenu.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailoptionmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailoptionmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.obj `if test -f 'gailoptionmenu.c'; then $(CYGPATH_W) 'gailoptionmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailoptionmenu.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c + + libgail_la-gailoptionmenu.lo: gailoptionmenu.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" "$(DEPDIR)/libgail_la-gailoptionmenu.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailoptionmenu.Tpo -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailoptionmenu.Tpo $(DEPDIR)/libgail_la-gailoptionmenu.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailoptionmenu.c' object='libgail_la-gailoptionmenu.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailoptionmenu.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailoptionmenu.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c +- +-libgail_la-gailpaned.o: gailpaned.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailpaned.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpaned.o `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpaned.Tpo" "$(DEPDIR)/libgail_la-gailpaned.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpaned.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpaned.c' object='libgail_la-gailpaned.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpaned.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpaned.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.o `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c +- +-libgail_la-gailpaned.obj: gailpaned.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailpaned.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpaned.obj `if test -f 'gailpaned.c'; then $(CYGPATH_W) 'gailpaned.c'; else $(CYGPATH_W) '$(srcdir)/gailpaned.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpaned.Tpo" "$(DEPDIR)/libgail_la-gailpaned.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpaned.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpaned.c' object='libgail_la-gailpaned.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpaned.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpaned.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.obj `if test -f 'gailpaned.c'; then $(CYGPATH_W) 'gailpaned.c'; else $(CYGPATH_W) '$(srcdir)/gailpaned.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c + + libgail_la-gailpaned.lo: gailpaned.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailpaned.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpaned.Tpo" "$(DEPDIR)/libgail_la-gailpaned.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpaned.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailpaned.Tpo -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailpaned.Tpo $(DEPDIR)/libgail_la-gailpaned.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpaned.c' object='libgail_la-gailpaned.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpaned.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailpaned.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c +- +-libgail_la-gailpixmap.o: gailpixmap.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailpixmap.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpixmap.o `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo" "$(DEPDIR)/libgail_la-gailpixmap.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpixmap.c' object='libgail_la-gailpixmap.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpixmap.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpixmap.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.o `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c +- +-libgail_la-gailpixmap.obj: gailpixmap.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailpixmap.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpixmap.obj `if test -f 'gailpixmap.c'; then $(CYGPATH_W) 'gailpixmap.c'; else $(CYGPATH_W) '$(srcdir)/gailpixmap.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo" "$(DEPDIR)/libgail_la-gailpixmap.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpixmap.c' object='libgail_la-gailpixmap.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpixmap.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpixmap.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.obj `if test -f 'gailpixmap.c'; then $(CYGPATH_W) 'gailpixmap.c'; else $(CYGPATH_W) '$(srcdir)/gailpixmap.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c + + libgail_la-gailpixmap.lo: gailpixmap.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailpixmap.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo" "$(DEPDIR)/libgail_la-gailpixmap.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailpixmap.Tpo -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailpixmap.Tpo $(DEPDIR)/libgail_la-gailpixmap.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpixmap.c' object='libgail_la-gailpixmap.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpixmap.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailpixmap.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c +- +-libgail_la-gailprogressbar.o: gailprogressbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailprogressbar.o `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" "$(DEPDIR)/libgail_la-gailprogressbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailprogressbar.c' object='libgail_la-gailprogressbar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailprogressbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailprogressbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.o `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c +- +-libgail_la-gailprogressbar.obj: gailprogressbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailprogressbar.obj `if test -f 'gailprogressbar.c'; then $(CYGPATH_W) 'gailprogressbar.c'; else $(CYGPATH_W) '$(srcdir)/gailprogressbar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" "$(DEPDIR)/libgail_la-gailprogressbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailprogressbar.c' object='libgail_la-gailprogressbar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailprogressbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailprogressbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.obj `if test -f 'gailprogressbar.c'; then $(CYGPATH_W) 'gailprogressbar.c'; else $(CYGPATH_W) '$(srcdir)/gailprogressbar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c + + libgail_la-gailprogressbar.lo: gailprogressbar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" "$(DEPDIR)/libgail_la-gailprogressbar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailprogressbar.Tpo -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailprogressbar.Tpo $(DEPDIR)/libgail_la-gailprogressbar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailprogressbar.c' object='libgail_la-gailprogressbar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailprogressbar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailprogressbar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c +- +-libgail_la-gailradiobutton.o: gailradiobutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiobutton.o `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" "$(DEPDIR)/libgail_la-gailradiobutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiobutton.c' object='libgail_la-gailradiobutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiobutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiobutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.o `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c +- +-libgail_la-gailradiobutton.obj: gailradiobutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiobutton.obj `if test -f 'gailradiobutton.c'; then $(CYGPATH_W) 'gailradiobutton.c'; else $(CYGPATH_W) '$(srcdir)/gailradiobutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" "$(DEPDIR)/libgail_la-gailradiobutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiobutton.c' object='libgail_la-gailradiobutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiobutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiobutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.obj `if test -f 'gailradiobutton.c'; then $(CYGPATH_W) 'gailradiobutton.c'; else $(CYGPATH_W) '$(srcdir)/gailradiobutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c + + libgail_la-gailradiobutton.lo: gailradiobutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" "$(DEPDIR)/libgail_la-gailradiobutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailradiobutton.Tpo -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailradiobutton.Tpo $(DEPDIR)/libgail_la-gailradiobutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiobutton.c' object='libgail_la-gailradiobutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiobutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailradiobutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c +- +-libgail_la-gailradiomenuitem.o: gailradiomenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiomenuitem.o `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiomenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiomenuitem.c' object='libgail_la-gailradiomenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiomenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiomenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.o `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c +- +-libgail_la-gailradiomenuitem.obj: gailradiomenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiomenuitem.obj `if test -f 'gailradiomenuitem.c'; then $(CYGPATH_W) 'gailradiomenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiomenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiomenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiomenuitem.c' object='libgail_la-gailradiomenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiomenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiomenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.obj `if test -f 'gailradiomenuitem.c'; then $(CYGPATH_W) 'gailradiomenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiomenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c + + libgail_la-gailradiomenuitem.lo: gailradiomenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiomenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailradiomenuitem.Tpo -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailradiomenuitem.Tpo $(DEPDIR)/libgail_la-gailradiomenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiomenuitem.c' object='libgail_la-gailradiomenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiomenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailradiomenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c +- +-libgail_la-gailradiosubmenuitem.o: gailradiosubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiosubmenuitem.o `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiosubmenuitem.c' object='libgail_la-gailradiosubmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.o `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c +- +-libgail_la-gailradiosubmenuitem.obj: gailradiosubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiosubmenuitem.obj `if test -f 'gailradiosubmenuitem.c'; then $(CYGPATH_W) 'gailradiosubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiosubmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiosubmenuitem.c' object='libgail_la-gailradiosubmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.obj `if test -f 'gailradiosubmenuitem.c'; then $(CYGPATH_W) 'gailradiosubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiosubmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c + + libgail_la-gailradiosubmenuitem.lo: gailradiosubmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo $(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiosubmenuitem.c' object='libgail_la-gailradiosubmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c +- +-libgail_la-gailrange.o: gailrange.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailrange.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrange.o `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrange.Tpo" "$(DEPDIR)/libgail_la-gailrange.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrange.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrange.c' object='libgail_la-gailrange.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrange.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrange.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.o `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c +- +-libgail_la-gailrange.obj: gailrange.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailrange.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrange.obj `if test -f 'gailrange.c'; then $(CYGPATH_W) 'gailrange.c'; else $(CYGPATH_W) '$(srcdir)/gailrange.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrange.Tpo" "$(DEPDIR)/libgail_la-gailrange.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrange.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrange.c' object='libgail_la-gailrange.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrange.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrange.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.obj `if test -f 'gailrange.c'; then $(CYGPATH_W) 'gailrange.c'; else $(CYGPATH_W) '$(srcdir)/gailrange.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c + + libgail_la-gailrange.lo: gailrange.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailrange.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrange.Tpo" "$(DEPDIR)/libgail_la-gailrange.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrange.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailrange.Tpo -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailrange.Tpo $(DEPDIR)/libgail_la-gailrange.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrange.c' object='libgail_la-gailrange.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrange.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailrange.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c +- +-libgail_la-gailrenderercell.o: gailrenderercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrenderercell.o `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" "$(DEPDIR)/libgail_la-gailrenderercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrenderercell.c' object='libgail_la-gailrenderercell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrenderercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrenderercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.o `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c +- +-libgail_la-gailrenderercell.obj: gailrenderercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrenderercell.obj `if test -f 'gailrenderercell.c'; then $(CYGPATH_W) 'gailrenderercell.c'; else $(CYGPATH_W) '$(srcdir)/gailrenderercell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" "$(DEPDIR)/libgail_la-gailrenderercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrenderercell.c' object='libgail_la-gailrenderercell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrenderercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrenderercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.obj `if test -f 'gailrenderercell.c'; then $(CYGPATH_W) 'gailrenderercell.c'; else $(CYGPATH_W) '$(srcdir)/gailrenderercell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c + + libgail_la-gailrenderercell.lo: gailrenderercell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" "$(DEPDIR)/libgail_la-gailrenderercell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailrenderercell.Tpo -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailrenderercell.Tpo $(DEPDIR)/libgail_la-gailrenderercell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrenderercell.c' object='libgail_la-gailrenderercell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrenderercell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailrenderercell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c +- +-libgail_la-gailscale.o: gailscale.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailscale.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscale.o `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscale.Tpo" "$(DEPDIR)/libgail_la-gailscale.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscale.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscale.c' object='libgail_la-gailscale.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscale.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscale.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.o `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c +- +-libgail_la-gailscale.obj: gailscale.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailscale.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscale.obj `if test -f 'gailscale.c'; then $(CYGPATH_W) 'gailscale.c'; else $(CYGPATH_W) '$(srcdir)/gailscale.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscale.Tpo" "$(DEPDIR)/libgail_la-gailscale.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscale.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscale.c' object='libgail_la-gailscale.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscale.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscale.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.obj `if test -f 'gailscale.c'; then $(CYGPATH_W) 'gailscale.c'; else $(CYGPATH_W) '$(srcdir)/gailscale.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c + + libgail_la-gailscale.lo: gailscale.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailscale.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscale.Tpo" "$(DEPDIR)/libgail_la-gailscale.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscale.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailscale.Tpo -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailscale.Tpo $(DEPDIR)/libgail_la-gailscale.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscale.c' object='libgail_la-gailscale.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscale.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailscale.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c +- +-libgail_la-gailscrollbar.o: gailscrollbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrollbar.o `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" "$(DEPDIR)/libgail_la-gailscrollbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrollbar.c' object='libgail_la-gailscrollbar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrollbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrollbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.o `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c +- +-libgail_la-gailscrollbar.obj: gailscrollbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrollbar.obj `if test -f 'gailscrollbar.c'; then $(CYGPATH_W) 'gailscrollbar.c'; else $(CYGPATH_W) '$(srcdir)/gailscrollbar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" "$(DEPDIR)/libgail_la-gailscrollbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrollbar.c' object='libgail_la-gailscrollbar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrollbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrollbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.obj `if test -f 'gailscrollbar.c'; then $(CYGPATH_W) 'gailscrollbar.c'; else $(CYGPATH_W) '$(srcdir)/gailscrollbar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c + + libgail_la-gailscrollbar.lo: gailscrollbar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" "$(DEPDIR)/libgail_la-gailscrollbar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailscrollbar.Tpo -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailscrollbar.Tpo $(DEPDIR)/libgail_la-gailscrollbar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrollbar.c' object='libgail_la-gailscrollbar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrollbar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailscrollbar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c +- +-libgail_la-gailscrolledwindow.o: gailscrolledwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrolledwindow.o `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" "$(DEPDIR)/libgail_la-gailscrolledwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrolledwindow.c' object='libgail_la-gailscrolledwindow.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrolledwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrolledwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.o `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c +- +-libgail_la-gailscrolledwindow.obj: gailscrolledwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrolledwindow.obj `if test -f 'gailscrolledwindow.c'; then $(CYGPATH_W) 'gailscrolledwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailscrolledwindow.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" "$(DEPDIR)/libgail_la-gailscrolledwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrolledwindow.c' object='libgail_la-gailscrolledwindow.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrolledwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrolledwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.obj `if test -f 'gailscrolledwindow.c'; then $(CYGPATH_W) 'gailscrolledwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailscrolledwindow.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c + + libgail_la-gailscrolledwindow.lo: gailscrolledwindow.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" "$(DEPDIR)/libgail_la-gailscrolledwindow.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailscrolledwindow.Tpo -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailscrolledwindow.Tpo $(DEPDIR)/libgail_la-gailscrolledwindow.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrolledwindow.c' object='libgail_la-gailscrolledwindow.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrolledwindow.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailscrolledwindow.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c +- +-libgail_la-gailseparator.o: gailseparator.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailseparator.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailseparator.o `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailseparator.Tpo" "$(DEPDIR)/libgail_la-gailseparator.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailseparator.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailseparator.c' object='libgail_la-gailseparator.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailseparator.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailseparator.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.o `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c +- +-libgail_la-gailseparator.obj: gailseparator.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailseparator.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailseparator.obj `if test -f 'gailseparator.c'; then $(CYGPATH_W) 'gailseparator.c'; else $(CYGPATH_W) '$(srcdir)/gailseparator.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailseparator.Tpo" "$(DEPDIR)/libgail_la-gailseparator.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailseparator.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailseparator.c' object='libgail_la-gailseparator.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailseparator.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailseparator.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.obj `if test -f 'gailseparator.c'; then $(CYGPATH_W) 'gailseparator.c'; else $(CYGPATH_W) '$(srcdir)/gailseparator.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c + + libgail_la-gailseparator.lo: gailseparator.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailseparator.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailseparator.Tpo" "$(DEPDIR)/libgail_la-gailseparator.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailseparator.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailseparator.Tpo -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailseparator.Tpo $(DEPDIR)/libgail_la-gailseparator.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailseparator.c' object='libgail_la-gailseparator.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailseparator.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailseparator.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c +- +-libgail_la-gailspinbutton.o: gailspinbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailspinbutton.o `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" "$(DEPDIR)/libgail_la-gailspinbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailspinbutton.c' object='libgail_la-gailspinbutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailspinbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailspinbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.o `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c +- +-libgail_la-gailspinbutton.obj: gailspinbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailspinbutton.obj `if test -f 'gailspinbutton.c'; then $(CYGPATH_W) 'gailspinbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailspinbutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" "$(DEPDIR)/libgail_la-gailspinbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailspinbutton.c' object='libgail_la-gailspinbutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailspinbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailspinbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.obj `if test -f 'gailspinbutton.c'; then $(CYGPATH_W) 'gailspinbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailspinbutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c + + libgail_la-gailspinbutton.lo: gailspinbutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" "$(DEPDIR)/libgail_la-gailspinbutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailspinbutton.Tpo -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailspinbutton.Tpo $(DEPDIR)/libgail_la-gailspinbutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailspinbutton.c' object='libgail_la-gailspinbutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailspinbutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailspinbutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c +- +-libgail_la-gailsubmenuitem.o: gailsubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailsubmenuitem.o `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailsubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailsubmenuitem.c' object='libgail_la-gailsubmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailsubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailsubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.o `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c +- +-libgail_la-gailsubmenuitem.obj: gailsubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailsubmenuitem.obj `if test -f 'gailsubmenuitem.c'; then $(CYGPATH_W) 'gailsubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailsubmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailsubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailsubmenuitem.c' object='libgail_la-gailsubmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailsubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailsubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.obj `if test -f 'gailsubmenuitem.c'; then $(CYGPATH_W) 'gailsubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailsubmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c + + libgail_la-gailsubmenuitem.lo: gailsubmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailsubmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailsubmenuitem.Tpo -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailsubmenuitem.Tpo $(DEPDIR)/libgail_la-gailsubmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailsubmenuitem.c' object='libgail_la-gailsubmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailsubmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailsubmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c +- +-libgail_la-gailstatusbar.o: gailstatusbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailstatusbar.o `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" "$(DEPDIR)/libgail_la-gailstatusbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailstatusbar.c' object='libgail_la-gailstatusbar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailstatusbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailstatusbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.o `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c +- +-libgail_la-gailstatusbar.obj: gailstatusbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailstatusbar.obj `if test -f 'gailstatusbar.c'; then $(CYGPATH_W) 'gailstatusbar.c'; else $(CYGPATH_W) '$(srcdir)/gailstatusbar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" "$(DEPDIR)/libgail_la-gailstatusbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailstatusbar.c' object='libgail_la-gailstatusbar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailstatusbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailstatusbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.obj `if test -f 'gailstatusbar.c'; then $(CYGPATH_W) 'gailstatusbar.c'; else $(CYGPATH_W) '$(srcdir)/gailstatusbar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c + + libgail_la-gailstatusbar.lo: gailstatusbar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" "$(DEPDIR)/libgail_la-gailstatusbar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailstatusbar.Tpo -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailstatusbar.Tpo $(DEPDIR)/libgail_la-gailstatusbar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailstatusbar.c' object='libgail_la-gailstatusbar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailstatusbar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailstatusbar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c +- +-libgail_la-gailtextcell.o: gailtextcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextcell.o `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo" "$(DEPDIR)/libgail_la-gailtextcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextcell.c' object='libgail_la-gailtextcell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.o `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c +- +-libgail_la-gailtextcell.obj: gailtextcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextcell.obj `if test -f 'gailtextcell.c'; then $(CYGPATH_W) 'gailtextcell.c'; else $(CYGPATH_W) '$(srcdir)/gailtextcell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo" "$(DEPDIR)/libgail_la-gailtextcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextcell.c' object='libgail_la-gailtextcell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.obj `if test -f 'gailtextcell.c'; then $(CYGPATH_W) 'gailtextcell.c'; else $(CYGPATH_W) '$(srcdir)/gailtextcell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c + + libgail_la-gailtextcell.lo: gailtextcell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo" "$(DEPDIR)/libgail_la-gailtextcell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtextcell.Tpo -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtextcell.Tpo $(DEPDIR)/libgail_la-gailtextcell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextcell.c' object='libgail_la-gailtextcell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextcell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtextcell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c +- +-libgail_la-gailtextview.o: gailtextview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextview.o `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextview.Tpo" "$(DEPDIR)/libgail_la-gailtextview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextview.c' object='libgail_la-gailtextview.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.o `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c +- +-libgail_la-gailtextview.obj: gailtextview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextview.obj `if test -f 'gailtextview.c'; then $(CYGPATH_W) 'gailtextview.c'; else $(CYGPATH_W) '$(srcdir)/gailtextview.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextview.Tpo" "$(DEPDIR)/libgail_la-gailtextview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextview.c' object='libgail_la-gailtextview.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.obj `if test -f 'gailtextview.c'; then $(CYGPATH_W) 'gailtextview.c'; else $(CYGPATH_W) '$(srcdir)/gailtextview.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c + + libgail_la-gailtextview.lo: gailtextview.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextview.Tpo" "$(DEPDIR)/libgail_la-gailtextview.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtextview.Tpo -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtextview.Tpo $(DEPDIR)/libgail_la-gailtextview.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextview.c' object='libgail_la-gailtextview.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextview.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtextview.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c +- +-libgail_la-gailtogglebutton.o: gailtogglebutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtogglebutton.o `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" "$(DEPDIR)/libgail_la-gailtogglebutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtogglebutton.c' object='libgail_la-gailtogglebutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtogglebutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtogglebutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.o `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c +- +-libgail_la-gailtogglebutton.obj: gailtogglebutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtogglebutton.obj `if test -f 'gailtogglebutton.c'; then $(CYGPATH_W) 'gailtogglebutton.c'; else $(CYGPATH_W) '$(srcdir)/gailtogglebutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" "$(DEPDIR)/libgail_la-gailtogglebutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtogglebutton.c' object='libgail_la-gailtogglebutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtogglebutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtogglebutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.obj `if test -f 'gailtogglebutton.c'; then $(CYGPATH_W) 'gailtogglebutton.c'; else $(CYGPATH_W) '$(srcdir)/gailtogglebutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c + + libgail_la-gailtogglebutton.lo: gailtogglebutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" "$(DEPDIR)/libgail_la-gailtogglebutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtogglebutton.Tpo -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtogglebutton.Tpo $(DEPDIR)/libgail_la-gailtogglebutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtogglebutton.c' object='libgail_la-gailtogglebutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtogglebutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtogglebutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c +- +-libgail_la-gailtoplevel.o: gailtoplevel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtoplevel.o `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" "$(DEPDIR)/libgail_la-gailtoplevel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtoplevel.c' object='libgail_la-gailtoplevel.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtoplevel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtoplevel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.o `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c +- +-libgail_la-gailtoplevel.obj: gailtoplevel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtoplevel.obj `if test -f 'gailtoplevel.c'; then $(CYGPATH_W) 'gailtoplevel.c'; else $(CYGPATH_W) '$(srcdir)/gailtoplevel.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" "$(DEPDIR)/libgail_la-gailtoplevel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtoplevel.c' object='libgail_la-gailtoplevel.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtoplevel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtoplevel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.obj `if test -f 'gailtoplevel.c'; then $(CYGPATH_W) 'gailtoplevel.c'; else $(CYGPATH_W) '$(srcdir)/gailtoplevel.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c + + libgail_la-gailtoplevel.lo: gailtoplevel.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" "$(DEPDIR)/libgail_la-gailtoplevel.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtoplevel.Tpo -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtoplevel.Tpo $(DEPDIR)/libgail_la-gailtoplevel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtoplevel.c' object='libgail_la-gailtoplevel.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtoplevel.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtoplevel.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c +- +-libgail_la-gailtreeview.o: gailtreeview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtreeview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtreeview.o `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo" "$(DEPDIR)/libgail_la-gailtreeview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtreeview.c' object='libgail_la-gailtreeview.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtreeview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtreeview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.o `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c +- +-libgail_la-gailtreeview.obj: gailtreeview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtreeview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtreeview.obj `if test -f 'gailtreeview.c'; then $(CYGPATH_W) 'gailtreeview.c'; else $(CYGPATH_W) '$(srcdir)/gailtreeview.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo" "$(DEPDIR)/libgail_la-gailtreeview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtreeview.c' object='libgail_la-gailtreeview.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtreeview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtreeview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.obj `if test -f 'gailtreeview.c'; then $(CYGPATH_W) 'gailtreeview.c'; else $(CYGPATH_W) '$(srcdir)/gailtreeview.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c + + libgail_la-gailtreeview.lo: gailtreeview.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtreeview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo" "$(DEPDIR)/libgail_la-gailtreeview.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtreeview.Tpo -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtreeview.Tpo $(DEPDIR)/libgail_la-gailtreeview.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtreeview.c' object='libgail_la-gailtreeview.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtreeview.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtreeview.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c +- +-libgail_la-gailutil.o: gailutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailutil.o `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailutil.Tpo" "$(DEPDIR)/libgail_la-gailutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailutil.c' object='libgail_la-gailutil.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailutil.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.o `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c +- +-libgail_la-gailutil.obj: gailutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailutil.obj `if test -f 'gailutil.c'; then $(CYGPATH_W) 'gailutil.c'; else $(CYGPATH_W) '$(srcdir)/gailutil.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailutil.Tpo" "$(DEPDIR)/libgail_la-gailutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailutil.c' object='libgail_la-gailutil.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailutil.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.obj `if test -f 'gailutil.c'; then $(CYGPATH_W) 'gailutil.c'; else $(CYGPATH_W) '$(srcdir)/gailutil.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c + + libgail_la-gailutil.lo: gailutil.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailutil.Tpo" "$(DEPDIR)/libgail_la-gailutil.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailutil.Tpo -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailutil.Tpo $(DEPDIR)/libgail_la-gailutil.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailutil.c' object='libgail_la-gailutil.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailutil.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailutil.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c +- +-libgail_la-gailwidget.o: gailwidget.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailwidget.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwidget.o `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwidget.Tpo" "$(DEPDIR)/libgail_la-gailwidget.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwidget.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwidget.c' object='libgail_la-gailwidget.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwidget.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwidget.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.o `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c +- +-libgail_la-gailwidget.obj: gailwidget.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailwidget.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwidget.obj `if test -f 'gailwidget.c'; then $(CYGPATH_W) 'gailwidget.c'; else $(CYGPATH_W) '$(srcdir)/gailwidget.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwidget.Tpo" "$(DEPDIR)/libgail_la-gailwidget.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwidget.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwidget.c' object='libgail_la-gailwidget.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwidget.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwidget.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.obj `if test -f 'gailwidget.c'; then $(CYGPATH_W) 'gailwidget.c'; else $(CYGPATH_W) '$(srcdir)/gailwidget.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c + + libgail_la-gailwidget.lo: gailwidget.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailwidget.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwidget.Tpo" "$(DEPDIR)/libgail_la-gailwidget.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwidget.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailwidget.Tpo -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailwidget.Tpo $(DEPDIR)/libgail_la-gailwidget.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwidget.c' object='libgail_la-gailwidget.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwidget.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailwidget.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c +- +-libgail_la-gailwindow.o: gailwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwindow.o `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwindow.Tpo" "$(DEPDIR)/libgail_la-gailwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwindow.c' object='libgail_la-gailwindow.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.o `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c +- +-libgail_la-gailwindow.obj: gailwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwindow.obj `if test -f 'gailwindow.c'; then $(CYGPATH_W) 'gailwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailwindow.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwindow.Tpo" "$(DEPDIR)/libgail_la-gailwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwindow.c' object='libgail_la-gailwindow.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.obj `if test -f 'gailwindow.c'; then $(CYGPATH_W) 'gailwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailwindow.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c + + libgail_la-gailwindow.lo: gailwindow.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwindow.Tpo" "$(DEPDIR)/libgail_la-gailwindow.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailwindow.Tpo -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailwindow.Tpo $(DEPDIR)/libgail_la-gailwindow.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwindow.c' object='libgail_la-gailwindow.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwindow.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailwindow.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgailincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgailincludeHEADERS: $(libgailinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgailincludedir) ++ test -z "$(libgailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgailincludedir)" + @list='$(libgailinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailincludedir)/$$f"; \ +- $(libgailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgailincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgailincludedir)/$$f'"; \ ++ $(libgailincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgailincludedir)/$$f"; \ + done + + uninstall-libgailincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgailinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgailincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgailincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgailincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgailincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -2688,7 +1101,13 @@ uninstall-libgailincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -2700,15 +1119,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -2729,7 +1153,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -2740,35 +1164,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -2776,23 +1195,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -2804,29 +1223,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -2837,15 +1250,19 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -2856,8 +1273,9 @@ check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(moduledir) $(DESTDIR)$(libgailincludedir) +- ++ for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(libgailincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -2877,7 +1295,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -2891,24 +1309,35 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + +-install-data-am: install-libgailincludeHEADERS install-moduleLTLIBRARIES ++install-data-am: install-libgailincludeHEADERS \ ++ install-moduleLTLIBRARIES ++ ++install-dvi: install-dvi-recursive + + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -2929,30 +1358,28 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgailincludeHEADERS \ ++uninstall-am: uninstall-libgailincludeHEADERS \ + uninstall-moduleLTLIBRARIES + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool \ +- clean-moduleLTLIBRARIES clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am \ +- dvi-recursive info info-am info-recursive install install-am \ +- install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive \ +- install-libgailincludeHEADERS install-man \ +- install-moduleLTLIBRARIES install-recursive install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- installdirs-recursive maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ +- tags-recursive uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-libgailincludeHEADERS \ +- uninstall-moduleLTLIBRARIES uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool clean-moduleLTLIBRARIES ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgailincludeHEADERS install-man \ ++ install-moduleLTLIBRARIES install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-libgailincludeHEADERS uninstall-moduleLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/other/gail/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/gail/tests/Makefile.in 2009-02-17 23:15:20.439087138 +0100 ++++ gtk+-2.14.7/modules/other/gail/tests/Makefile.in 2009-02-21 14:58:48.394582668 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,183 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/other/gail/tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(moduledir)" ++moduleLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++@OS_WIN32_FALSE@libferret_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/gtk/$(gtktargetlib) \ ++@OS_WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am__libferret_la_SOURCES_DIST = testlib.c testlib.h ferret.c ++@OS_WIN32_FALSE@am_libferret_la_OBJECTS = testlib.lo ferret.lo ++libferret_la_OBJECTS = $(am_libferret_la_OBJECTS) ++libferret_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libferret_la_LDFLAGS) $(LDFLAGS) -o $@ ++@OS_WIN32_FALSE@am_libferret_la_rpath = -rpath $(moduledir) ++libtestaction_la_LIBADD = ++am_libtestaction_la_OBJECTS = testaction.lo ++libtestaction_la_OBJECTS = $(am_libtestaction_la_OBJECTS) ++libtestaction_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestaction_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestbutton_la_LIBADD = ++am_libtestbutton_la_OBJECTS = testlib.lo testbutton.lo ++libtestbutton_la_OBJECTS = $(am_libtestbutton_la_OBJECTS) ++libtestbutton_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestbutton_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestcombo_la_LIBADD = ++am_libtestcombo_la_OBJECTS = testlib.lo testcombo.lo ++libtestcombo_la_OBJECTS = $(am_libtestcombo_la_OBJECTS) ++libtestcombo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestcombo_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestcomponent_la_LIBADD = ++am_libtestcomponent_la_OBJECTS = testcomponent.lo ++libtestcomponent_la_OBJECTS = $(am_libtestcomponent_la_OBJECTS) ++libtestcomponent_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestcomponent_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestimage_la_LIBADD = ++am_libtestimage_la_OBJECTS = testimage.lo ++libtestimage_la_OBJECTS = $(am_libtestimage_la_OBJECTS) ++libtestimage_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestimage_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestmenuitem_la_LIBADD = ++am_libtestmenuitem_la_OBJECTS = testlib.lo testmenuitem.lo ++libtestmenuitem_la_OBJECTS = $(am_libtestmenuitem_la_OBJECTS) ++libtestmenuitem_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestmenuitem_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestnotebook_la_LIBADD = ++am_libtestnotebook_la_OBJECTS = testlib.lo testnotebook.lo ++libtestnotebook_la_OBJECTS = $(am_libtestnotebook_la_OBJECTS) ++libtestnotebook_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestnotebook_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestobject_la_LIBADD = ++am_libtestobject_la_OBJECTS = testlib.lo testobject.lo ++libtestobject_la_OBJECTS = $(am_libtestobject_la_OBJECTS) ++libtestobject_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestobject_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestoptionmenu_la_LIBADD = ++am_libtestoptionmenu_la_OBJECTS = testlib.lo testoptionmenu.lo ++libtestoptionmenu_la_OBJECTS = $(am_libtestoptionmenu_la_OBJECTS) ++libtestoptionmenu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestoptionmenu_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestpaned_la_LIBADD = ++am_libtestpaned_la_OBJECTS = testlib.lo testpaned.lo ++libtestpaned_la_OBJECTS = $(am_libtestpaned_la_OBJECTS) ++libtestpaned_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestpaned_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestprops_la_LIBADD = ++am_libtestprops_la_OBJECTS = testlib.lo testprops.lo ++libtestprops_la_OBJECTS = $(am_libtestprops_la_OBJECTS) ++libtestprops_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestprops_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestselection_la_LIBADD = ++am_libtestselection_la_OBJECTS = testselection.lo ++libtestselection_la_OBJECTS = $(am_libtestselection_la_OBJECTS) ++libtestselection_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestselection_la_LDFLAGS) $(LDFLAGS) -o $@ ++libteststatusbar_la_LIBADD = ++am_libteststatusbar_la_OBJECTS = teststatusbar.lo ++libteststatusbar_la_OBJECTS = $(am_libteststatusbar_la_OBJECTS) ++libteststatusbar_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libteststatusbar_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttable_la_LIBADD = ++am_libtesttable_la_OBJECTS = testlib.lo testtextlib.lo testtable.lo ++libtesttable_la_OBJECTS = $(am_libtesttable_la_OBJECTS) ++libtesttable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttable_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttext_la_LIBADD = ++am_libtesttext_la_OBJECTS = testlib.lo testtextlib.lo testtext.lo ++libtesttext_la_OBJECTS = $(am_libtesttext_la_OBJECTS) ++libtesttext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttext_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttoplevel_la_LIBADD = ++am_libtesttoplevel_la_OBJECTS = testlib.lo testtoplevel.lo ++libtesttoplevel_la_OBJECTS = $(am_libtesttoplevel_la_OBJECTS) ++libtesttoplevel_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttoplevel_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttreetable_la_LIBADD = ++am_libtesttreetable_la_OBJECTS = testlib.lo testtreetable.lo ++libtesttreetable_la_OBJECTS = $(am_libtesttreetable_la_OBJECTS) ++libtesttreetable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttreetable_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestvalues_la_LIBADD = ++am_libtestvalues_la_OBJECTS = testvalues.lo ++libtestvalues_la_OBJECTS = $(am_libtestvalues_la_OBJECTS) ++libtestvalues_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestvalues_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libferret_la_SOURCES) $(libtestaction_la_SOURCES) \ ++ $(libtestbutton_la_SOURCES) $(libtestcombo_la_SOURCES) \ ++ $(libtestcomponent_la_SOURCES) $(libtestimage_la_SOURCES) \ ++ $(libtestmenuitem_la_SOURCES) $(libtestnotebook_la_SOURCES) \ ++ $(libtestobject_la_SOURCES) $(libtestoptionmenu_la_SOURCES) \ ++ $(libtestpaned_la_SOURCES) $(libtestprops_la_SOURCES) \ ++ $(libtestselection_la_SOURCES) $(libteststatusbar_la_SOURCES) \ ++ $(libtesttable_la_SOURCES) $(libtesttext_la_SOURCES) \ ++ $(libtesttoplevel_la_SOURCES) $(libtesttreetable_la_SOURCES) \ ++ $(libtestvalues_la_SOURCES) ++DIST_SOURCES = $(am__libferret_la_SOURCES_DIST) \ ++ $(libtestaction_la_SOURCES) $(libtestbutton_la_SOURCES) \ ++ $(libtestcombo_la_SOURCES) $(libtestcomponent_la_SOURCES) \ ++ $(libtestimage_la_SOURCES) $(libtestmenuitem_la_SOURCES) \ ++ $(libtestnotebook_la_SOURCES) $(libtestobject_la_SOURCES) \ ++ $(libtestoptionmenu_la_SOURCES) $(libtestpaned_la_SOURCES) \ ++ $(libtestprops_la_SOURCES) $(libtestselection_la_SOURCES) \ ++ $(libteststatusbar_la_SOURCES) $(libtesttable_la_SOURCES) \ ++ $(libtesttext_la_SOURCES) $(libtesttoplevel_la_SOURCES) \ ++ $(libtesttreetable_la_SOURCES) $(libtestvalues_la_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +219,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +244,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +251,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +277,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +296,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +306,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +335,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +354,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +365,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +377,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +418,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +427,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,15 +462,11 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @OS_WIN32_TRUE@no_undefined = -no-undefined +- + moduledir = $(libdir)/gtk-2.0/modules +- + @OS_WIN32_FALSE@module_LTLIBRARIES = \ + @OS_WIN32_FALSE@ libferret.la + +- + noinst_LTLIBRARIES = \ + libtestaction.la \ + libtestbutton.la \ +@@ -435,7 +487,6 @@ noinst_LTLIBRARIES = \ + libtesttreetable.la \ + libtestvalues.la + +- + AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -444,34 +495,28 @@ AM_CPPFLAGS = \ + -I$(top_builddir)/gtk \ + -DGDK_DISABLE_DEPRECATED + +- + AM_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) + +- + @OS_WIN32_FALSE@libferret_la_SOURCES = \ + @OS_WIN32_FALSE@ testlib.c \ + @OS_WIN32_FALSE@ testlib.h \ + @OS_WIN32_FALSE@ ferret.c + +- + @OS_WIN32_FALSE@libferret_la_LDFLAGS = \ + @OS_WIN32_FALSE@ -rpath $(moduledir) -module -avoid-version \ + @OS_WIN32_FALSE@ $(no_undefined) \ + @OS_WIN32_FALSE@ $(LDFLAGS) + +- + @OS_WIN32_FALSE@libferret_la_LIBADD = \ + @OS_WIN32_FALSE@ $(top_builddir)/gtk/$(gtktargetlib) \ + @OS_WIN32_FALSE@ $(GTK_DEP_LIBS) \ + @OS_WIN32_FALSE@ $(GAIL_INET_LIBS) + +- + libtestaction_la_SOURCES = \ + testaction.c + +- + libtestaction_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -479,13 +524,11 @@ libtestaction_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestbutton_la_SOURCES = \ + testlib.c \ + testlib.h \ + testbutton.c + +- + libtestbutton_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -493,13 +536,11 @@ libtestbutton_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestcombo_la_SOURCES = \ + testlib.c \ + testlib.h \ + testcombo.c + +- + libtestcombo_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -507,11 +548,9 @@ libtestcombo_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestcomponent_la_SOURCES = \ + testcomponent.c + +- + libtestcomponent_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -519,11 +558,9 @@ libtestcomponent_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestimage_la_SOURCES = \ + testimage.c + +- + libtestimage_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -531,13 +568,11 @@ libtestimage_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestmenuitem_la_SOURCES = \ + testlib.c \ + testlib.h \ + testmenuitem.c + +- + libtestmenuitem_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -545,13 +580,11 @@ libtestmenuitem_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestnotebook_la_SOURCES = \ + testlib.c \ + testlib.h \ + testnotebook.c + +- + libtestnotebook_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -559,13 +592,11 @@ libtestnotebook_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestobject_la_SOURCES = \ + testlib.c \ + testlib.h \ + testobject.c + +- + libtestobject_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -573,13 +604,11 @@ libtestobject_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestoptionmenu_la_SOURCES = \ + testlib.c \ + testlib.h \ + testoptionmenu.c + +- + libtestoptionmenu_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -587,13 +616,11 @@ libtestoptionmenu_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestpaned_la_SOURCES = \ + testlib.c \ + testlib.h \ + testpaned.c + +- + libtestpaned_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -601,13 +628,11 @@ libtestpaned_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestprops_la_SOURCES = \ + testlib.c \ + testlib.h \ + testprops.c + +- + libtestprops_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -615,11 +640,9 @@ libtestprops_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestselection_la_SOURCES = \ + testselection.c + +- + libtestselection_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -627,11 +650,9 @@ libtestselection_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libteststatusbar_la_SOURCES = \ + teststatusbar.c + +- + libteststatusbar_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -639,7 +660,6 @@ libteststatusbar_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttable_la_SOURCES = \ + testlib.c \ + testlib.h \ +@@ -647,7 +667,6 @@ libtesttable_la_SOURCES = \ + testtextlib.h \ + testtable.c + +- + libtesttable_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -655,7 +674,6 @@ libtesttable_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttext_la_SOURCES = \ + testlib.c \ + testlib.h \ +@@ -663,7 +681,6 @@ libtesttext_la_SOURCES = \ + testtextlib.h \ + testtext.c + +- + libtesttext_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -671,13 +688,11 @@ libtesttext_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttoplevel_la_SOURCES = \ + testlib.c \ + testlib.h \ + testtoplevel.c + +- + libtesttoplevel_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -685,13 +700,11 @@ libtesttoplevel_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttreetable_la_SOURCES = \ + testlib.c \ + testlib.h \ + testtreetable.c + +- + libtesttreetable_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -699,11 +712,9 @@ libtesttreetable_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestvalues_la_SOURCES = \ + testvalues.c + +- + libtestvalues_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -711,150 +722,63 @@ libtestvalues_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +-subdir = modules/other/gail/tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) +- +-@OS_WIN32_TRUE@libferret_la_DEPENDENCIES = +-@OS_WIN32_FALSE@libferret_la_DEPENDENCIES = \ +-@OS_WIN32_FALSE@ $(top_builddir)/gtk/$(gtktargetlib) +-am__libferret_la_SOURCES_DIST = testlib.c testlib.h ferret.c +-@OS_WIN32_FALSE@am_libferret_la_OBJECTS = testlib.lo ferret.lo +-libferret_la_OBJECTS = $(am_libferret_la_OBJECTS) +-libtestaction_la_LIBADD = +-am_libtestaction_la_OBJECTS = testaction.lo +-libtestaction_la_OBJECTS = $(am_libtestaction_la_OBJECTS) +-libtestbutton_la_LIBADD = +-am_libtestbutton_la_OBJECTS = testlib.lo testbutton.lo +-libtestbutton_la_OBJECTS = $(am_libtestbutton_la_OBJECTS) +-libtestcombo_la_LIBADD = +-am_libtestcombo_la_OBJECTS = testlib.lo testcombo.lo +-libtestcombo_la_OBJECTS = $(am_libtestcombo_la_OBJECTS) +-libtestcomponent_la_LIBADD = +-am_libtestcomponent_la_OBJECTS = testcomponent.lo +-libtestcomponent_la_OBJECTS = $(am_libtestcomponent_la_OBJECTS) +-libtestimage_la_LIBADD = +-am_libtestimage_la_OBJECTS = testimage.lo +-libtestimage_la_OBJECTS = $(am_libtestimage_la_OBJECTS) +-libtestmenuitem_la_LIBADD = +-am_libtestmenuitem_la_OBJECTS = testlib.lo testmenuitem.lo +-libtestmenuitem_la_OBJECTS = $(am_libtestmenuitem_la_OBJECTS) +-libtestnotebook_la_LIBADD = +-am_libtestnotebook_la_OBJECTS = testlib.lo testnotebook.lo +-libtestnotebook_la_OBJECTS = $(am_libtestnotebook_la_OBJECTS) +-libtestobject_la_LIBADD = +-am_libtestobject_la_OBJECTS = testlib.lo testobject.lo +-libtestobject_la_OBJECTS = $(am_libtestobject_la_OBJECTS) +-libtestoptionmenu_la_LIBADD = +-am_libtestoptionmenu_la_OBJECTS = testlib.lo testoptionmenu.lo +-libtestoptionmenu_la_OBJECTS = $(am_libtestoptionmenu_la_OBJECTS) +-libtestpaned_la_LIBADD = +-am_libtestpaned_la_OBJECTS = testlib.lo testpaned.lo +-libtestpaned_la_OBJECTS = $(am_libtestpaned_la_OBJECTS) +-libtestprops_la_LIBADD = +-am_libtestprops_la_OBJECTS = testlib.lo testprops.lo +-libtestprops_la_OBJECTS = $(am_libtestprops_la_OBJECTS) +-libtestselection_la_LIBADD = +-am_libtestselection_la_OBJECTS = testselection.lo +-libtestselection_la_OBJECTS = $(am_libtestselection_la_OBJECTS) +-libteststatusbar_la_LIBADD = +-am_libteststatusbar_la_OBJECTS = teststatusbar.lo +-libteststatusbar_la_OBJECTS = $(am_libteststatusbar_la_OBJECTS) +-libtesttable_la_LIBADD = +-am_libtesttable_la_OBJECTS = testlib.lo testtextlib.lo testtable.lo +-libtesttable_la_OBJECTS = $(am_libtesttable_la_OBJECTS) +-libtesttext_la_LIBADD = +-am_libtesttext_la_OBJECTS = testlib.lo testtextlib.lo testtext.lo +-libtesttext_la_OBJECTS = $(am_libtesttext_la_OBJECTS) +-libtesttoplevel_la_LIBADD = +-am_libtesttoplevel_la_OBJECTS = testlib.lo testtoplevel.lo +-libtesttoplevel_la_OBJECTS = $(am_libtesttoplevel_la_OBJECTS) +-libtesttreetable_la_LIBADD = +-am_libtesttreetable_la_OBJECTS = testlib.lo testtreetable.lo +-libtesttreetable_la_OBJECTS = $(am_libtesttreetable_la_OBJECTS) +-libtestvalues_la_LIBADD = +-am_libtestvalues_la_OBJECTS = testvalues.lo +-libtestvalues_la_OBJECTS = $(am_libtestvalues_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ferret.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testaction.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcombo.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcomponent.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testimage.Plo ./$(DEPDIR)/testlib.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testnotebook.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testobject.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testoptionmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testpaned.Plo ./$(DEPDIR)/testprops.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testselection.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/teststatusbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtable.Plo ./$(DEPDIR)/testtext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtextlib.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtoplevel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreetable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testvalues.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libferret_la_SOURCES_DIST) \ +- $(libtestaction_la_SOURCES) $(libtestbutton_la_SOURCES) \ +- $(libtestcombo_la_SOURCES) $(libtestcomponent_la_SOURCES) \ +- $(libtestimage_la_SOURCES) $(libtestmenuitem_la_SOURCES) \ +- $(libtestnotebook_la_SOURCES) $(libtestobject_la_SOURCES) \ +- $(libtestoptionmenu_la_SOURCES) $(libtestpaned_la_SOURCES) \ +- $(libtestprops_la_SOURCES) $(libtestselection_la_SOURCES) \ +- $(libteststatusbar_la_SOURCES) $(libtesttable_la_SOURCES) \ +- $(libtesttext_la_SOURCES) $(libtesttoplevel_la_SOURCES) \ +- $(libtesttreetable_la_SOURCES) $(libtestvalues_la_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(libferret_la_SOURCES) $(libtestaction_la_SOURCES) $(libtestbutton_la_SOURCES) $(libtestcombo_la_SOURCES) $(libtestcomponent_la_SOURCES) $(libtestimage_la_SOURCES) $(libtestmenuitem_la_SOURCES) $(libtestnotebook_la_SOURCES) $(libtestobject_la_SOURCES) $(libtestoptionmenu_la_SOURCES) $(libtestpaned_la_SOURCES) $(libtestprops_la_SOURCES) $(libtestselection_la_SOURCES) $(libteststatusbar_la_SOURCES) $(libtesttable_la_SOURCES) $(libtesttext_la_SOURCES) $(libtesttoplevel_la_SOURCES) $(libtesttreetable_la_SOURCES) $(libtestvalues_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/gail/tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/gail/tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-moduleLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-moduleLTLIBRARIES: $(module_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \ +- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + else :; fi; \ + done + + uninstall-moduleLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + done + + clean-moduleLTLIBRARIES: + -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -863,51 +787,51 @@ clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libferret.la: $(libferret_la_OBJECTS) $(libferret_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(libferret_la_LDFLAGS) $(libferret_la_OBJECTS) $(libferret_la_LIBADD) $(LIBS) ++ $(libferret_la_LINK) $(am_libferret_la_rpath) $(libferret_la_OBJECTS) $(libferret_la_LIBADD) $(LIBS) + libtestaction.la: $(libtestaction_la_OBJECTS) $(libtestaction_la_DEPENDENCIES) +- $(LINK) $(libtestaction_la_LDFLAGS) $(libtestaction_la_OBJECTS) $(libtestaction_la_LIBADD) $(LIBS) ++ $(libtestaction_la_LINK) $(libtestaction_la_OBJECTS) $(libtestaction_la_LIBADD) $(LIBS) + libtestbutton.la: $(libtestbutton_la_OBJECTS) $(libtestbutton_la_DEPENDENCIES) +- $(LINK) $(libtestbutton_la_LDFLAGS) $(libtestbutton_la_OBJECTS) $(libtestbutton_la_LIBADD) $(LIBS) ++ $(libtestbutton_la_LINK) $(libtestbutton_la_OBJECTS) $(libtestbutton_la_LIBADD) $(LIBS) + libtestcombo.la: $(libtestcombo_la_OBJECTS) $(libtestcombo_la_DEPENDENCIES) +- $(LINK) $(libtestcombo_la_LDFLAGS) $(libtestcombo_la_OBJECTS) $(libtestcombo_la_LIBADD) $(LIBS) ++ $(libtestcombo_la_LINK) $(libtestcombo_la_OBJECTS) $(libtestcombo_la_LIBADD) $(LIBS) + libtestcomponent.la: $(libtestcomponent_la_OBJECTS) $(libtestcomponent_la_DEPENDENCIES) +- $(LINK) $(libtestcomponent_la_LDFLAGS) $(libtestcomponent_la_OBJECTS) $(libtestcomponent_la_LIBADD) $(LIBS) ++ $(libtestcomponent_la_LINK) $(libtestcomponent_la_OBJECTS) $(libtestcomponent_la_LIBADD) $(LIBS) + libtestimage.la: $(libtestimage_la_OBJECTS) $(libtestimage_la_DEPENDENCIES) +- $(LINK) $(libtestimage_la_LDFLAGS) $(libtestimage_la_OBJECTS) $(libtestimage_la_LIBADD) $(LIBS) ++ $(libtestimage_la_LINK) $(libtestimage_la_OBJECTS) $(libtestimage_la_LIBADD) $(LIBS) + libtestmenuitem.la: $(libtestmenuitem_la_OBJECTS) $(libtestmenuitem_la_DEPENDENCIES) +- $(LINK) $(libtestmenuitem_la_LDFLAGS) $(libtestmenuitem_la_OBJECTS) $(libtestmenuitem_la_LIBADD) $(LIBS) ++ $(libtestmenuitem_la_LINK) $(libtestmenuitem_la_OBJECTS) $(libtestmenuitem_la_LIBADD) $(LIBS) + libtestnotebook.la: $(libtestnotebook_la_OBJECTS) $(libtestnotebook_la_DEPENDENCIES) +- $(LINK) $(libtestnotebook_la_LDFLAGS) $(libtestnotebook_la_OBJECTS) $(libtestnotebook_la_LIBADD) $(LIBS) ++ $(libtestnotebook_la_LINK) $(libtestnotebook_la_OBJECTS) $(libtestnotebook_la_LIBADD) $(LIBS) + libtestobject.la: $(libtestobject_la_OBJECTS) $(libtestobject_la_DEPENDENCIES) +- $(LINK) $(libtestobject_la_LDFLAGS) $(libtestobject_la_OBJECTS) $(libtestobject_la_LIBADD) $(LIBS) ++ $(libtestobject_la_LINK) $(libtestobject_la_OBJECTS) $(libtestobject_la_LIBADD) $(LIBS) + libtestoptionmenu.la: $(libtestoptionmenu_la_OBJECTS) $(libtestoptionmenu_la_DEPENDENCIES) +- $(LINK) $(libtestoptionmenu_la_LDFLAGS) $(libtestoptionmenu_la_OBJECTS) $(libtestoptionmenu_la_LIBADD) $(LIBS) ++ $(libtestoptionmenu_la_LINK) $(libtestoptionmenu_la_OBJECTS) $(libtestoptionmenu_la_LIBADD) $(LIBS) + libtestpaned.la: $(libtestpaned_la_OBJECTS) $(libtestpaned_la_DEPENDENCIES) +- $(LINK) $(libtestpaned_la_LDFLAGS) $(libtestpaned_la_OBJECTS) $(libtestpaned_la_LIBADD) $(LIBS) ++ $(libtestpaned_la_LINK) $(libtestpaned_la_OBJECTS) $(libtestpaned_la_LIBADD) $(LIBS) + libtestprops.la: $(libtestprops_la_OBJECTS) $(libtestprops_la_DEPENDENCIES) +- $(LINK) $(libtestprops_la_LDFLAGS) $(libtestprops_la_OBJECTS) $(libtestprops_la_LIBADD) $(LIBS) ++ $(libtestprops_la_LINK) $(libtestprops_la_OBJECTS) $(libtestprops_la_LIBADD) $(LIBS) + libtestselection.la: $(libtestselection_la_OBJECTS) $(libtestselection_la_DEPENDENCIES) +- $(LINK) $(libtestselection_la_LDFLAGS) $(libtestselection_la_OBJECTS) $(libtestselection_la_LIBADD) $(LIBS) ++ $(libtestselection_la_LINK) $(libtestselection_la_OBJECTS) $(libtestselection_la_LIBADD) $(LIBS) + libteststatusbar.la: $(libteststatusbar_la_OBJECTS) $(libteststatusbar_la_DEPENDENCIES) +- $(LINK) $(libteststatusbar_la_LDFLAGS) $(libteststatusbar_la_OBJECTS) $(libteststatusbar_la_LIBADD) $(LIBS) ++ $(libteststatusbar_la_LINK) $(libteststatusbar_la_OBJECTS) $(libteststatusbar_la_LIBADD) $(LIBS) + libtesttable.la: $(libtesttable_la_OBJECTS) $(libtesttable_la_DEPENDENCIES) +- $(LINK) $(libtesttable_la_LDFLAGS) $(libtesttable_la_OBJECTS) $(libtesttable_la_LIBADD) $(LIBS) ++ $(libtesttable_la_LINK) $(libtesttable_la_OBJECTS) $(libtesttable_la_LIBADD) $(LIBS) + libtesttext.la: $(libtesttext_la_OBJECTS) $(libtesttext_la_DEPENDENCIES) +- $(LINK) $(libtesttext_la_LDFLAGS) $(libtesttext_la_OBJECTS) $(libtesttext_la_LIBADD) $(LIBS) ++ $(libtesttext_la_LINK) $(libtesttext_la_OBJECTS) $(libtesttext_la_LIBADD) $(LIBS) + libtesttoplevel.la: $(libtesttoplevel_la_OBJECTS) $(libtesttoplevel_la_DEPENDENCIES) +- $(LINK) $(libtesttoplevel_la_LDFLAGS) $(libtesttoplevel_la_OBJECTS) $(libtesttoplevel_la_LIBADD) $(LIBS) ++ $(libtesttoplevel_la_LINK) $(libtesttoplevel_la_OBJECTS) $(libtesttoplevel_la_LIBADD) $(LIBS) + libtesttreetable.la: $(libtesttreetable_la_OBJECTS) $(libtesttreetable_la_DEPENDENCIES) +- $(LINK) $(libtesttreetable_la_LDFLAGS) $(libtesttreetable_la_OBJECTS) $(libtesttreetable_la_LIBADD) $(LIBS) ++ $(libtesttreetable_la_LINK) $(libtesttreetable_la_OBJECTS) $(libtesttreetable_la_LIBADD) $(LIBS) + libtestvalues.la: $(libtestvalues_la_OBJECTS) $(libtestvalues_la_DEPENDENCIES) +- $(LINK) $(libtestvalues_la_LDFLAGS) $(libtestvalues_la_OBJECTS) $(libtestvalues_la_LIBADD) $(LIBS) ++ $(libtestvalues_la_LINK) $(libtestvalues_la_OBJECTS) $(libtestvalues_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -935,37 +859,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testvalues.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -973,26 +885,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -1002,23 +903,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1030,29 +931,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1067,9 +962,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ for dir in "$(DESTDIR)$(moduledir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -1089,7 +985,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1103,24 +999,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-moduleLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1141,20 +1047,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-moduleLTLIBRARIES ++uninstall-am: uninstall-moduleLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-moduleLTLIBRARIES \ + clean-noinstLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-moduleLTLIBRARIES \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ +- uninstall-moduleLTLIBRARIES ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man \ ++ install-moduleLTLIBRARIES install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-moduleLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/other/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/Makefile.in 2009-02-17 23:15:20.415084646 +0100 ++++ gtk+-2.14.7/modules/other/Makefile.in 2009-02-21 14:58:47.290585373 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/other ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,31 +313,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = gail +-subdir = modules/other +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -438,10 +353,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -449,7 +360,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -501,35 +423,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -565,29 +482,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ + done +- list='$(SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -617,7 +532,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -637,7 +551,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -685,26 +608,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/printbackends/cups/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/printbackends/cups/Makefile.in 2009-02-17 23:15:20.391085576 +0100 ++++ gtk+-2.14.7/modules/printbackends/cups/Makefile.in 2009-02-21 14:58:48.746581735 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = modules/printbackends/cups +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/cups +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -53256,12 +67710,14 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +94,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -53278,7 +67734,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -53287,7 +67743,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +126,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -53298,7 +67754,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +149,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -53306,7 +67762,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +168,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -53315,7 +67771,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +178,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -53326,6 +67782,10 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -53337,16 +67797,48 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -53372,7 +67864,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +203,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -53398,7 +67890,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +222,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -53407,7 +67899,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +233,10 @@ SED = @SED@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -53436,7 +67928,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +245,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -53466,7 +67958,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +286,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -53474,21 +67966,30 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,10 +295,12 @@ program_transform_name = @program_transf +@@ -373,9 +304,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +339,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -343,106 +312,90 @@ INCLUDES = \ +@@ -420,107 +351,90 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -53547,15 +68048,16 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in -DIST_SOURCES = $(libprintbackend_cups_la_SOURCES) -HEADERS = $(noinst_HEADERS) - --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am -SOURCES = $(libprintbackend_cups_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -53632,7 +68134,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -452,37 +405,25 @@ distclean-compile: +@@ -530,37 +444,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintercups.Plo@am__quote@ .c.o: @@ -53682,7 +68184,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -490,26 +431,15 @@ mostlyclean-libtool: +@@ -568,26 +470,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -53712,7 +68214,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -519,23 +449,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -597,23 +488,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -53745,7 +68247,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -547,28 +477,23 @@ GTAGS: +@@ -625,29 +516,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -53755,6 +68257,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -53787,8 +68290,8 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -582,9 +507,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -662,9 +547,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) - @@ -53800,7 +68303,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -604,7 +530,7 @@ mostlyclean-generic: +@@ -684,7 +570,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -53809,7 +68312,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -618,24 +544,34 @@ distclean: distclean-am +@@ -698,24 +584,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -53845,7 +68348,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -656,20 +592,24 @@ ps: ps-am +@@ -736,20 +632,24 @@ ps: ps-am ps-am: @@ -53854,7 +68357,7 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ @@ -53879,12 +68382,12 @@ Index: gtk+-2.12.12/modules/printbackends/cups/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-backendLTLIBRARIES - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/printbackends/file/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/printbackends/file/Makefile.in 2008-09-13 02:03:29.000000000 +0200 -+++ gtk+-2.12.12/modules/printbackends/file/Makefile.in 2008-12-09 21:03:29.497713954 +0100 +--- gtk+-2.14.7.orig/modules/printbackends/file/Makefile.in 2009-02-17 23:15:20.363089350 +0100 ++++ gtk+-2.14.7/modules/printbackends/file/Makefile.in 2009-02-21 14:58:48.954581985 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -53897,9 +68400,9 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -53915,15 +68418,15 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,59 @@ POST_INSTALL = : +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = modules/printbackends/file +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/file +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -53977,12 +68480,14 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +94,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -53999,7 +68504,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -54008,7 +68513,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +126,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -54019,7 +68524,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +149,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -54027,7 +68532,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +168,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -54036,7 +68541,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +178,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -54047,6 +68552,10 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -54058,16 +68567,48 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -54093,7 +68634,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +203,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -54119,7 +68660,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +222,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -54128,7 +68669,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +233,10 @@ SED = @SED@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -54157,7 +68698,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +245,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -54187,7 +68728,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +286,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -54195,15 +68736,24 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,18 +295,17 @@ program_transform_name = @program_transf +@@ -373,9 +304,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,17 +339,12 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends @@ -54217,7 +68767,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in libprintbackend_file_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -349,99 +315,86 @@ libprintbackend_file_la_CPPFLAGS = \ +@@ -426,100 +354,86 @@ libprintbackend_file_la_CPPFLAGS = \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -54269,15 +68819,16 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in -DIST_SOURCES = $(libprintbackend_file_la_SOURCES) -HEADERS = $(noinst_HEADERS) - --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am -SOURCES = $(libprintbackend_file_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -54354,7 +68905,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -449,70 +402,32 @@ distclean-compile: +@@ -527,70 +441,32 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo@am__quote@ .c.o: @@ -54441,7 +68992,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -520,26 +435,15 @@ mostlyclean-libtool: +@@ -598,26 +474,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -54471,7 +69022,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -549,23 +453,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -627,23 +492,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -54504,7 +69055,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -577,28 +481,23 @@ GTAGS: +@@ -655,29 +520,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -54514,6 +69065,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -54546,8 +69098,8 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -612,9 +511,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -692,9 +551,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) - @@ -54559,7 +69111,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -634,7 +534,7 @@ mostlyclean-generic: +@@ -714,7 +574,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -54568,7 +69120,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,24 +548,34 @@ distclean: distclean-am +@@ -728,24 +588,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -54604,7 +69156,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -686,20 +596,24 @@ ps: ps-am +@@ -766,20 +636,24 @@ ps: ps-am ps-am: @@ -54613,7 +69165,7 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ @@ -54638,12 +69190,12 @@ Index: gtk+-2.12.12/modules/printbackends/file/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-backendLTLIBRARIES - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/printbackends/lpr/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/printbackends/lpr/Makefile.in 2008-09-13 02:03:29.000000000 +0200 -+++ gtk+-2.12.12/modules/printbackends/lpr/Makefile.in 2008-12-09 21:03:29.637714639 +0100 +--- gtk+-2.14.7.orig/modules/printbackends/lpr/Makefile.in 2009-02-17 23:15:20.335083836 +0100 ++++ gtk+-2.14.7/modules/printbackends/lpr/Makefile.in 2009-02-21 14:58:49.150581965 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -54656,9 +69208,9 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -54674,15 +69226,15 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,56 @@ POST_INSTALL = : +@@ -37,10 +33,56 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = modules/printbackends/lpr +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/lpr +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -54733,12 +69285,14 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +91,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +93,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -54755,7 +69309,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +116,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +118,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -54764,7 +69318,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +123,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +125,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -54775,7 +69329,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +146,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +151,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -54783,7 +69337,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +165,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +170,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -54792,7 +69346,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +175,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +180,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -54803,6 +69357,10 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -54814,16 +69372,48 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -54849,7 +69439,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +200,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -54875,7 +69465,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +219,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -54884,7 +69474,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +230,10 @@ SED = @SED@ +@@ -297,28 +239,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -54913,7 +69503,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +242,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -54943,7 +69533,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +283,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -54951,21 +69541,30 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,10 +292,12 @@ program_transform_name = @program_transf +@@ -373,9 +301,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +336,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -342,97 +308,85 @@ INCLUDES = \ +@@ -419,98 +347,85 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -55015,15 +69614,16 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in -DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES) -HEADERS = $(noinst_HEADERS) - --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am -SOURCES = $(libprintbackend_lpr_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -55100,7 +69700,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -440,37 +394,25 @@ distclean-compile: +@@ -518,37 +433,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintbackendlpr.Plo@am__quote@ .c.o: @@ -55150,7 +69750,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -478,26 +420,15 @@ mostlyclean-libtool: +@@ -556,26 +459,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -55180,7 +69780,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -507,23 +438,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -585,23 +477,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -55213,7 +69813,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -535,28 +466,23 @@ GTAGS: +@@ -613,29 +505,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -55223,6 +69823,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -55255,8 +69856,8 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -570,9 +496,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -650,9 +536,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) - @@ -55268,7 +69869,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -592,7 +519,7 @@ mostlyclean-generic: +@@ -672,7 +559,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -55277,7 +69878,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -606,24 +533,34 @@ distclean: distclean-am +@@ -686,24 +573,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -55313,7 +69914,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -644,20 +581,24 @@ ps: ps-am +@@ -724,20 +621,24 @@ ps: ps-am ps-am: @@ -55322,7 +69923,7 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ @@ -55347,12 +69948,12 @@ Index: gtk+-2.12.12/modules/printbackends/lpr/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-backendLTLIBRARIES - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/printbackends/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/printbackends/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/printbackends/Makefile.in 2008-09-13 02:03:28.000000000 +0200 -+++ gtk+-2.12.12/modules/printbackends/Makefile.in 2008-12-09 21:03:29.197214449 +0100 +--- gtk+-2.14.7.orig/modules/printbackends/Makefile.in 2009-02-17 23:15:20.311086721 +0100 ++++ gtk+-2.14.7/modules/printbackends/Makefile.in 2009-02-21 14:58:48.554581844 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -55365,10 +69966,10 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -13,17 +13,11 @@ - # PARTICULAR PURPOSE. - +@@ -15,17 +15,11 @@ @SET_MAKE@ + + # GTK+ - The GIMP Toolkit - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -55383,16 +69984,17 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,12 +29,35 @@ POST_INSTALL = : +@@ -37,12 +31,36 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl @HAVE_CUPS_TRUE@am__append_1 = cups @TEST_PRINT_BACKEND_TRUE@am__append_2 = test +subdir = modules/printbackends -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -55421,12 +70023,14 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,20 +68,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -53,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -55443,7 +70047,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -79,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -83,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -55452,7 +70056,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -88,10 +100,6 @@ ECHO_C = @ECHO_C@ +@@ -92,10 +103,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -55463,7 +70067,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -115,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -122,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -55471,7 +70075,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -133,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -140,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -55480,7 +70084,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -145,55 +152,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -152,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -55491,6 +70095,10 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -55502,16 +70110,48 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -55537,7 +70177,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -213,24 +177,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -258,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -55563,7 +70203,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -241,8 +196,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -286,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -55572,7 +70212,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -254,28 +207,10 @@ SED = @SED@ +@@ -299,28 +217,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -55601,7 +70241,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -284,22 +219,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -329,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -55631,7 +70271,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -322,6 +260,7 @@ libexecdir = @libexecdir@ +@@ -367,6 +270,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -55639,15 +70279,24 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -330,32 +269,45 @@ program_transform_name = @program_transf +@@ -375,9 +279,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -408,32 +314,40 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- SUBDIRS = file lpr $(am__append_1) $(am__append_2) - DIST_SUBDIRS = cups file lpr test @@ -55663,12 +70312,13 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am all: all-recursive .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -55702,7 +70352,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -363,10 +315,6 @@ mostlyclean-libtool: +@@ -441,10 +355,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -55713,7 +70363,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -374,7 +322,13 @@ uninstall-info-am: +@@ -452,7 +362,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -55728,7 +70378,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -386,15 +340,20 @@ $(RECURSIVE_TARGETS): +@@ -464,15 +380,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -55753,7 +70403,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -415,7 +374,7 @@ maintainer-clean-recursive: +@@ -493,7 +414,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -55762,7 +70412,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -426,35 +385,30 @@ ctags-recursive: +@@ -504,35 +425,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -55805,7 +70455,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -462,23 +416,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -540,23 +456,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -55838,7 +70488,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -490,28 +444,23 @@ GTAGS: +@@ -568,29 +484,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -55848,6 +70498,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -55880,7 +70531,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -524,13 +473,17 @@ distdir: $(DISTFILES) +@@ -603,13 +513,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -55902,7 +70553,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -540,7 +493,6 @@ check: check-recursive +@@ -620,7 +534,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -55910,7 +70561,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -560,7 +512,7 @@ mostlyclean-generic: +@@ -640,7 +553,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -55919,7 +70570,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -571,25 +523,34 @@ clean-am: clean-generic clean-libtool mo +@@ -651,25 +564,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -55956,7 +70607,7 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -608,26 +569,24 @@ ps: ps-recursive +@@ -688,26 +610,24 @@ ps: ps-recursive ps-am: @@ -55967,12 +70618,12 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -- clean-generic clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ @@ -55984,25 +70635,25 @@ Index: gtk+-2.12.12/modules/printbackends/Makefile.in - uninstall uninstall-am uninstall-info-am \ - uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am clean clean-generic clean-libtool \ -+ ctags ctags-recursive distclean distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/modules/printbackends/test/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/modules/printbackends/test/Makefile.in 2008-09-13 02:03:29.000000000 +0200 -+++ gtk+-2.12.12/modules/printbackends/test/Makefile.in 2008-12-09 21:03:29.785714525 +0100 +--- gtk+-2.14.7.orig/modules/printbackends/test/Makefile.in 2009-02-17 23:15:20.287084718 +0100 ++++ gtk+-2.14.7/modules/printbackends/test/Makefile.in 2009-02-21 14:58:49.346581946 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -56015,9 +70666,9 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,12 @@ +@@ -16,16 +16,12 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -56033,15 +70684,15 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +31,58 @@ POST_INSTALL = : +@@ -37,10 +33,58 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+subdir = modules/printbackends/test +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/test +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -56094,12 +70745,14 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +93,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +95,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -56116,7 +70769,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +118,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +120,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -56125,7 +70778,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +125,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +127,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -56136,7 +70789,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +148,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -56144,7 +70797,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +167,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +172,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -56153,7 +70806,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +177,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +182,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -56164,6 +70817,10 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -56175,16 +70832,48 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -56210,7 +70899,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +202,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +211,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -56236,7 +70925,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +221,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +230,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -56245,7 +70934,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +232,10 @@ SED = @SED@ +@@ -297,28 +241,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -56274,7 +70963,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +244,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +253,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -56304,7 +70993,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +285,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +294,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -56312,15 +71001,24 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,18 +294,17 @@ program_transform_name = @program_transf +@@ -373,9 +303,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +- +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,17 +338,12 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends @@ -56334,7 +71032,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in libprintbackend_test_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -349,97 +314,85 @@ libprintbackend_test_la_CPPFLAGS = \ +@@ -426,98 +353,85 @@ libprintbackend_test_la_CPPFLAGS = \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -56384,15 +71082,16 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in -DIST_SOURCES = $(libprintbackend_test_la_SOURCES) -HEADERS = $(noinst_HEADERS) - --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am -SOURCES = $(libprintbackend_test_la_SOURCES) - all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -56469,7 +71168,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -447,70 +400,32 @@ distclean-compile: +@@ -525,70 +439,32 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo@am__quote@ .c.o: @@ -56556,7 +71255,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -518,26 +433,15 @@ mostlyclean-libtool: +@@ -596,26 +472,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -56586,7 +71285,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -547,23 +451,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -625,23 +490,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -56619,7 +71318,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -575,28 +479,23 @@ GTAGS: +@@ -653,29 +518,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -56629,6 +71328,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -56661,8 +71361,8 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -610,9 +509,10 @@ distdir: $(DISTFILES) - check-am: all-am +@@ -690,9 +549,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) - @@ -56674,7 +71374,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -632,7 +532,7 @@ mostlyclean-generic: +@@ -712,7 +572,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -56683,7 +71383,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -646,24 +546,34 @@ distclean: distclean-am +@@ -726,24 +586,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -56719,7 +71419,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -684,20 +594,24 @@ ps: ps-am +@@ -764,20 +634,24 @@ ps: ps-am ps-am: @@ -56728,7 +71428,7 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ @@ -56753,12 +71453,12 @@ Index: gtk+-2.12.12/modules/printbackends/test/Makefile.in + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-backendLTLIBRARIES - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: gtk+-2.12.12/perf/Makefile.in + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.7/perf/Makefile.in =================================================================== ---- gtk+-2.12.12.orig/perf/Makefile.in 2008-09-13 02:03:29.000000000 +0200 -+++ gtk+-2.12.12/perf/Makefile.in 2008-12-09 21:03:29.925714232 +0100 +--- gtk+-2.14.7.orig/perf/Makefile.in 2009-02-17 23:15:20.263085649 +0100 ++++ gtk+-2.14.7/perf/Makefile.in 2009-02-21 14:58:49.503081654 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -56771,9 +71471,9 @@ Index: gtk+-2.12.12/perf/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -56788,15 +71488,16 @@ Index: gtk+-2.12.12/perf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,10 +30,42 @@ POST_INSTALL = : +@@ -37,10 +32,43 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl +noinst_PROGRAMS = testperf$(EXEEXT) +subdir = perf -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -56833,12 +71534,14 @@ Index: gtk+-2.12.12/perf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -49,20 +76,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +79,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -56855,7 +71558,7 @@ Index: gtk+-2.12.12/perf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -77,8 +101,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,8 +104,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -56864,7 +71567,7 @@ Index: gtk+-2.12.12/perf/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -86,10 +108,6 @@ ECHO_C = @ECHO_C@ +@@ -90,10 +111,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -56875,7 +71578,7 @@ Index: gtk+-2.12.12/perf/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -113,6 +131,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -120,6 +137,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -56883,7 +71586,7 @@ Index: gtk+-2.12.12/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -131,8 +150,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +156,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -56892,7 +71595,7 @@ Index: gtk+-2.12.12/perf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -143,55 +160,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,91 +166,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -56903,6 +71606,10 @@ Index: gtk+-2.12.12/perf/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -56914,16 +71621,48 @@ Index: gtk+-2.12.12/perf/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -56949,7 +71688,7 @@ Index: gtk+-2.12.12/perf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -211,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +195,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -56975,7 +71714,7 @@ Index: gtk+-2.12.12/perf/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -239,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -284,8 +214,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -56984,7 +71723,7 @@ Index: gtk+-2.12.12/perf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -252,28 +215,10 @@ SED = @SED@ +@@ -297,28 +225,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -57013,7 +71752,7 @@ Index: gtk+-2.12.12/perf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -282,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -327,22 +237,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -57043,7 +71782,7 @@ Index: gtk+-2.12.12/perf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -320,6 +268,7 @@ libexecdir = @libexecdir@ +@@ -365,6 +278,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -57051,7 +71790,7 @@ Index: gtk+-2.12.12/perf/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -328,9 +277,11 @@ program_transform_name = @program_transf +@@ -373,20 +287,17 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -57061,11 +71800,32 @@ Index: gtk+-2.12.12/perf/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- README \ +- marshalers.list \ +- typebuiltins.c.template \ +- typebuiltins.h.template \ +- $(BUILT_SOURCES) +- ++EXTRA_DIST = README marshalers.list typebuiltins.c.template \ ++ typebuiltins.h.template $(BUILT_SOURCES) + TEST_PROGS = + + ### testing rules +@@ -412,7 +323,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -341,27 +292,18 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -422,27 +332,18 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) - @@ -57092,7 +71852,7 @@ Index: gtk+-2.12.12/perf/Makefile.in testperf_SOURCES = \ appwindow.c \ gtkwidgetprofiler.c \ -@@ -375,73 +317,59 @@ testperf_SOURCES = \ +@@ -456,68 +357,54 @@ testperf_SOURCES = \ typebuiltins.h \ widgets.h @@ -57114,12 +71874,6 @@ Index: gtk+-2.12.12/perf/Makefile.in - MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files) -- - EXTRA_DIST = \ - README \ - marshalers.list \ - $(BUILT_SOURCES) - -subdir = perf -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -57150,7 +71904,8 @@ Index: gtk+-2.12.12/perf/Makefile.in -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(testperf_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am -SOURCES = $(testperf_SOURCES) - all: $(BUILT_SOURCES) @@ -57158,8 +71913,8 @@ Index: gtk+-2.12.12/perf/Makefile.in .SUFFIXES: .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -57193,7 +71948,7 @@ Index: gtk+-2.12.12/perf/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -451,10 +379,10 @@ clean-noinstPROGRAMS: +@@ -527,10 +414,10 @@ clean-noinstPROGRAMS: done testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES) @rm -f testperf$(EXEEXT) @@ -57206,7 +71961,7 @@ Index: gtk+-2.12.12/perf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -468,37 +396,25 @@ distclean-compile: +@@ -544,37 +431,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typebuiltins.Po@am__quote@ .c.o: @@ -57256,7 +72011,7 @@ Index: gtk+-2.12.12/perf/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -506,26 +422,15 @@ mostlyclean-libtool: +@@ -582,26 +457,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -57286,7 +72041,7 @@ Index: gtk+-2.12.12/perf/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -535,23 +440,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -611,23 +475,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -57319,7 +72074,7 @@ Index: gtk+-2.12.12/perf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -563,28 +468,23 @@ GTAGS: +@@ -639,29 +503,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -57329,6 +72084,7 @@ Index: gtk+-2.12.12/perf/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -57361,7 +72117,7 @@ Index: gtk+-2.12.12/perf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -599,7 +499,6 @@ check-am: all-am +@@ -677,7 +535,6 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) @@ -57369,7 +72125,7 @@ Index: gtk+-2.12.12/perf/Makefile.in installdirs: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -@@ -621,13 +520,13 @@ mostlyclean-generic: +@@ -699,13 +556,13 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -57385,7 +72141,7 @@ Index: gtk+-2.12.12/perf/Makefile.in clean: clean-am clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -@@ -637,24 +536,34 @@ distclean: distclean-am +@@ -715,24 +572,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -57421,7 +72177,7 @@ Index: gtk+-2.12.12/perf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -675,18 +584,23 @@ ps: ps-am +@@ -753,18 +620,23 @@ ps: ps-am ps-am: @@ -57430,9 +72186,9 @@ Index: gtk+-2.12.12/perf/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ - distclean-local distclean-tags distdir dvi dvi-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ @@ -57440,23 +72196,82 @@ Index: gtk+-2.12.12/perf/Makefile.in - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ distclean-local distclean-tags distdir dvi dvi-am html html-am \ -+ info info-am install install-am install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-local distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + # call as: $(XVFB_START) && someprogram - marshalers.h: stamp-marshalers.h -Index: gtk+-2.12.12/tests/Makefile.in +Index: gtk+-2.14.7/po/Makefile.in.in =================================================================== ---- gtk+-2.12.12.orig/tests/Makefile.in 2008-09-13 02:03:30.000000000 +0200 -+++ gtk+-2.12.12/tests/Makefile.in 2008-12-09 21:03:30.313713614 +0100 +--- gtk+-2.14.7.orig/po/Makefile.in.in 2009-02-17 23:15:20.239088534 +0100 ++++ gtk+-2.14.7/po/Makefile.in.in 2009-02-21 14:56:58.606582727 +0100 +@@ -25,6 +25,7 @@ VPATH = @srcdir@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + libdir = @libdir@ + localedir = $(libdir)/locale +@@ -40,6 +41,7 @@ CC = @CC@ + GENCAT = @GENCAT@ + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + XGETTEXT = @XGETTEXT@ + MSGMERGE = msgmerge + +@@ -54,7 +56,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $ + SOURCES = + POFILES = @POFILES@ + GMOFILES = @GMOFILES@ +-DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in POTFILES.skip $(GETTEXT_PACKAGE).pot \ ++DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ + $(POFILES) $(GMOFILES) $(SOURCES) + + POTFILES = \ +@@ -78,7 +80,7 @@ INSTOBJEXT = @INSTOBJEXT@ + + .po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ +- && rm -f $$file && $(GMSGFMT) -c -o $$file $< ++ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< + + .po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ +@@ -92,7 +94,7 @@ all-no: + + $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ +- --add-comments --keyword=_ --keyword=N_ --keyword=Q_ \ ++ --add-comments --keyword=_ --keyword=N_ \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ +@@ -108,10 +110,6 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTF + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ +- --flag=gtk_message_dialog_format_secondary_markup:2:c-format \ +- --flag=gtk_message_dialog_format_secondary_text:2:c-format \ +- --flag=gtk_message_dialog_new:5:c-format \ +- --flag=gtk_message_dialog_new_with_markup:5:c-format \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ +Index: gtk+-2.14.7/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/tests/Makefile.in 2009-02-17 23:15:20.215090931 +0100 ++++ gtk+-2.14.7/tests/Makefile.in 2009-02-21 14:58:49.907082371 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -57469,9 +72284,9 @@ Index: gtk+-2.12.12/tests/Makefile.in # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -14,16 +14,11 @@ +@@ -16,16 +16,11 @@ - @SET_MAKE@ + # GTK+ - The GIMP Toolkit -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ @@ -57486,47 +72301,46 @@ Index: gtk+-2.12.12/tests/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -35,13 +30,281 @@ POST_INSTALL = : +@@ -37,12 +32,274 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ -+TESTS = floatingtest$(EXEEXT) buildertest$(EXEEXT) $(am__EXEEXT_2) -+noinst_PROGRAMS = autotestfilechooser$(EXEEXT) \ -+ autotestkeywords$(EXEEXT) floatingtest$(EXEEXT) \ -+ buildertest$(EXEEXT) simple$(EXEEXT) print-editor$(EXEEXT) \ -+ testaccel$(EXEEXT) testassistant$(EXEEXT) testbbox$(EXEEXT) \ -+ testcairo$(EXEEXT) testcalendar$(EXEEXT) testcombo$(EXEEXT) \ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = $(am__EXEEXT_1) simple$(EXEEXT) \ ++ print-editor$(EXEEXT) testaccel$(EXEEXT) \ ++ testassistant$(EXEEXT) testbbox$(EXEEXT) testcairo$(EXEEXT) \ ++ testcalendar$(EXEEXT) testcombo$(EXEEXT) \ + testcombochange$(EXEEXT) testcellrenderertext$(EXEEXT) \ + testdnd$(EXEEXT) testellipsise$(EXEEXT) \ + testentrycompletion$(EXEEXT) testfilechooser$(EXEEXT) \ + testfilechooserbutton$(EXEEXT) testframe$(EXEEXT) \ + testgtk$(EXEEXT) testiconview$(EXEEXT) testicontheme$(EXEEXT) \ + testimage$(EXEEXT) testinput$(EXEEXT) testmenus$(EXEEXT) \ -+ testmenubars$(EXEEXT) testmultidisplay$(EXEEXT) \ -+ testmultiscreen$(EXEEXT) testnotebookdnd$(EXEEXT) \ -+ testnouiprint$(EXEEXT) testprint$(EXEEXT) testrgb$(EXEEXT) \ -+ testrecentchooser$(EXEEXT) testrecentchoosermenu$(EXEEXT) \ -+ testrichtext$(EXEEXT) testselection$(EXEEXT) $(am__EXEEXT_1) \ -+ testspinbutton$(EXEEXT) teststatusicon$(EXEEXT) \ -+ testtext$(EXEEXT) testtextbuffer$(EXEEXT) testtoolbar$(EXEEXT) \ ++ testmenubars$(EXEEXT) testmountoperation$(EXEEXT) \ ++ testmultidisplay$(EXEEXT) testmultiscreen$(EXEEXT) \ ++ testnotebookdnd$(EXEEXT) testnouiprint$(EXEEXT) \ ++ testprint$(EXEEXT) testrgb$(EXEEXT) testrecentchooser$(EXEEXT) \ ++ testrecentchoosermenu$(EXEEXT) testrichtext$(EXEEXT) \ ++ testselection$(EXEEXT) $(am__EXEEXT_2) testspinbutton$(EXEEXT) \ ++ teststatusicon$(EXEEXT) testtext$(EXEEXT) testtoolbar$(EXEEXT) \ + stresstest-toolbar$(EXEEXT) testtreeedit$(EXEEXT) \ + testtreemodel$(EXEEXT) testtreeview$(EXEEXT) \ + testtreefocus$(EXEEXT) testtreeflow$(EXEEXT) \ -+ testtreecolumns$(EXEEXT) testtreesort$(EXEEXT) \ -+ treestoretest$(EXEEXT) testxinerama$(EXEEXT) \ -+ pixbuf-read$(EXEEXT) pixbuf-lowmem$(EXEEXT) \ -+ pixbuf-randomly-modified$(EXEEXT) pixbuf-random$(EXEEXT) \ -+ pixbuf-threads$(EXEEXT) testmerge$(EXEEXT) \ -+ testactions$(EXEEXT) testgrouping$(EXEEXT) \ ++ testtreecolumns$(EXEEXT) testtreecolumnsizing$(EXEEXT) \ ++ testtreesort$(EXEEXT) treestoretest$(EXEEXT) \ ++ testxinerama$(EXEEXT) pixbuf-read$(EXEEXT) \ ++ pixbuf-lowmem$(EXEEXT) pixbuf-randomly-modified$(EXEEXT) \ ++ pixbuf-random$(EXEEXT) pixbuf-threads$(EXEEXT) \ ++ testmerge$(EXEEXT) testactions$(EXEEXT) testgrouping$(EXEEXT) \ + testtooltips$(EXEEXT) testvolumebutton$(EXEEXT) \ -+ $(am__EXEEXT_2) ++ $(am__EXEEXT_3) @HAVE_CXX_TRUE@am__append_1 = autotestkeywords - @HAVE_CXX_TRUE@am__append_2 = autotestkeywords - @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_3 = -DHAVE_OBJC=1 ++@HAVE_CXX_TRUE@TESTS = autotestkeywords$(EXEEXT) + @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_2 = -DHAVE_OBJC=1 +subdir = tests -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in @@ -57535,12 +72349,11 @@ Index: gtk+-2.12.12/tests/Makefile.in +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = -+@USE_X11_TRUE@am__EXEEXT_1 = testsocket$(EXEEXT) \ ++am__EXEEXT_1 = ++@USE_X11_TRUE@am__EXEEXT_2 = testsocket$(EXEEXT) \ +@USE_X11_TRUE@ testsocket_child$(EXEEXT) -+@HAVE_CXX_TRUE@am__EXEEXT_2 = autotestkeywords$(EXEEXT) ++@HAVE_CXX_TRUE@am__EXEEXT_3 = autotestkeywords$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) -+am_autotestfilechooser_OBJECTS = autotestfilechooser.$(OBJEXT) -+autotestfilechooser_OBJECTS = $(am_autotestfilechooser_OBJECTS) +am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc +@HAVE_CXX_TRUE@am_autotestkeywords_OBJECTS = \ +@HAVE_CXX_TRUE@ autotestkeywords-autotestkeywords.$(OBJEXT) @@ -57550,13 +72363,6 @@ Index: gtk+-2.12.12/tests/Makefile.in + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ -+buildertest_SOURCES = buildertest.c -+buildertest_OBJECTS = buildertest.$(OBJEXT) -+buildertest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(buildertest_LDFLAGS) $(LDFLAGS) -o $@ -+floatingtest_SOURCES = floatingtest.c -+floatingtest_OBJECTS = floatingtest.$(OBJEXT) +pixbuf_lowmem_SOURCES = pixbuf-lowmem.c +pixbuf_lowmem_OBJECTS = pixbuf-lowmem.$(OBJEXT) +pixbuf_lowmem_DEPENDENCIES = $(LDADDS) @@ -57631,6 +72437,8 @@ Index: gtk+-2.12.12/tests/Makefile.in +testmenus_OBJECTS = testmenus.$(OBJEXT) +am_testmerge_OBJECTS = testmerge.$(OBJEXT) +testmerge_OBJECTS = $(am_testmerge_OBJECTS) ++testmountoperation_SOURCES = testmountoperation.c ++testmountoperation_OBJECTS = testmountoperation.$(OBJEXT) +testmultidisplay_SOURCES = testmultidisplay.c +testmultidisplay_OBJECTS = testmultidisplay.$(OBJEXT) +testmultiscreen_SOURCES = testmultiscreen.c @@ -57666,8 +72474,6 @@ Index: gtk+-2.12.12/tests/Makefile.in +teststatusicon_OBJECTS = $(am_teststatusicon_OBJECTS) +am_testtext_OBJECTS = prop-editor.$(OBJEXT) testtext.$(OBJEXT) +testtext_OBJECTS = $(am_testtext_OBJECTS) -+testtextbuffer_SOURCES = testtextbuffer.c -+testtextbuffer_OBJECTS = testtextbuffer.$(OBJEXT) +am_testtoolbar_OBJECTS = testtoolbar.$(OBJEXT) prop-editor.$(OBJEXT) +testtoolbar_OBJECTS = $(am_testtoolbar_OBJECTS) +testtoolbar_DEPENDENCIES = $(LDADDS) @@ -57675,6 +72481,8 @@ Index: gtk+-2.12.12/tests/Makefile.in +testtooltips_OBJECTS = $(am_testtooltips_OBJECTS) +testtreecolumns_SOURCES = testtreecolumns.c +testtreecolumns_OBJECTS = testtreecolumns.$(OBJEXT) ++testtreecolumnsizing_SOURCES = testtreecolumnsizing.c ++testtreecolumnsizing_OBJECTS = testtreecolumnsizing.$(OBJEXT) +am_testtreeedit_OBJECTS = testtreeedit.$(OBJEXT) +testtreeedit_OBJECTS = $(am_testtreeedit_OBJECTS) +testtreeflow_SOURCES = testtreeflow.c @@ -57714,8 +72522,7 @@ Index: gtk+-2.12.12/tests/Makefile.in +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ -+SOURCES = $(autotestfilechooser_SOURCES) $(autotestkeywords_SOURCES) \ -+ buildertest.c floatingtest.c pixbuf-lowmem.c pixbuf-random.c \ ++SOURCES = $(autotestkeywords_SOURCES) pixbuf-lowmem.c pixbuf-random.c \ + pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c \ + print-editor.c simple.c stresstest-toolbar.c testaccel.c \ + $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) \ @@ -57725,40 +72532,41 @@ Index: gtk+-2.12.12/tests/Makefile.in + $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) \ + $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c \ + $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c \ -+ testmenus.c $(testmerge_SOURCES) testmultidisplay.c \ -+ testmultiscreen.c testnotebookdnd.c testnouiprint.c \ -+ $(testprint_SOURCES) $(testrecentchooser_SOURCES) \ -+ $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c \ -+ testselection.c $(testsocket_SOURCES) \ ++ testmenus.c $(testmerge_SOURCES) testmountoperation.c \ ++ testmultidisplay.c testmultiscreen.c testnotebookdnd.c \ ++ testnouiprint.c $(testprint_SOURCES) \ ++ $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) \ ++ testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) \ + $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ -+ $(teststatusicon_SOURCES) $(testtext_SOURCES) testtextbuffer.c \ ++ $(teststatusicon_SOURCES) $(testtext_SOURCES) \ + $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ -+ testtreecolumns.c $(testtreeedit_SOURCES) testtreeflow.c \ -+ testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c \ ++ testtreecolumns.c testtreecolumnsizing.c \ ++ $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ ++ $(testtreemodel_SOURCES) testtreesort.c \ + $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ + testxinerama.c treestoretest.c -+DIST_SOURCES = $(autotestfilechooser_SOURCES) \ -+ $(am__autotestkeywords_SOURCES_DIST) buildertest.c \ -+ floatingtest.c pixbuf-lowmem.c pixbuf-random.c \ -+ pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c \ -+ print-editor.c simple.c stresstest-toolbar.c testaccel.c \ -+ $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) \ -+ testcairo.c testcalendar.c testcellrenderertext.c testcombo.c \ -+ testcombochange.c testdnd.c testellipsise.c \ -+ $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) \ -+ $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) \ -+ $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c \ -+ $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c \ -+ testmenus.c $(testmerge_SOURCES) testmultidisplay.c \ ++DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \ ++ pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \ ++ pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c \ ++ testaccel.c $(testactions_SOURCES) testassistant.c \ ++ $(testbbox_SOURCES) testcairo.c testcalendar.c \ ++ testcellrenderertext.c testcombo.c testcombochange.c testdnd.c \ ++ testellipsise.c $(testentrycompletion_SOURCES) \ ++ $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) \ ++ $(testframe_SOURCES) $(testgrouping_SOURCES) \ ++ $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) \ ++ testimage.c testinput.c testmenubars.c testmenus.c \ ++ $(testmerge_SOURCES) testmountoperation.c testmultidisplay.c \ + testmultiscreen.c testnotebookdnd.c testnouiprint.c \ + $(testprint_SOURCES) $(testrecentchooser_SOURCES) \ + $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c \ + testselection.c $(testsocket_SOURCES) \ + $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ -+ $(teststatusicon_SOURCES) $(testtext_SOURCES) testtextbuffer.c \ ++ $(teststatusicon_SOURCES) $(testtext_SOURCES) \ + $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ -+ testtreecolumns.c $(testtreeedit_SOURCES) testtreeflow.c \ -+ testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c \ ++ testtreecolumns.c testtreecolumnsizing.c \ ++ $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ ++ $(testtreemodel_SOURCES) testtreesort.c \ + $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ + testxinerama.c treestoretest.c +ETAGS = etags @@ -57770,12 +72578,14 @@ Index: gtk+-2.12.12/tests/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,20 +315,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -53,22 +310,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ -BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ CAIRO_PREFIX = @CAIRO_PREFIX@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ @@ -57792,7 +72602,7 @@ Index: gtk+-2.12.12/tests/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -80,8 +340,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -83,8 +335,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -57801,7 +72611,7 @@ Index: gtk+-2.12.12/tests/Makefile.in DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ -@@ -89,10 +347,6 @@ ECHO_C = @ECHO_C@ +@@ -92,10 +342,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -57812,7 +72622,7 @@ Index: gtk+-2.12.12/tests/Makefile.in EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -116,6 +370,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +@@ -122,6 +368,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -57820,7 +72630,7 @@ Index: gtk+-2.12.12/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -134,8 +389,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -140,8 +387,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -57829,7 +72639,7 @@ Index: gtk+-2.12.12/tests/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -146,55 +399,12 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -152,91 +397,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -57840,6 +72650,10 @@ Index: gtk+-2.12.12/tests/Makefile.in -HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ -HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ -HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ -HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ -HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ @@ -57851,16 +72665,48 @@ Index: gtk+-2.12.12/tests/Makefile.in -HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ -HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ -INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ -INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ -INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ -INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ -INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ -INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ -INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ -INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ -INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ -INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ @@ -57886,7 +72732,7 @@ Index: gtk+-2.12.12/tests/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -214,24 +424,15 @@ LTLIBOBJS = @LTLIBOBJS@ +@@ -258,24 +426,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -57912,7 +72758,7 @@ Index: gtk+-2.12.12/tests/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -242,8 +443,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -286,8 +445,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -57921,7 +72767,7 @@ Index: gtk+-2.12.12/tests/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -255,28 +454,10 @@ SED = @SED@ +@@ -299,28 +456,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -57950,7 +72796,7 @@ Index: gtk+-2.12.12/tests/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -285,22 +466,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -329,22 +468,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -57980,7 +72826,7 @@ Index: gtk+-2.12.12/tests/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -323,6 +507,7 @@ libexecdir = @libexecdir@ +@@ -367,6 +509,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -57988,7 +72834,7 @@ Index: gtk+-2.12.12/tests/Makefile.in ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -331,9 +516,11 @@ program_transform_name = @program_transf +@@ -375,37 +518,21 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -57998,11 +72844,52 @@ Index: gtk+-2.12.12/tests/Makefile.in - +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- prop-editor.h \ +- testgtk.1 \ +- testgtkrc \ +- testgtkrc2 \ +- circles.xbm \ +- 3DRings.xpm \ +- FilesQueue.xpm \ +- Modeller.xpm \ +- check-y.xpm \ +- check-n.xpm \ +- marble.xpm \ +- test.xpm \ +- check-y.xpm \ +- check-n.xpm \ +- test.xpm \ +- merge-1.ui \ +- merge-2.ui \ +- merge-3.ui \ +- gnome-textfile.png \ +- makefile.msc \ +- file-chooser-test-dir/empty \ ++EXTRA_DIST = prop-editor.h testgtk.1 testgtkrc testgtkrc2 circles.xbm \ ++ 3DRings.xpm FilesQueue.xpm Modeller.xpm check-y.xpm \ ++ check-n.xpm marble.xpm test.xpm check-y.xpm check-n.xpm \ ++ test.xpm merge-1.ui merge-2.ui merge-3.ui gnome-textfile.png \ ++ makefile.msc file-chooser-test-dir/empty \ + file-chooser-test-dir/text.txt +- + TEST_PROGS = + + ### testing rules +@@ -431,7 +558,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -344,93 +531,21 @@ INCLUDES = \ - $(GTK_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -441,89 +567,21 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) - @@ -58020,13 +72907,7 @@ Index: gtk+-2.12.12/tests/Makefile.in - @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child - --TESTS = floatingtest buildertest $(am__append_2) -- --noinst_PROGRAMS = \ -- autotestfilechooser \ -- autotestkeywords \ -- floatingtest \ -- buildertest \ +-noinst_PROGRAMS = $(TEST_PROGS) \ - simple \ - print-editor \ - testaccel \ @@ -58050,6 +72931,7 @@ Index: gtk+-2.12.12/tests/Makefile.in - testinput \ - testmenus \ - testmenubars \ +- testmountoperation \ - testmultidisplay \ - testmultiscreen \ - testnotebookdnd \ @@ -58064,7 +72946,6 @@ Index: gtk+-2.12.12/tests/Makefile.in - testspinbutton \ - teststatusicon \ - testtext \ -- testtextbuffer \ - testtoolbar \ - stresstest-toolbar \ - testtreeedit \ @@ -58073,6 +72954,7 @@ Index: gtk+-2.12.12/tests/Makefile.in - testtreefocus \ - testtreeflow \ - testtreecolumns \ +- testtreecolumnsizing \ - testtreesort \ - treestoretest \ - testxinerama \ @@ -58087,34 +72969,29 @@ Index: gtk+-2.12.12/tests/Makefile.in - testtooltips \ - testvolumebutton\ -$(am__append_1) +-@HAVE_CXX_TRUE@TESTS = autotestkeywords - @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc --@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers $(am__append_3) +-@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers $(am__append_2) +@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \ -+@HAVE_CXX_TRUE@ $(am__append_3) ++@HAVE_CXX_TRUE@ $(am__append_2) @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@autotestkeywords_CXXFLAGS = -x objective-c++ - - autotestfilechooser_DEPENDENCIES = $(TEST_DEPS) simple_DEPENDENCIES = $(TEST_DEPS) - floatingtest_DEPENDENCIES = $(TEST_DEPS) -@@ -487,7 +602,6 @@ testactions_DEPENDENCIES = $(TEST_DEPS) + print_editor_DEPENDENCIES = $(TEST_DEPS) + testicontheme_DEPENDENCIES = $(TEST_DEPS) +@@ -578,7 +636,6 @@ testactions_DEPENDENCIES = $(TEST_DEPS) testgrouping_DEPENDENCIES = $(TEST_DEPS) testtooltips_DEPENDENCIES = $(TEST_DEPS) testvolumebutton_DEPENDENCIES = $(TEST_DEPS) - - autotestfilechooser_LDADD = $(LDADDS) simple_LDADD = $(LDADDS) - floatingtest_LDADD = $(LDADDS) -@@ -551,123 +665,96 @@ testactions_LDADD = $(LDADDS) + print_editor_LDADD = $(LDADDS) + testaccel_LDADD = $(LDADDS) +@@ -640,700 +697,125 @@ testactions_LDADD = $(LDADDS) testgrouping_LDADD = $(LDADDS) testtooltips_LDADD = $(LDADDS) testvolumebutton_LDADD = $(LDADDS) -- - buildertest_LDFLAGS = -export-dynamic -- - autotestfilechooser_SOURCES = \ - autotestfilechooser.c - - testentrycompletion_SOURCES = \ prop-editor.c \ @@ -58225,25 +73102,12 @@ Index: gtk+-2.12.12/tests/Makefile.in testvolumebutton_SOURCES = \ testvolumebutton.c -- - EXTRA_DIST = \ - prop-editor.h \ - testgtk.1 \ -@@ -690,615 +777,39 @@ EXTRA_DIST = \ - gnome-textfile.png \ - makefile.msc - -subdir = tests -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = --@HAVE_CXX_FALSE@@USE_X11_TRUE@noinst_PROGRAMS = \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ autotestfilechooser$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ autotestkeywords$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ floatingtest$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ buildertest$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ simple$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@noinst_PROGRAMS = simple$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ print-editor$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testaccel$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testassistant$(EXEEXT) \ @@ -58266,6 +73130,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testinput$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmenus$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmountoperation$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmultidisplay$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmultiscreen$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testnotebookdnd$(EXEEXT) \ @@ -58281,7 +73146,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testspinbutton$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ teststatusicon$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtextbuffer$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtoolbar$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ stresstest-toolbar$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeedit$(EXEEXT) \ @@ -58290,6 +73154,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreefocus$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeflow$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreecolumnsizing$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreesort$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ treestoretest$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testxinerama$(EXEEXT) \ @@ -58303,12 +73168,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testgrouping$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtooltips$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_TRUE@ testvolumebutton$(EXEEXT) --@HAVE_CXX_FALSE@@USE_X11_FALSE@noinst_PROGRAMS = \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ autotestfilechooser$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ autotestkeywords$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ floatingtest$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ buildertest$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ simple$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@noinst_PROGRAMS = simple$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ print-editor$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testaccel$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testassistant$(EXEEXT) \ @@ -58331,6 +73191,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testinput$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmenus$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmountoperation$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmultidisplay$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmultiscreen$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testnotebookdnd$(EXEEXT) \ @@ -58344,7 +73205,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testspinbutton$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ teststatusicon$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtextbuffer$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtoolbar$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ stresstest-toolbar$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeedit$(EXEEXT) \ @@ -58353,6 +73213,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreefocus$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeflow$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreecolumnsizing$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreesort$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ treestoretest$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testxinerama$(EXEEXT) \ @@ -58366,12 +73227,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testgrouping$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtooltips$(EXEEXT) \ -@HAVE_CXX_FALSE@@USE_X11_FALSE@ testvolumebutton$(EXEEXT) --@HAVE_CXX_TRUE@@USE_X11_TRUE@noinst_PROGRAMS = \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ autotestfilechooser$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ autotestkeywords$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ floatingtest$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ buildertest$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ simple$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@noinst_PROGRAMS = simple$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ print-editor$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testaccel$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testassistant$(EXEEXT) \ @@ -58394,6 +73250,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testinput$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmenus$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmountoperation$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmultidisplay$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmultiscreen$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testnotebookdnd$(EXEEXT) \ @@ -58409,7 +73266,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testspinbutton$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ teststatusicon$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtextbuffer$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtoolbar$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ stresstest-toolbar$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeedit$(EXEEXT) \ @@ -58418,6 +73274,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreefocus$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeflow$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreecolumnsizing$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreesort$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ treestoretest$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testxinerama$(EXEEXT) \ @@ -58432,12 +73289,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtooltips$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ testvolumebutton$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_TRUE@ autotestkeywords$(EXEEXT) --@HAVE_CXX_TRUE@@USE_X11_FALSE@noinst_PROGRAMS = \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ autotestfilechooser$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ autotestkeywords$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ floatingtest$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ buildertest$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ simple$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@noinst_PROGRAMS = simple$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ print-editor$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testaccel$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testassistant$(EXEEXT) \ @@ -58460,6 +73312,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testinput$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmenus$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmountoperation$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmultidisplay$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmultiscreen$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testnotebookdnd$(EXEEXT) \ @@ -58473,7 +73326,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testspinbutton$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ teststatusicon$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtextbuffer$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtoolbar$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ stresstest-toolbar$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeedit$(EXEEXT) \ @@ -58482,6 +73334,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreefocus$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeflow$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreecolumnsizing$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreesort$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ treestoretest$(EXEEXT) \ -@HAVE_CXX_TRUE@@USE_X11_FALSE@ testxinerama$(EXEEXT) \ @@ -58498,9 +73351,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -@HAVE_CXX_TRUE@@USE_X11_FALSE@ autotestkeywords$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - --am_autotestfilechooser_OBJECTS = autotestfilechooser.$(OBJEXT) --autotestfilechooser_OBJECTS = $(am_autotestfilechooser_OBJECTS) --autotestfilechooser_LDFLAGS = -am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc -@HAVE_CXX_TRUE@am_autotestkeywords_OBJECTS = \ -@HAVE_CXX_TRUE@ autotestkeywords-autotestkeywords.$(OBJEXT) @@ -58508,11 +73358,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -autotestkeywords_LDADD = $(LDADD) -autotestkeywords_DEPENDENCIES = -autotestkeywords_LDFLAGS = --buildertest_SOURCES = buildertest.c --buildertest_OBJECTS = buildertest.$(OBJEXT) --floatingtest_SOURCES = floatingtest.c --floatingtest_OBJECTS = floatingtest.$(OBJEXT) --floatingtest_LDFLAGS = -pixbuf_lowmem_SOURCES = pixbuf-lowmem.c -pixbuf_lowmem_OBJECTS = pixbuf-lowmem.$(OBJEXT) -pixbuf_lowmem_DEPENDENCIES = \ @@ -58636,6 +73481,9 @@ Index: gtk+-2.12.12/tests/Makefile.in -am_testmerge_OBJECTS = testmerge.$(OBJEXT) -testmerge_OBJECTS = $(am_testmerge_OBJECTS) -testmerge_LDFLAGS = +-testmountoperation_SOURCES = testmountoperation.c +-testmountoperation_OBJECTS = testmountoperation.$(OBJEXT) +-testmountoperation_LDFLAGS = -testmultidisplay_SOURCES = testmultidisplay.c -testmultidisplay_OBJECTS = testmultidisplay.$(OBJEXT) -testmultidisplay_LDFLAGS = @@ -58685,9 +73533,6 @@ Index: gtk+-2.12.12/tests/Makefile.in -am_testtext_OBJECTS = prop-editor.$(OBJEXT) testtext.$(OBJEXT) -testtext_OBJECTS = $(am_testtext_OBJECTS) -testtext_LDFLAGS = --testtextbuffer_SOURCES = testtextbuffer.c --testtextbuffer_OBJECTS = testtextbuffer.$(OBJEXT) --testtextbuffer_LDFLAGS = -am_testtoolbar_OBJECTS = testtoolbar.$(OBJEXT) prop-editor.$(OBJEXT) -testtoolbar_OBJECTS = $(am_testtoolbar_OBJECTS) -testtoolbar_DEPENDENCIES = \ @@ -58701,6 +73546,9 @@ Index: gtk+-2.12.12/tests/Makefile.in -testtreecolumns_SOURCES = testtreecolumns.c -testtreecolumns_OBJECTS = testtreecolumns.$(OBJEXT) -testtreecolumns_LDFLAGS = +-testtreecolumnsizing_SOURCES = testtreecolumnsizing.c +-testtreecolumnsizing_OBJECTS = testtreecolumnsizing.$(OBJEXT) +-testtreecolumnsizing_LDFLAGS = -am_testtreeedit_OBJECTS = testtreeedit.$(OBJEXT) -testtreeedit_OBJECTS = $(am_testtreeedit_OBJECTS) -testtreeedit_LDFLAGS = @@ -58732,10 +73580,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autotestfilechooser.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/autotestkeywords-autotestkeywords.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/buildertest.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/floatingtest.Po \ +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autotestkeywords-autotestkeywords.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-lowmem.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-random.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-randomly-modified.Po \ @@ -58762,6 +73607,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/testimage.Po ./$(DEPDIR)/testinput.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testmenubars.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testmenus.Po ./$(DEPDIR)/testmerge.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmountoperation.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testmultidisplay.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testmultiscreen.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testnotebookdnd.Po \ @@ -58777,11 +73623,10 @@ Index: gtk+-2.12.12/tests/Makefile.in -@AMDEP_TRUE@ ./$(DEPDIR)/testsocket_common.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testspinbutton.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/teststatusicon.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtext.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtextbuffer.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtoolbar.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtext.Po ./$(DEPDIR)/testtoolbar.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testtooltips.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testtreecolumns.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreecolumnsizing.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testtreeedit.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testtreeflow.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/testtreefocus.Po \ @@ -58806,39 +73651,38 @@ Index: gtk+-2.12.12/tests/Makefile.in -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(autotestfilechooser_SOURCES) \ -- $(am__autotestkeywords_SOURCES_DIST) buildertest.c \ -- floatingtest.c pixbuf-lowmem.c pixbuf-random.c \ -- pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c \ -- print-editor.c simple.c stresstest-toolbar.c testaccel.c \ -- $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) \ -- testcairo.c testcalendar.c testcellrenderertext.c testcombo.c \ -- testcombochange.c testdnd.c testellipsise.c \ -- $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) \ -- $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) \ -- $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c \ -- $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c \ -- testmenus.c $(testmerge_SOURCES) testmultidisplay.c \ -- testmultiscreen.c testnotebookdnd.c testnouiprint.c \ -- $(testprint_SOURCES) $(testrecentchooser_SOURCES) \ -- $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c \ -- testselection.c $(testsocket_SOURCES) \ +-DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \ +- pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \ +- pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c \ +- testaccel.c $(testactions_SOURCES) testassistant.c \ +- $(testbbox_SOURCES) testcairo.c testcalendar.c \ +- testcellrenderertext.c testcombo.c testcombochange.c testdnd.c \ +- testellipsise.c $(testentrycompletion_SOURCES) \ +- $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) \ +- $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) \ +- testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c \ +- testmenubars.c testmenus.c $(testmerge_SOURCES) \ +- testmountoperation.c testmultidisplay.c testmultiscreen.c \ +- testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) \ +- $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) \ +- testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) \ - $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ -- $(teststatusicon_SOURCES) $(testtext_SOURCES) testtextbuffer.c \ +- $(teststatusicon_SOURCES) $(testtext_SOURCES) \ - $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ -- testtreecolumns.c $(testtreeedit_SOURCES) testtreeflow.c \ -- testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c \ -- $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ -- testxinerama.c treestoretest.c --DIST_COMMON = $(srcdir)/Makefile.in Makefile.am --SOURCES = $(autotestfilechooser_SOURCES) $(autotestkeywords_SOURCES) buildertest.c floatingtest.c pixbuf-lowmem.c pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c testaccel.c $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) testcairo.c testcalendar.c testcellrenderertext.c testcombo.c testcombochange.c testdnd.c testellipsise.c $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c testmenus.c $(testmerge_SOURCES) testmultidisplay.c testmultiscreen.c testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) $(teststatusicon_SOURCES) $(testtext_SOURCES) testtextbuffer.c $(testtoolbar_SOURCES) $(testtooltips_SOURCES) testtreecolumns.c $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c +- testtreecolumns.c testtreecolumnsizing.c \ +- $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ +- $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) \ +- $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(autotestkeywords_SOURCES) pixbuf-lowmem.c pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c testaccel.c $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) testcairo.c testcalendar.c testcellrenderertext.c testcombo.c testcombochange.c testdnd.c testellipsise.c $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c testmenus.c $(testmerge_SOURCES) testmountoperation.c testmultidisplay.c testmultiscreen.c testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) $(teststatusicon_SOURCES) $(testtext_SOURCES) $(testtoolbar_SOURCES) $(testtooltips_SOURCES) testtreecolumns.c testtreecolumnsizing.c $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c - all: all-am .SUFFIXES: .SUFFIXES: .c .cc .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ @@ -58872,24 +73716,12 @@ Index: gtk+-2.12.12/tests/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -1308,199 +819,199 @@ clean-noinstPROGRAMS: +@@ -1343,193 +825,193 @@ clean-noinstPROGRAMS: done - autotestfilechooser$(EXEEXT): $(autotestfilechooser_OBJECTS) $(autotestfilechooser_DEPENDENCIES) - @rm -f autotestfilechooser$(EXEEXT) -- $(LINK) $(autotestfilechooser_LDFLAGS) $(autotestfilechooser_OBJECTS) $(autotestfilechooser_LDADD) $(LIBS) -+ $(LINK) $(autotestfilechooser_OBJECTS) $(autotestfilechooser_LDADD) $(LIBS) autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES) @rm -f autotestkeywords$(EXEEXT) - $(CXXLINK) $(autotestkeywords_LDFLAGS) $(autotestkeywords_OBJECTS) $(autotestkeywords_LDADD) $(LIBS) + $(autotestkeywords_LINK) $(autotestkeywords_OBJECTS) $(autotestkeywords_LDADD) $(LIBS) - buildertest$(EXEEXT): $(buildertest_OBJECTS) $(buildertest_DEPENDENCIES) - @rm -f buildertest$(EXEEXT) -- $(LINK) $(buildertest_LDFLAGS) $(buildertest_OBJECTS) $(buildertest_LDADD) $(LIBS) -+ $(buildertest_LINK) $(buildertest_OBJECTS) $(buildertest_LDADD) $(LIBS) - floatingtest$(EXEEXT): $(floatingtest_OBJECTS) $(floatingtest_DEPENDENCIES) - @rm -f floatingtest$(EXEEXT) -- $(LINK) $(floatingtest_LDFLAGS) $(floatingtest_OBJECTS) $(floatingtest_LDADD) $(LIBS) -+ $(LINK) $(floatingtest_OBJECTS) $(floatingtest_LDADD) $(LIBS) pixbuf-lowmem$(EXEEXT): $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_DEPENDENCIES) @rm -f pixbuf-lowmem$(EXEEXT) - $(LINK) $(pixbuf_lowmem_LDFLAGS) $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_LDADD) $(LIBS) @@ -59018,6 +73850,10 @@ Index: gtk+-2.12.12/tests/Makefile.in @rm -f testmerge$(EXEEXT) - $(LINK) $(testmerge_LDFLAGS) $(testmerge_OBJECTS) $(testmerge_LDADD) $(LIBS) + $(LINK) $(testmerge_OBJECTS) $(testmerge_LDADD) $(LIBS) + testmountoperation$(EXEEXT): $(testmountoperation_OBJECTS) $(testmountoperation_DEPENDENCIES) + @rm -f testmountoperation$(EXEEXT) +- $(LINK) $(testmountoperation_LDFLAGS) $(testmountoperation_OBJECTS) $(testmountoperation_LDADD) $(LIBS) ++ $(LINK) $(testmountoperation_OBJECTS) $(testmountoperation_LDADD) $(LIBS) testmultidisplay$(EXEEXT): $(testmultidisplay_OBJECTS) $(testmultidisplay_DEPENDENCIES) @rm -f testmultidisplay$(EXEEXT) - $(LINK) $(testmultidisplay_LDFLAGS) $(testmultidisplay_OBJECTS) $(testmultidisplay_LDADD) $(LIBS) @@ -59078,10 +73914,6 @@ Index: gtk+-2.12.12/tests/Makefile.in @rm -f testtext$(EXEEXT) - $(LINK) $(testtext_LDFLAGS) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) + $(LINK) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) - testtextbuffer$(EXEEXT): $(testtextbuffer_OBJECTS) $(testtextbuffer_DEPENDENCIES) - @rm -f testtextbuffer$(EXEEXT) -- $(LINK) $(testtextbuffer_LDFLAGS) $(testtextbuffer_OBJECTS) $(testtextbuffer_LDADD) $(LIBS) -+ $(LINK) $(testtextbuffer_OBJECTS) $(testtextbuffer_LDADD) $(LIBS) testtoolbar$(EXEEXT): $(testtoolbar_OBJECTS) $(testtoolbar_DEPENDENCIES) @rm -f testtoolbar$(EXEEXT) - $(LINK) $(testtoolbar_LDFLAGS) $(testtoolbar_OBJECTS) $(testtoolbar_LDADD) $(LIBS) @@ -59094,6 +73926,10 @@ Index: gtk+-2.12.12/tests/Makefile.in @rm -f testtreecolumns$(EXEEXT) - $(LINK) $(testtreecolumns_LDFLAGS) $(testtreecolumns_OBJECTS) $(testtreecolumns_LDADD) $(LIBS) + $(LINK) $(testtreecolumns_OBJECTS) $(testtreecolumns_LDADD) $(LIBS) + testtreecolumnsizing$(EXEEXT): $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_DEPENDENCIES) + @rm -f testtreecolumnsizing$(EXEEXT) +- $(LINK) $(testtreecolumnsizing_LDFLAGS) $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_LDADD) $(LIBS) ++ $(LINK) $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_LDADD) $(LIBS) testtreeedit$(EXEEXT): $(testtreeedit_OBJECTS) $(testtreeedit_DEPENDENCIES) @rm -f testtreeedit$(EXEEXT) - $(LINK) $(testtreeedit_LDFLAGS) $(testtreeedit_OBJECTS) $(testtreeedit_LDADD) $(LIBS) @@ -59137,7 +73973,7 @@ Index: gtk+-2.12.12/tests/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -1574,130 +1085,76 @@ distclean-compile: +@@ -1601,130 +1083,76 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestoretest.Po@am__quote@ .c.o: @@ -59301,7 +74137,7 @@ Index: gtk+-2.12.12/tests/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1707,23 +1164,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -1734,23 +1162,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -59334,7 +74170,7 @@ Index: gtk+-2.12.12/tests/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1737,9 +1194,9 @@ distclean-tags: +@@ -1764,9 +1192,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -59346,7 +74182,7 @@ Index: gtk+-2.12.12/tests/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1748,25 +1205,25 @@ check-TESTS: $(TESTS) +@@ -1775,25 +1203,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -59382,7 +74218,7 @@ Index: gtk+-2.12.12/tests/Makefile.in ;; \ esac; \ else \ -@@ -1791,45 +1248,40 @@ check-TESTS: $(TESTS) +@@ -1818,46 +1246,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -59413,6 +74249,7 @@ Index: gtk+-2.12.12/tests/Makefile.in -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. $(distdir)/file-chooser-test-dir - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ @@ -59445,15 +74282,15 @@ Index: gtk+-2.12.12/tests/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1844,7 +1296,6 @@ check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS +@@ -1872,7 +1294,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(PROGRAMS) - installdirs: install: install-am install-exec: install-exec-am -@@ -1865,7 +1316,7 @@ mostlyclean-generic: +@@ -1893,7 +1314,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -59462,7 +74299,7 @@ Index: gtk+-2.12.12/tests/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1879,24 +1330,34 @@ distclean: distclean-am +@@ -1907,24 +1328,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -59498,7 +74335,7 @@ Index: gtk+-2.12.12/tests/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1917,18 +1378,23 @@ ps: ps-am +@@ -1945,18 +1376,23 @@ ps: ps-am ps-am: @@ -59507,8 +74344,8 @@ Index: gtk+-2.12.12/tests/Makefile.in + +.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ @@ -59529,5 +74366,5 @@ Index: gtk+-2.12.12/tests/Makefile.in + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + # call as: $(XVFB_START) && someprogram + diff --git a/debian/patches/071_jasper_link_fix.patch b/debian/patches/071_jasper_link_fix.patch new file mode 100644 index 0000000000..a337af3c06 --- /dev/null +++ b/debian/patches/071_jasper_link_fix.patch @@ -0,0 +1,32 @@ +diff -urN gtk+-2.14.4.old/configure gtk+-2.14.4/configure +--- gtk+-2.14.4.old/configure 2008-11-04 17:41:20.000000000 -0200 ++++ gtk+-2.14.4/configure 2008-11-04 17:45:07.000000000 -0200 +@@ -29356,8 +29356,11 @@ + if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then + STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" + fi ++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" ++ fi + else +- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" + fi + + # Checks to see whether we should include mediaLib +diff -urN gtk+-2.14.4.old/configure.in gtk+-2.14.4/configure.in +--- gtk+-2.14.4.old/configure.in 2008-10-17 01:06:38.000000000 -0300 ++++ gtk+-2.14.4/configure.in 2008-11-04 17:44:57.000000000 -0200 +@@ -1163,8 +1163,11 @@ + if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then + STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" + fi ++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" ++ fi + else +- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" + fi + + # Checks to see whether we should include mediaLib diff --git a/debian/patches/072_workaround_directfb_build.patch b/debian/patches/072_workaround_directfb_build.patch new file mode 100644 index 0000000000..71ee8f9634 --- /dev/null +++ b/debian/patches/072_workaround_directfb_build.patch @@ -0,0 +1,20 @@ +Index: gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c +=================================================================== +--- gtk+2.0-2.14.0.orig/gdk/directfb/gdktestutils-directfb.c 2008-09-04 06:36:10.000000000 +0200 ++++ gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c 2008-09-05 00:36:44.000000000 +0200 +@@ -175,7 +175,6 @@ + + evt.clazz = DFEC_WINDOW; + evt.type = (key_pressrelease == GDK_KEY_PRESS) ? DWET_KEYDOWN : DWET_KEYUP; +- evt.flags = DWEF_NONE; + evt.window_id = impl->dfb_id; + evt.x = MAX(x, 0); + evt.y = MAX(y, 0); +@@ -241,7 +240,6 @@ + + evt.clazz = DFEC_WINDOW; + evt.type = (button_pressrelease == GDK_BUTTON_PRESS) ? DWET_BUTTONDOWN : DWET_BUTTONUP; +- evt.flags = DWEF_NONE; + evt.window_id = impl->dfb_id; + evt.x = MAX(x, 0); + evt.y = MAX(y, 0); diff --git a/debian/patches/092_fix_printtest_include.patch b/debian/patches/092_fix_printtest_include.patch new file mode 100644 index 0000000000..18e3e66ae4 --- /dev/null +++ b/debian/patches/092_fix_printtest_include.patch @@ -0,0 +1,19 @@ +Index: gtk+2.0-2.14.3/modules/printbackends/test/gtkprintbackendtest.c +=================================================================== +--- gtk+2.0-2.14.3.orig/modules/printbackends/test/gtkprintbackendtest.c 2008-09-24 21:07:22.000000000 -0300 ++++ gtk+2.0-2.14.3/modules/printbackends/test/gtkprintbackendtest.c 2008-09-24 21:07:28.000000000 -0300 +@@ -35,12 +35,12 @@ + + #include <glib/gi18n-lib.h> + +-#include "gtkprintoperation.h" ++#include <gtk/gtk.h> + + #include "gtkprintbackend.h" + #include "gtkprintbackendtest.h" + +-#include "gtkprinter.h" ++#include <gtk/gtkunixprint.h> + #include "gtkprinter-private.h" + + typedef struct _GtkPrintBackendTestClass GtkPrintBackendTestClass; diff --git a/debian/patches/series b/debian/patches/series index 8898c3b092..ae74b8ce08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,9 +3,6 @@ 003_gdk.pc_privates.patch 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch 005_xpmico.patch -#006_proper-directfb-modules.patch -007_implicit_pointer_conversion_gdkdrawable_directfb.patch -008_implicit_pointer_conversion_gdkgc_directfb.patch 009_gtk-export-filechooser.patch 010_gdkpixbuf_-lm.patch 015_default-fallback-icon-theme.patch @@ -14,10 +11,14 @@ 022_module-files-append-compat-module-files-d.patch 030_gtkentry_password-char-circle.patch 031_directfb_dead-keys.patch -033_treeview_resizing.patch +032_gdkwindowimpl_directfb.patch +033_directfb_client-message.patch +034_directfb_memleak.patch 041_ia32-libs.patch 042_treeview_single-focus.patch 060_ignore-random-icons.patch 070_mandatory-relibtoolize.patch +071_jasper_link_fix.patch +072_workaround_directfb_build.patch 091_workaround_no_gtk_init_incorrect_display.patch -095_gtk-im-module-setting.patch +092_fix_printtest_include.patch diff --git a/debian/rules b/debian/rules index 9747fe9e71..36efda899f 100644 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') APIVER := 2.0 SONAME := 0 -SHVER := 2.12.0 +SHVER := 2.14.0 # earliest version that this release has backwards binary compatibility for GTK_BINARY_VERSION := 2.10.0 @@ -68,8 +68,8 @@ EXAMPLES_PKG := gtk$(APIVER)-examples PIXBUF_PKG := gtk2-engines-pixbuf # package groups, used in rule dependencies and in cleanup -BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) -BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) +BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail-doc +BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail18 libgail-dbg libgail-dev libgail-common ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS) # list of flavors we build; each gets a builddir, a configure pass (configure @@ -118,7 +118,6 @@ common_configure_flags := \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --sysconfdir=/etc \ - --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \ --enable-test-print-backend ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) @@ -148,6 +147,11 @@ DH_INSTALLDOCS_FILES := NEWS README ChangeLog # ".in" file; pass the list of packages in $(1) dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1))))) +# Gruik gruik generation of .devhelp files for the FAQ and tutorial +debian/gtk-%.devhelp: docs/%/html/book1.html + gawk -f debian/gruik2devhelp.awk -v name=gtk-$* $< > $@ +devhelpfiles: debian/gtk-faq.devhelp debian/gtk-tutorial.devhelp + debian/dh_gtkmodules.1: debian/dh_gtkmodules cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1 @@ -249,6 +253,7 @@ clean:: debian/control # unapply patches, if any QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 -rm -rf .pc + rm -f debian/*.devhelp -rm -rf $(STAMP_DIR) -rm -f $(call dh_subst_files,$(ALL_PKGS)) -rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1 @@ -256,7 +261,7 @@ clean:: debian/control maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) -binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) +binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles dh_testdir dh_testroot dh_install -i @@ -320,7 +325,8 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK -p$(UDEB_PKG) dh_installexamples -s dh_link -s - dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) + dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) -Nlibgail18 -Nlibgail-common + dh_strip -plibgail18 -plibgail-common --dbg-package=libgail-dbg dh_strip -p$(UDEB_PKG) dh_compress -s -X.sgml -X.devhelp dh_fixperms -s -X$(LIBDIR)/$(SHARED_PKG) @@ -332,6 +338,9 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK -X$(MODULES_BASE_PATH) \ -V"$(DIRECTFB_PKG) (>= $(SHVER))" \ --add-udeb=$(UDEB_PKG) + dh_makeshlibs -plibgail18 \ + -X$(MODULES_BASE_PATH) \ + -V"libgail18 (>= $(SHVER)), libgail-common (>= $(SHVER))" dh_installdeb -s # override shlibs for libraries from this source before computing # dependencies of packages generated from this source; we already have @@ -340,7 +349,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK cat debian/*/DEBIAN/shlibs | \ sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \ > debian/shlibs.local - dh_shlibdeps -s + dh_shlibdeps -rm -f debian/shlibs.local dh_gencontrol -s dh_md5sums -s @@ -351,4 +360,4 @@ list-missing: egrep -v '(\.la|$(LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2 binary: binary-indep binary-arch -.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary +.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary devhelpfiles