r18593 - /desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Tue Mar 3 04:18:30 UTC 2009
Author: kov
Date: Tue Mar 3 04:18:29 2009
New Revision: 18593
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18593
Log:
now correctly refresh patch with the patches that come before it applied
Modified:
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=18593&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch Tue Mar 3 04:18:29 2009
@@ -1,6 +1,7 @@
-diff -urN a/aclocal.m4 b/aclocal.m4
---- a/aclocal.m4 2009-03-02 16:04:06.000000000 -0300
-+++ b/aclocal.m4 2009-03-02 19:32:49.000000000 -0300
+Index: gtk+2.0-2.15.5/aclocal.m4
+===================================================================
+--- gtk+2.0-2.15.5.orig/aclocal.m4 2009-03-02 16:04:06.000000000 -0300
++++ gtk+2.0-2.15.5/aclocal.m4 2009-03-03 01:12:41.000000000 -0300
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -18077,9 +18078,10 @@
+]) # _AM_PROG_TAR
+m4_include([acinclude.m4])
-diff -urN a/config.guess b/config.guess
---- a/config.guess 2009-02-24 00:53:12.000000000 -0300
-+++ b/config.guess 2009-03-02 19:33:07.000000000 -0300
+Index: gtk+2.0-2.15.5/config.guess
+===================================================================
+--- gtk+2.0-2.15.5.orig/config.guess 2009-02-24 00:53:12.000000000 -0300
++++ gtk+2.0-2.15.5/config.guess 2009-03-03 01:12:41.000000000 -0300
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -19414,9 +19416,10 @@
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
-diff -urN a/config.h.in b/config.h.in
---- a/config.h.in 2009-03-02 16:04:10.000000000 -0300
-+++ b/config.h.in 2009-03-02 19:32:57.000000000 -0300
+Index: gtk+2.0-2.15.5/config.h.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/config.h.in 2009-03-02 16:04:10.000000000 -0300
++++ gtk+2.0-2.15.5/config.h.in 2009-03-03 01:12:41.000000000 -0300
@@ -210,10 +210,6 @@
/* Define to 1 if you have the `_NSGetEnviron' function. */
#undef HAVE__NSGETENVIRON
@@ -19428,294 +19431,10 @@
/* Define if <X11/extensions/XIproto.h> needed for xReply */
#undef NEED_XIPROTO_H_FOR_XREPLY
-diff -urN a/config.h.in~ b/config.h.in~
---- a/config.h.in~ 1969-12-31 21:00:00.000000000 -0300
-+++ b/config.h.in~ 2009-03-02 16:04:10.000000000 -0300
-@@ -0,0 +1,281 @@
-+/* config.h.in. Generated from configure.in by autoheader. */
-+
-+/* always defined to indicate that i18n is enabled */
-+#undef ENABLE_NLS
-+
-+/* Define if gio can sniff image data */
-+#undef GDK_PIXBUF_USE_GIO_MIME
-+
-+/* The prefix for our gettext translation domains. */
-+#undef GETTEXT_PACKAGE
-+
-+/* Define if debugging is enabled */
-+#undef GTK_COMPILED_WITH_DEBUGGING
-+
-+/* Define the location where the catalogs will be installed */
-+#undef GTK_LOCALEDIR
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-+
-+/* Is the wctype implementation broken */
-+#undef HAVE_BROKEN_WCTYPE
-+
-+/* Define to 1 if you have the <crt_externs.h> header file. */
-+#undef HAVE_CRT_EXTERNS_H
-+
-+/* Define to 1 if CUPS 1.2 API is available */
-+#undef HAVE_CUPS_API_1_2
-+
-+/* Define to 1 if you have the `dcgettext' function. */
-+#undef HAVE_DCGETTEXT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the `flockfile' function. */
-+#undef HAVE_FLOCKFILE
-+
-+/* Define to 1 if you have the <ftw.h> header file. */
-+#undef HAVE_FTW_H
-+
-+/* Define to 1 if you have the `getc_unlocked' function. */
-+#undef HAVE_GETC_UNLOCKED
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+#undef HAVE_GETPAGESIZE
-+
-+/* Define to 1 if you have the `getresuid' function. */
-+#undef HAVE_GETRESUID
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#undef HAVE_GETTEXT
-+
-+/* Have GNU ftw */
-+#undef HAVE_GNU_FTW
-+
-+/* Define to 1 if you have the `httpGetAuthString' function. */
-+#undef HAVE_HTTPGETAUTHSTRING
-+
-+/* Define if cups http_t authstring field is accessible */
-+#undef HAVE_HTTP_AUTHSTRING
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if ipc.h is available */
-+#undef HAVE_IPC_H
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+#undef HAVE_LC_MESSAGES
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
-+/* Define to 1 if you have the `localtime_r' function. */
-+#undef HAVE_LOCALTIME_R
-+
-+/* Define to 1 if you have the `lstat' function. */
-+#undef HAVE_LSTAT
-+
-+/* Define to 1 if you have the `mallinfo' function. */
-+#undef HAVE_MALLINFO
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `mkstemp' function. */
-+#undef HAVE_MKSTEMP
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+#undef HAVE_MMAP
-+
-+/* Define to 1 is libjpeg supports progressive JPEG */
-+#undef HAVE_PROGRESSIVE_JPEG
-+
-+/* Define to 1 if you have the <pwd.h> header file. */
-+#undef HAVE_PWD_H
-+
-+/* Have the Xrandr extension library */
-+#undef HAVE_RANDR
-+
-+/* Define to 1 if the XShape extension is available */
-+#undef HAVE_SHAPE_EXT
-+
-+/* Define to 1 if shm.h is available */
-+#undef HAVE_SHM_H
-+
-+/* Define to 1 if sigsetjmp is available */
-+#undef HAVE_SIGSETJMP
-+
-+/* Have the sockaddr_un.sun_len member */
-+#undef HAVE_SOCKADDR_UN_SUN_LEN
-+
-+/* Define to 1 if solaris xinerama is available */
-+#undef HAVE_SOLARIS_XINERAMA
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if sys/select.h is available */
-+#undef HAVE_SYS_SELECT_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if sys/sysinfo.h is available */
-+#undef HAVE_SYS_SYSINFO_H
-+
-+/* Define to 1 if sys/systeminfo.h is available */
-+#undef HAVE_SYS_SYSTEMINFO_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-+#undef HAVE_SYS_WAIT_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Have uxtheme.h include file */
-+#undef HAVE_UXTHEME_H
-+
-+/* Have wchar.h include file */
-+#undef HAVE_WCHAR_H
-+
-+/* Have wctype.h include file */
-+#undef HAVE_WCTYPE_H
-+
-+/* Define if we have X11R6 */
-+#undef HAVE_X11R6
-+
-+/* Have the XCOMPOSITE X extension */
-+#undef HAVE_XCOMPOSITE
-+
-+/* Define to 1 if you have the `XConvertCase' function. */
-+#undef HAVE_XCONVERTCASE
-+
-+/* Have the Xcursor library */
-+#undef HAVE_XCURSOR
-+
-+/* Have the XDAMAGE X extension */
-+#undef HAVE_XDAMAGE
-+
-+/* Have the XFIXES X extension */
-+#undef HAVE_XFIXES
-+
-+/* Define to 1 if XFree Xinerama is available */
-+#undef HAVE_XFREE_XINERAMA
-+
-+/* Define to 1 is Xinerama is available */
-+#undef HAVE_XINERAMA
-+
-+/* Define to 1 if you have the `XInternAtoms' function. */
-+#undef HAVE_XINTERNATOMS
-+
-+/* Define to use XKB extension */
-+#undef HAVE_XKB
-+
-+/* Define to 1 if xshm.h is available */
-+#undef HAVE_XSHM_H
-+
-+/* Have the SYNC extension library */
-+#undef HAVE_XSYNC
-+
-+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-+#undef HAVE__NL_MEASUREMENT_MEASUREMENT
-+
-+/* Define if _NL_PAPER_HEIGHT is available */
-+#undef HAVE__NL_PAPER_HEIGHT
-+
-+/* Define if _NL_PAPER_WIDTH is available */
-+#undef HAVE__NL_PAPER_WIDTH
-+
-+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-+#undef HAVE__NL_TIME_FIRST_WEEKDAY
-+
-+/* 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
-+
-+/* Define to 1 if fd_set is not available */
-+#undef NO_FD_SET
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define as the return type of signal handlers (`int' or `void'). */
-+#undef RETSIGTYPE
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if gmodule works and should be used */
-+#undef USE_GMODULE
-+
-+/* Whether to load modules via .la files rather than directly */
-+#undef USE_LA_MODULES
-+
-+/* Define to 1 if medialib is available and should be used */
-+#undef USE_MEDIALIB
-+
-+/* Define to 1 if medialib 2.5 is available */
-+#undef USE_MEDIALIB25
-+
-+/* Define to 1 if XXM is available and should be used */
-+#undef USE_MMX
-+
-+/* Define to 1 if no XInput should be used */
-+#undef XINPUT_NONE
-+
-+/* Define to 1 if XFree XInput should be used */
-+#undef XINPUT_XFREE
-+
-+/* Define to 1 if the X Window System is missing or not being used. */
-+#undef X_DISPLAY_MISSING
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef gid_t
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef uid_t
-diff -urN a/config.sub b/config.sub
---- a/config.sub 2009-02-24 00:53:12.000000000 -0300
-+++ b/config.sub 2009-03-02 19:33:07.000000000 -0300
+Index: gtk+2.0-2.15.5/config.sub
+===================================================================
+--- gtk+2.0-2.15.5.orig/config.sub 2009-02-24 00:53:12.000000000 -0300
++++ gtk+2.0-2.15.5/config.sub 2009-03-03 01:12:41.000000000 -0300
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -20390,9 +20109,10 @@
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -urN a/configure b/configure
---- a/configure 2009-03-02 16:04:24.000000000 -0300
-+++ b/configure 2009-03-02 19:32:53.000000000 -0300
+Index: gtk+2.0-2.15.5/configure
+===================================================================
+--- gtk+2.0-2.15.5.orig/configure 2009-03-02 16:04:24.000000000 -0300
++++ gtk+2.0-2.15.5/configure 2009-03-03 01:12:41.000000000 -0300
@@ -577,22 +577,22 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -20646,7 +20366,15 @@
exec 7<&0 </dev/null 6>&1
# Name of the host.
-@@ -996,31 +1001,30 @@
+@@ -833,6 +838,7 @@
+ GDK_DEP_LIBS
+ GDK_EXTRA_CFLAGS
+ GDK_EXTRA_LIBS
++GDK_PRIVATE_PACKAGES
+ GDK_PACKAGES
+ USE_DIRECTFB_FALSE
+ USE_DIRECTFB_TRUE
+@@ -996,31 +1002,30 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -20690,7 +20418,16 @@
HAVE_OBJC_FALSE
HAVE_OBJC_TRUE
HAVE_CXX_FALSE
-@@ -1073,13 +1077,17 @@
+@@ -1031,6 +1036,8 @@
+ CXXFLAGS
+ ac_ct_CXX
+ CXX
++ENABLE_STATIC_FALSE
++ENABLE_STATIC_TRUE
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
+@@ -1073,13 +1080,17 @@
GTK_MICRO_VERSION
GTK_MINOR_VERSION
GTK_MAJOR_VERSION
@@ -20709,7 +20446,7 @@
MAKEINFO
AUTOHEADER
AUTOMAKE
-@@ -1088,6 +1096,7 @@
+@@ -1088,6 +1099,7 @@
VERSION
PACKAGE
CYGPATH_W
@@ -20717,7 +20454,7 @@
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-@@ -1134,10 +1143,11 @@
+@@ -1134,10 +1146,11 @@
enable_dependency_tracking
enable_static
enable_shared
@@ -20730,7 +20467,7 @@
enable_largefile
enable_maintainer_mode
enable_debug
-@@ -1179,6 +1189,10 @@
+@@ -1179,6 +1192,10 @@
CCC
CPP
CXXCPP
@@ -20741,7 +20478,7 @@
PKG_CONFIG
BASE_DEPENDENCIES_CFLAGS
BASE_DEPENDENCIES_LIBS
-@@ -1817,16 +1831,16 @@
+@@ -1817,16 +1834,16 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -20762,7 +20499,7 @@
--enable-debug=[no/minimum/yes]
turn on debugging [default=yes]
--enable-shm support shared memory if available [default=yes]
-@@ -1852,9 +1866,10 @@
+@@ -1852,9 +1869,10 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -20774,7 +20511,7 @@
--with-xinput=[no/yes] support XInput
--with-gdktarget=[x11/win32/quartz/directfb] select non-default GDK target
--without-libpng disable PNG loader for gdk-pixbuf
-@@ -1882,6 +1897,10 @@
+@@ -1882,6 +1900,10 @@
CXXFLAGS C++ compiler flags
CPP C preprocessor
CXXCPP C++ preprocessor
@@ -20785,7 +20522,7 @@
PKG_CONFIG path to pkg-config utility
BASE_DEPENDENCIES_CFLAGS
C compiler flags for BASE_DEPENDENCIES, overriding pkg-config
-@@ -2343,7 +2362,8 @@
+@@ -2343,7 +2365,8 @@
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set}
@@ -20795,7 +20532,7 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
-@@ -2523,7 +2543,6 @@
+@@ -2523,7 +2546,6 @@
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
@@ -20803,7 +20540,7 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2537,6 +2556,54 @@
+@@ -2537,6 +2559,54 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -20858,7 +20595,7 @@
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.
-@@ -2619,12 +2686,16 @@
+@@ -2619,12 +2689,16 @@
fi
rmdir .tst 2>/dev/null
@@ -20879,7 +20616,7 @@
fi
# test whether we have cygpath
-@@ -2658,10 +2729,7 @@
+@@ -2658,10 +2732,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -20891,7 +20628,7 @@
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-@@ -2761,10 +2829,17 @@
+@@ -2761,10 +2832,17 @@
fi
fi
@@ -20910,7 +20647,7 @@
-@@ -3945,9 +4020,7 @@
+@@ -3945,9 +4023,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
@@ -20921,7 +20658,7 @@
AMDEP_TRUE=
AMDEP_FALSE='#'
else
-@@ -3957,7 +4030,6 @@
+@@ -3957,7 +4033,6 @@
@@ -20929,7 +20666,7 @@
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-@@ -3999,7 +4071,9 @@
+@@ -3999,7 +4074,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -20940,7 +20677,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -4023,13 +4097,19 @@
+@@ -4023,13 +4100,19 @@
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 &&
@@ -20963,7 +20700,7 @@
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
-@@ -4047,9 +4127,7 @@
+@@ -4047,9 +4130,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -20974,20 +20711,26 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -4086,12 +4164,6 @@
-
-
-
--
--
--
--
--
--
+@@ -4085,11 +4166,13 @@
+
+
+
+-
+-
+-
+-
+-
++ if test "$enable_static" = yes; then
++ ENABLE_STATIC_TRUE=
++ ENABLE_STATIC_FALSE='#'
++else
++ ENABLE_STATIC_TRUE='#'
++ ENABLE_STATIC_FALSE=
++fi
+
+
if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
- do
-@@ -4613,7 +4685,9 @@
+@@ -4613,7 +4696,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -20998,7 +20741,7 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -4637,13 +4711,19 @@
+@@ -4637,13 +4722,19 @@
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 &&
@@ -21021,7 +20764,7 @@
am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
-@@ -4661,9 +4741,7 @@
+@@ -4661,9 +4752,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -21032,7 +20775,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
-@@ -4717,9 +4795,7 @@
+@@ -4717,9 +4806,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -21043,7 +20786,7 @@
HAVE_CXX_TRUE=
HAVE_CXX_FALSE='#'
else
-@@ -4772,9 +4848,7 @@
+@@ -4772,9 +4859,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -21054,7 +20797,7 @@
HAVE_OBJC_TRUE=
HAVE_OBJC_FALSE='#'
else
-@@ -4803,417 +4877,114 @@
+@@ -4803,417 +4888,114 @@
enable_shared=yes
fi
@@ -21552,7 +21295,7 @@
{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-@@ -5349,98 +5120,10 @@
+@@ -5349,98 +5131,10 @@
EGREP="$ac_cv_path_EGREP"
@@ -21655,7 +21398,7 @@
else
with_gnu_ld=no
fi
-@@ -5462,9 +5145,9 @@
+@@ -5462,9 +5156,9 @@
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
@@ -21668,7 +21411,7 @@
done
test -z "$LD" && LD="$ac_prog"
;;
-@@ -5544,15 +5227,33 @@
+@@ -5544,15 +5238,33 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -21710,7 +21453,7 @@
if test "${lt_cv_path_NM+set}" = set; then
$as_echo_n "(cached) " >&6
else
-@@ -5597,149 +5298,12 @@
+@@ -5597,149 +5309,12 @@
done
IFS="$lt_save_ifs"
done
@@ -21862,7 +21605,7 @@
{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
-@@ -5752,331 +5316,6 @@
+@@ -5752,331 +5327,6 @@
$as_echo "no, using $LN_S" >&6; }
fi
@@ -22194,7 +21937,7 @@
{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
if test "${lt_cv_deplibs_check_method+set}" = set; then
-@@ -6130,18 +5369,12 @@
+@@ -6130,18 +5380,12 @@
fi
;;
@@ -22214,7 +21957,7 @@
case $host_cpu in
i*86 )
# Not sure whether the presence of OpenBSD here was a mistake.
-@@ -6198,8 +5431,8 @@
+@@ -6198,8 +5442,8 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -22225,7 +21968,7 @@
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-@@ -6212,12 +5445,12 @@
+@@ -6212,12 +5456,12 @@
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
@@ -22241,7 +21984,7 @@
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-@@ -6236,10 +5469,6 @@
+@@ -6236,10 +5480,6 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -22252,7 +21995,7 @@
sysv4 | sysv4.3*)
case $host_vendor in
motorola)
-@@ -6267,7 +5496,7 @@
+@@ -6267,7 +5507,7 @@
esac
;;
@@ -22261,7 +22004,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -6282,64 +5511,246 @@
+@@ -6282,64 +5522,246 @@
@@ -22350,7 +22093,7 @@
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
-+ echo '#line 5555 "configure"' > conftest.$ac_ext
++ echo '#line 5566 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
@@ -22555,7 +22298,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6348,7 +5759,7 @@
+@@ -6348,7 +5770,7 @@
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
@@ -22564,7 +22307,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6358,17 +5769,57 @@
+@@ -6358,17 +5780,57 @@
fi
fi
@@ -22628,7 +22371,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -6376,35 +5827,22 @@
+@@ -6376,35 +5838,22 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -22672,7 +22415,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6413,7 +5851,7 @@
+@@ -6413,7 +5862,7 @@
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
@@ -22681,7 +22424,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6423,10 +5861,10 @@
+@@ -6423,10 +5872,10 @@
fi
fi
@@ -22696,7 +22439,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -6434,17 +5872,17 @@
+@@ -6434,17 +5883,17 @@
fi
@@ -22721,7 +22464,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6453,7 +5891,7 @@
+@@ -6453,7 +5902,7 @@
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
@@ -22730,7 +22473,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6463,17 +5901,17 @@
+@@ -6463,17 +5912,17 @@
fi
fi
@@ -22754,7 +22497,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -6481,29 +5919,22 @@
+@@ -6481,29 +5930,22 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -22792,7 +22535,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6512,7 +5943,7 @@
+@@ -6512,7 +5954,7 @@
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
@@ -22801,7 +22544,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6522,10 +5953,10 @@
+@@ -6522,10 +5964,10 @@
fi
fi
@@ -22816,7 +22559,7 @@
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
-@@ -6533,17 +5964,17 @@
+@@ -6533,17 +5975,17 @@
fi
@@ -22841,7 +22584,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6552,7 +5983,7 @@
+@@ -6552,7 +5994,7 @@
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
@@ -22850,7 +22593,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6562,17 +5993,17 @@
+@@ -6562,17 +6004,17 @@
fi
fi
@@ -22874,7 +22617,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -6580,469 +6011,271 @@
+@@ -6580,469 +6022,271 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -23567,7 +23310,7 @@
int
main ()
-@@ -7052,15 +6285,15 @@
+@@ -7052,15 +6296,15 @@
return 0;
}
_ACEOF
@@ -23586,7 +23329,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -7069,525 +6302,144 @@
+@@ -7069,525 +6313,144 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -24218,7 +23961,7 @@
-@@ -7597,85 +6449,34 @@
+@@ -7597,85 +6460,34 @@
@@ -24317,7 +24060,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -7684,81 +6485,205 @@
+@@ -7684,81 +6496,205 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -24582,7 +24325,7 @@
do
# Use a header file that comes with gcc, so configuring glibc
# with a fresh cross-compiler works.
-@@ -7793,7 +6718,7 @@
+@@ -7793,7 +6729,7 @@
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
@@ -24591,7 +24334,7 @@
test ! -s conftest.err
}; then
:
-@@ -7831,7 +6756,7 @@
+@@ -7831,7 +6767,7 @@
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
@@ -24600,7 +24343,7 @@
test ! -s conftest.err
}; then
# Broken: success on invalid input.
-@@ -7855,17 +6780,17 @@
+@@ -7855,17 +6791,17 @@
fi
done
@@ -24624,7 +24367,7 @@
do
# Use a header file that comes with gcc, so configuring glibc
# with a fresh cross-compiler works.
-@@ -7900,7 +6825,7 @@
+@@ -7900,7 +6836,7 @@
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
@@ -24633,7 +24376,7 @@
test ! -s conftest.err
}; then
:
-@@ -7938,7 +6863,7 @@
+@@ -7938,7 +6874,7 @@
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
@@ -24642,7 +24385,7 @@
test ! -s conftest.err
}; then
# Broken: success on invalid input.
-@@ -7962,226 +6887,228 @@
+@@ -7962,226 +6898,228 @@
else
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -25043,7 +24786,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -8198,120 +7125,463 @@
+@@ -8198,120 +7136,463 @@
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
@@ -25115,13 +24858,7 @@
+else
+ i=0
+ teststring="ABCD"
-
--for ac_header in dlfcn.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -25148,7 +24885,13 @@
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-+
+
+-for ac_header in dlfcn.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
@@ -25502,9 +25245,9 @@
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+ fi
++rmdir .libs 2>/dev/null
+fi
-+rmdir .libs 2>/dev/null
- fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
@@ -25585,7 +25328,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8320,7 +7590,7 @@
+@@ -8320,7 +7601,7 @@
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
@@ -25594,7 +25337,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8330,32 +7600,28 @@
+@@ -8330,32 +7611,28 @@
fi
fi
@@ -25638,7 +25381,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -8364,7 +7630,7 @@
+@@ -8364,7 +7641,7 @@
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
@@ -25647,7 +25390,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -8374,21 +7640,17 @@
+@@ -8374,21 +7651,17 @@
fi
fi
@@ -25675,7 +25418,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -8396,1023 +7658,731 @@
+@@ -8396,1023 +7669,731 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -27307,7 +27050,7 @@
# If no C compiler was specified, use CC.
-@@ -9424,38 +8394,35 @@
+@@ -9424,38 +8405,35 @@
# Allow CC to be a program name with arguments.
compiler=$CC
@@ -27351,17 +27094,17 @@
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9467,21 +8434,21 @@
+@@ -9467,21 +8445,21 @@
-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:9470: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8437: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8448: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9474: \$? = $ac_status" >&5
-+ echo "$as_me:8441: \$? = $ac_status" >&5
++ echo "$as_me:8452: \$? = $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.
@@ -27377,7 +27120,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-@@ -9495,12 +8462,7 @@
+@@ -9495,12 +8473,7 @@
fi
@@ -27391,7 +27134,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
-@@ -9521,25 +8483,17 @@
+@@ -9521,25 +8494,17 @@
;;
amigaos*)
@@ -27422,7 +27165,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -9553,20 +8507,6 @@
+@@ -9553,20 +8518,6 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -27443,7 +27186,7 @@
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -9579,18 +8519,25 @@
+@@ -9579,18 +8530,25 @@
enable_shared=no
;;
@@ -27475,7 +27218,7 @@
*)
lt_prog_compiler_pic='-fPIC'
;;
-@@ -9607,8 +8554,18 @@
+@@ -9607,8 +8565,18 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -27495,7 +27238,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9636,27 +8593,18 @@
+@@ -9636,27 +8604,18 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -27529,7 +27272,7 @@
pgcc* | pgf77* | pgf90* | pgf95*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
-@@ -9669,14 +8617,8 @@
+@@ -9669,14 +8628,8 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -27545,7 +27288,7 @@
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic='-KPIC'
-@@ -9694,17 +8636,6 @@
+@@ -9694,17 +8647,6 @@
esac
;;
@@ -27563,7 +27306,7 @@
osf3* | osf4* | osf5*)
lt_prog_compiler_wl='-Wl,'
# All OSF/1 code is PIC.
-@@ -9767,34 +8698,21 @@
+@@ -9767,34 +8709,21 @@
esac
fi
@@ -27601,17 +27344,17 @@
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9806,21 +8724,21 @@
+@@ -9806,21 +8735,21 @@
-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:9809: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8727: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8738: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9813: \$? = $ac_status" >&5
-+ echo "$as_me:8731: \$? = $ac_status" >&5
++ echo "$as_me:8742: \$? = $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.
@@ -27627,7 +27370,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-@@ -9837,11 +8755,15 @@
+@@ -9837,11 +8766,15 @@
fi
fi
@@ -27648,7 +27391,7 @@
#
# Check to make sure the static flag actually works.
-@@ -9862,7 +8784,7 @@
+@@ -9862,7 +8795,7 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -27657,7 +27400,7 @@
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -9871,7 +8793,7 @@
+@@ -9871,7 +8804,7 @@
lt_cv_prog_compiler_static_works=yes
fi
fi
@@ -27666,7 +27409,7 @@
LDFLAGS="$save_LDFLAGS"
fi
-@@ -9885,18 +8807,13 @@
+@@ -9885,18 +8818,13 @@
fi
@@ -27687,17 +27430,17 @@
mkdir conftest
cd conftest
mkdir out
-@@ -9911,148 +8828,83 @@
+@@ -9911,148 +8839,83 @@
-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:9914: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8831: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8842: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9918: \$? = $ac_status" >&5
-+ echo "$as_me:8835: \$? = $ac_status" >&5
++ echo "$as_me:8846: \$? = $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
@@ -27876,7 +27619,7 @@
# include_expsyms should be a list of space-separated symbols to be *always*
# included in the symbol list
include_expsyms=
-@@ -10068,9 +8920,19 @@
+@@ -10068,9 +8931,19 @@
# preloaded symbol tables.
# Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
@@ -27897,7 +27640,7 @@
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
-@@ -10096,16 +8958,16 @@
+@@ -10096,16 +8969,16 @@
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
@@ -27920,7 +27663,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10119,7 +8981,7 @@
+@@ -10119,7 +8992,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
@@ -27929,7 +27672,7 @@
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
-@@ -10127,27 +8989,26 @@
+@@ -10127,27 +9000,26 @@
*** really care for shared libraries, you may want to modify your PATH
*** so that a non-GNU linker is found, and then restart.
@@ -27970,7 +27713,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
-@@ -10157,16 +9018,16 @@
+@@ -10157,16 +9029,16 @@
fi
;;
@@ -27991,7 +27734,7 @@
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
-@@ -10197,78 +9058,49 @@
+@@ -10197,78 +9069,49 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -28089,7 +27832,7 @@
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
-@@ -10278,9 +9110,9 @@
+@@ -10278,9 +9121,9 @@
;;
solaris*)
@@ -28101,7 +27844,7 @@
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
-@@ -10289,8 +9121,8 @@
+@@ -10289,8 +9132,8 @@
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
@@ -28112,7 +27855,7 @@
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
-@@ -10314,14 +9146,10 @@
+@@ -10314,14 +9157,10 @@
_LT_EOF
;;
*)
@@ -28131,7 +27874,7 @@
else
ld_shlibs=no
fi
-@@ -10337,7 +9165,7 @@
+@@ -10337,7 +9176,7 @@
;;
*)
@@ -28140,7 +27883,7 @@
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
-@@ -10379,10 +9207,10 @@
+@@ -10379,10 +9218,10 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -28154,7 +27897,7 @@
fi
aix_use_runtimelinking=no
-@@ -10391,10 +9219,10 @@
+@@ -10391,10 +9230,10 @@
# need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
@@ -28169,7 +27912,7 @@
done
;;
esac
-@@ -10411,30 +9239,28 @@
+@@ -10411,30 +9250,28 @@
archive_cmds=''
hardcode_direct=yes
@@ -28212,7 +27955,7 @@
fi
;;
esac
-@@ -10445,8 +9271,8 @@
+@@ -10445,8 +9282,8 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -28223,7 +27966,7 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
-@@ -10457,7 +9283,6 @@
+@@ -10457,7 +9294,6 @@
fi
fi
@@ -28231,7 +27974,7 @@
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
-@@ -10465,9 +9290,8 @@
+@@ -10465,9 +9301,8 @@
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -28243,7 +27986,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10528,16 +9352,15 @@
+@@ -10528,16 +9363,15 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -28264,7 +28007,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10614,25 +9437,18 @@
+@@ -10614,25 +9448,18 @@
;;
amigaos*)
@@ -28296,7 +28039,7 @@
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -10644,9 +9460,9 @@
+@@ -10644,9 +9471,9 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
@@ -28308,7 +28051,7 @@
# FIXME: Should let the user specify the lib program.
old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
fix_srcfile_path='`cygpath -w "$srcfile"`'
-@@ -10654,30 +9470,52 @@
+@@ -10654,30 +9481,52 @@
;;
darwin* | rhapsody*)
@@ -28385,7 +28128,7 @@
;;
dgux*)
-@@ -10719,9 +9557,9 @@
+@@ -10719,9 +9568,9 @@
hpux9*)
if test "$GCC" = yes; then
@@ -28397,7 +28140,7 @@
fi
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
-@@ -10741,11 +9579,11 @@
+@@ -10741,11 +9590,11 @@
fi
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
@@ -28411,7 +28154,7 @@
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
-@@ -10759,7 +9597,7 @@
+@@ -10759,7 +9608,7 @@
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
@@ -28420,7 +28163,7 @@
;;
*)
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10784,12 +9622,12 @@
+@@ -10784,12 +9633,12 @@
case $host_cpu in
hppa*64*|ia64*)
@@ -28434,7 +28177,7 @@
export_dynamic_flag_spec='${wl}-E'
# hardcode_minus_L: Not really in the search PATH,
-@@ -10802,62 +9640,18 @@
+@@ -10802,62 +9651,18 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -28502,7 +28245,7 @@
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-@@ -10875,15 +9669,11 @@
+@@ -10875,15 +9680,11 @@
hardcode_shlibpath_var=no
;;
@@ -28519,7 +28262,7 @@
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -10899,7 +9689,7 @@
+@@ -10899,7 +9700,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
@@ -28528,7 +28271,7 @@
else
ld_shlibs=no
fi
-@@ -10909,19 +9699,18 @@
+@@ -10909,19 +9710,18 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -28552,7 +28295,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
-@@ -10929,43 +9718,32 @@
+@@ -10929,43 +9729,32 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -28608,7 +28351,7 @@
fi
hardcode_libdir_flag_spec='-R$libdir'
hardcode_shlibpath_var=no
-@@ -10975,7 +9753,7 @@
+@@ -10975,7 +9764,7 @@
# The compiler driver will combine and reorder linker options,
# but understands `-z linker_flag'. GCC discards it without `$wl',
# but is careful enough not to reorder.
@@ -28617,7 +28360,7 @@
if test "$GCC" = yes; then
whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
else
-@@ -11064,18 +9842,18 @@
+@@ -11064,18 +9853,18 @@
allow_undefined_flag='${wl}-z,nodefs'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
@@ -28641,7 +28384,7 @@
fi
;;
-@@ -11089,36 +9867,12 @@
+@@ -11089,36 +9878,12 @@
ld_shlibs=no
;;
esac
@@ -28678,7 +28421,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11138,7 +9892,7 @@
+@@ -11138,7 +9903,7 @@
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -28687,7 +28430,7 @@
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -11159,8 +9913,8 @@
+@@ -11159,8 +9924,8 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -28698,7 +28441,7 @@
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -11173,7 +9927,7 @@
+@@ -11173,7 +9938,7 @@
else
cat conftest.err 1>&5
fi
@@ -28707,7 +28450,7 @@
{ $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
$as_echo "$archive_cmds_need_lc" >&6; }
;;
-@@ -11182,164 +9936,21 @@
+@@ -11182,164 +9947,21 @@
;;
esac
@@ -28886,7 +28629,7 @@
if test "$GCC" = yes; then
case $host_os in
-@@ -11347,14 +9958,14 @@
+@@ -11347,14 +9969,14 @@
*) lt_awk_arg="/^libraries:/" ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@ -28904,7 +28647,7 @@
fi
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
-@@ -11368,7 +9979,7 @@
+@@ -11368,7 +9990,7 @@
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -28913,7 +28656,7 @@
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -11388,23 +9999,10 @@
+@@ -11388,23 +10010,10 @@
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -28938,7 +28681,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -11441,7 +10039,7 @@
+@@ -11441,7 +10050,7 @@
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
@@ -28947,7 +28690,7 @@
:
else
can_build_shared=no
-@@ -11467,18 +10065,9 @@
+@@ -11467,18 +10076,9 @@
;;
amigaos*)
@@ -28969,7 +28712,7 @@
;;
beos*)
-@@ -11501,28 +10090,25 @@
+@@ -11501,28 +10101,25 @@
# libtool to hard-code these into programs
;;
@@ -29003,7 +28746,7 @@
shlibpath_overrides_runpath=yes
case $host_os in
-@@ -11531,20 +10117,20 @@
+@@ -11531,20 +10128,20 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
@@ -29029,7 +28772,7 @@
fi
;;
pw32*)
-@@ -11568,7 +10154,7 @@
+@@ -11568,7 +10165,7 @@
version_type=darwin
need_lib_prefix=no
need_version=no
@@ -29038,7 +28781,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
-@@ -11667,18 +10253,18 @@
+@@ -11667,18 +10264,18 @@
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -29069,7 +28812,7 @@
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
-@@ -11755,76 +10341,15 @@
+@@ -11755,76 +10352,15 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -29148,7 +28891,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11836,11 +10361,23 @@
+@@ -11836,11 +10372,23 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -29173,7 +28916,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
-@@ -11861,16 +10398,14 @@
+@@ -11861,16 +10409,14 @@
shlibpath_overrides_runpath=yes
;;
@@ -29193,7 +28936,7 @@
;;
openbsd*)
-@@ -11879,13 +10414,13 @@
+@@ -11879,13 +10425,13 @@
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
case $host_os in
@@ -29210,7 +28953,7 @@
case $host_os in
openbsd2.[89] | openbsd2.[89].*)
shlibpath_overrides_runpath=no
-@@ -11957,6 +10492,7 @@
+@@ -11957,6 +10503,7 @@
sni)
shlibpath_overrides_runpath=no
need_lib_prefix=no
@@ -29218,7 +28961,7 @@
runpath_var=LD_RUN_PATH
;;
siemens)
-@@ -11987,12 +10523,13 @@
+@@ -11987,12 +10534,13 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
@@ -29233,7 +28976,7 @@
case $host_os in
sco3.2v5*)
sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-@@ -12002,21 +10539,10 @@
+@@ -12002,21 +10550,10 @@
sys_lib_dlsearch_path_spec='/usr/lib'
;;
@@ -29257,7 +29000,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-@@ -12028,117 +10554,39 @@
+@@ -12028,117 +10565,39 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -29393,7 +29136,7 @@
test "$hardcode_minus_L" != no; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
-@@ -12154,8 +10602,7 @@
+@@ -12154,8 +10613,7 @@
{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
@@ -29403,7 +29146,7 @@
# Fast installation is not supported
enable_fast_install=no
elif test "$shlibpath_overrides_runpath" = yes ||
-@@ -12164,12 +10611,37 @@
+@@ -12164,12 +10622,37 @@
enable_fast_install=needless
fi
@@ -29446,7 +29189,7 @@
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
-@@ -12184,15 +10656,15 @@
+@@ -12184,15 +10667,15 @@
lt_cv_dlopen_self=yes
;;
@@ -29465,7 +29208,7 @@
darwin*)
# if libdl is installed we need to link against it
-@@ -12271,7 +10743,7 @@
+@@ -12271,7 +10754,7 @@
fi
@@ -29474,50 +29217,55 @@
*)
{ $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-@@ -12532,88 +11004,5025 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dlopen ();
--int
--main ()
--{
--return dlopen ();
-- ;
-- return 0;
--}
+@@ -12509,43 +10992,5048 @@
+ ac_cv_func_dlopen=no
+ fi
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-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
+- lt_cv_dlopen="dlopen"
+-else
+- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
-_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_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_lib_dl_dlopen=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++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
++ lt_cv_dlopen="dlopen"
++else
++ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
@@ -29755,7 +29503,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 11244 "configure"
++#line 11255 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -29855,7 +29603,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
-+#line 11344 "configure"
++#line 11355 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
@@ -32264,11 +32012,11 @@
+ -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:13753: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13764: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:13757: \$? = $ac_status" >&5
++ echo "$as_me:13768: \$? = $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.
@@ -32368,11 +32116,11 @@
+ -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:13857: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13868: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:13861: \$? = $ac_status" >&5
++ echo "$as_me:13872: \$? = $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
@@ -33966,11 +33714,11 @@
+ -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:15455: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15466: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:15459: \$? = $ac_status" >&5
++ echo "$as_me:15470: \$? = $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.
@@ -34070,11 +33818,11 @@
+ -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:15559: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15570: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
-+ echo "$as_me:15563: \$? = $ac_status" >&5
++ echo "$as_me:15574: \$? = $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
@@ -34483,9 +34231,7 @@
+ hardcode_direct_F77=yes
+ hardcode_libdir_separator_F77=':'
+ link_all_deplibs_F77=yes
-
-- ac_cv_lib_dl_dlopen=no
--fi
++
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
@@ -34526,12 +34272,71 @@
+ fi
+ fi
+ fi
++
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ always_export_symbols_F77=yes
++ if test "$aix_use_runtimelinking" = yes; then
++ # Warning - without using the other runtime loading flags (-brtl),
++ # -berok will link without error, but may produce a broken library.
++ allow_undefined_flag_F77='-berok'
++ # Determine the default libpath from the value encoded in an empty executable.
++ cat >conftest.$ac_ext <<_ACEOF
++ program main
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+- ;
+- return 0;
+-}
++ end
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+@@ -12562,126 +16050,50 @@
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
++ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+- ac_cv_lib_dl_dlopen=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dl_dlopen=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
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ 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
@@ -34550,17 +34355,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ always_export_symbols_F77=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ allow_undefined_flag_F77='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-
+-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -34575,35 +34370,29 @@
- ;
- return 0;
-}
-+ end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
-@@ -12630,58 +16039,50 @@
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-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
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
-+ test -z "$ac_f77_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.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
- ac_cv_lib_svld_dlopen=yes
-+
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+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
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34667,7 +34456,7 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
-@@ -12698,2184 +16099,1972 @@
+@@ -12698,2184 +16110,1972 @@
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
@@ -37960,11 +37749,11 @@
+ -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:17787: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17798: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
-+ echo "$as_me:17791: \$? = $ac_status" >&5
++ echo "$as_me:17802: \$? = $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.
@@ -38470,7 +38259,7 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ fi
+ ;;
-
++
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
@@ -38481,18 +38270,18 @@
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_can_build_shared_GCJ=no
+ ;;
-+
+
+ uts4*)
+ lt_prog_compiler_pic_GCJ='-pic'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
-
++
+ *)
+ lt_prog_compiler_can_build_shared_GCJ=no
+ ;;
+ esac
+ fi
-+
+
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
@@ -38520,17 +38309,17 @@
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
-@@ -14885,50 +18074,57 @@
+@@ -14885,50 +18085,57 @@
-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:14888: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18077: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18088: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14892: \$? = $ac_status" >&5
-+ echo "$as_me:18081: \$? = $ac_status" >&5
++ echo "$as_me:18092: \$? = $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.
@@ -38595,7 +38384,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14938,90 +18134,36 @@
+@@ -14938,90 +18145,36 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -38698,17 +38487,17 @@
mkdir conftest
cd conftest
mkdir out
-@@ -15036,45 +18178,43 @@
+@@ -15036,45 +18189,43 @@
-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:15039: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18181: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18192: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15043: \$? = $ac_status" >&5
-+ echo "$as_me:18185: \$? = $ac_status" >&5
++ echo "$as_me:18196: \$? = $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
@@ -38757,7 +38546,7 @@
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
-@@ -15090,174 +18230,1064 @@
+@@ -15090,174 +18241,1064 @@
need_locks=no
fi
@@ -39905,7 +39694,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -15271,6 +19301,7 @@
+@@ -15271,6 +19312,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -39913,7 +39702,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15307,7 +19338,7 @@
+@@ -15307,7 +19349,7 @@
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
@@ -39922,7 +39711,7 @@
:
else
can_build_shared=no
-@@ -15333,18 +19364,9 @@
+@@ -15333,18 +19375,9 @@
;;
amigaos*)
@@ -39944,7 +39733,7 @@
;;
beos*)
-@@ -15367,28 +19389,25 @@
+@@ -15367,28 +19400,25 @@
# libtool to hard-code these into programs
;;
@@ -39978,7 +39767,7 @@
shlibpath_overrides_runpath=yes
case $host_os in
-@@ -15397,20 +19416,20 @@
+@@ -15397,20 +19427,20 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
@@ -40004,7 +39793,7 @@
fi
;;
pw32*)
-@@ -15434,7 +19453,7 @@
+@@ -15434,7 +19464,7 @@
version_type=darwin
need_lib_prefix=no
need_version=no
@@ -40013,7 +39802,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
-@@ -15532,18 +19551,18 @@
+@@ -15532,18 +19562,18 @@
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -40044,7 +39833,7 @@
shrext_cmds='.sl'
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
-@@ -15620,76 +19639,15 @@
+@@ -15620,76 +19650,15 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -40123,7 +39912,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15701,1884 +19659,1223 @@
+@@ -15701,1884 +19670,1223 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -40164,12 +39953,14 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='ldqnx.so'
-- ;;
--
++ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
-openbsd*)
-- version_type=sunos
++netbsd*)
+ version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
-- need_lib_prefix=no
+ need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
@@ -40187,9 +39978,17 @@
- shlibpath_overrides_runpath=yes
- ;;
- esac
-- else
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
+ else
- shlibpath_overrides_runpath=yes
-- fi
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
+ fi
- ;;
-
-os2*)
@@ -40222,17 +40021,15 @@
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
-+ dynamic_linker='NetBSD ld.elf_so'
- ;;
-
+- ;;
+-
-sunos4*)
-+netbsd*)
- version_type=sunos
+- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
@@ -40241,11 +40038,12 @@
- need_lib_prefix=no
- fi
- need_version=yes
-- ;;
--
+ ;;
+
-sysv4 | sysv4.3*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
@@ -40277,33 +40075,26 @@
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
+- need_lib_prefix=no
+- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
- else
+- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
- esac
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
- fi
+- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
-- ;;
--
+ ;;
+
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
@@ -40319,7 +40110,7 @@
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
@@ -40583,10 +40374,7 @@
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-
+-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
@@ -40594,13 +40382,7 @@
-PS1='$ '
-PS2='> '
-PS4='+ '
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-
+-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
@@ -41494,15 +41276,15 @@
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC_GCJ
++
++# An ERE matcher.
++EGREP=$lt_EGREP
- PACKAGE='$PACKAGE'
- VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
- RM='$RM'
- ofile='$ofile'
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-
+# The linker used to build libraries.
+LD=$lt_LD_GCJ
@@ -41515,38 +41297,41 @@
+# A symbol stripping program
+STRIP=$lt_STRIP
--_LTEOF
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+-_LTEOF
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
-cat >>"$CONFIG_LT" <<\_LTEOF
-{ $as_echo "$as_me:$LINENO: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
++# Used on cygwin: assembler.
++AS="$AS"
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-+# Used on cygwin: assembler.
-+AS="$AS"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
- cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-
-- cat <<_LT_EOF >> "$cfgfile"
--#! $SHELL
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+- cat <<_LT_EOF >> "$cfgfile"
+-#! $SHELL
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_GCJ
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
@@ -41579,134 +41364,131 @@
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_GCJ
-
+# Object file suffix (normally "o").
+objext="$ac_objext"
++# Old archive suffix (normally "a").
++libext="$libext"
+
-# The names of the tagged configurations supported by this script.
-available_tags="CXX "
-+# Old archive suffix (normally "a").
-+libext="$libext"
-
--# ### BEGIN LIBTOOL CONFIG
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+-# ### BEGIN LIBTOOL CONFIG
++# Executable file suffix (normally "").
++exeext="$exeext"
+
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-
--# Assembler program.
--AS=$AS
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_GCJ
+pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+
+-# Assembler program.
+-AS=$AS
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-# DLL creation program.
-DLLTOOL=$DLLTOOL
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
-# Object dumper program.
-OBJDUMP=$OBJDUMP
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Do we need a version for libraries?
++need_version=$need_version
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
-# What type of objects to build.
-pic_mode=$pic_mode
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_GCJ
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-# A sed program that does not truncate output.
-SED=$lt_SED
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_GCJ
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-# A grep program that handles long lines.
-GREP=$lt_GREP
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-# An ERE matcher.
-EGREP=$lt_EGREP
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
++# Library versioning type.
++version_type=$version_type
-# A literal string matcher.
-FGREP=$lt_FGREP
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-+# Library versioning type.
-+version_type=$version_type
-
--# Whether we need soft or hard links.
--LN_S=$lt_LN_S
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-
--# What is the maximum length of a command?
--max_cmd_len=$max_cmd_len
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
--# Object file suffix (normally "o").
--objext=$ac_objext
+-# Whether we need soft or hard links.
+-LN_S=$lt_LN_S
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
--# Executable file suffix (normally "").
--exeext=$exeext
+-# What is the maximum length of a command?
+-max_cmd_len=$max_cmd_len
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds_GCJ
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
+
+-# Object file suffix (normally "o").
+-objext=$ac_objext
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-+
+
+-# Executable file suffix (normally "").
+-exeext=$exeext
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
@@ -41810,28 +41592,30 @@
-objdir=$objdir
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
-+
+
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# An echo program that does not interpret backslashes.
+-ECHO=$lt_ECHO
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_GCJ
--# An echo program that does not interpret backslashes.
--ECHO=$lt_ECHO
+-# Used to examine libraries when file_magic_cmd begins with "file".
+-MAGIC_CMD=$MAGIC_CMD
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
--# Used to examine libraries when file_magic_cmd begins with "file".
--MAGIC_CMD=$MAGIC_CMD
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
+-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+-DSYMUTIL=$lt_DSYMUTIL
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
@@ -41855,9 +41639,7 @@
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$hardcode_automatic_GCJ
-
--# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
--DSYMUTIL=$lt_DSYMUTIL
++
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
@@ -42944,13 +42726,13 @@
-@@ -17940,11 +21237,119 @@
- fi
-
-
--# By default we simply use the C compiler to build assembly code.
-+# By default we simply use the C compiler to build assembly code.
-+
+@@ -17942,9 +21250,117 @@
+
+ # By default we simply use the C compiler to build assembly code.
+
+-: ${CCAS='$(CC)'}
+-# Set ASFLAGS if not already set.
+-: ${CCASFLAGS='$(CFLAGS)'}
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+
@@ -43052,10 +42834,7 @@
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-
--: ${CCAS='$(CC)'}
--# Set ASFLAGS if not already set.
--: ${CCASFLAGS='$(CFLAGS)'}
++
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
@@ -43068,7 +42847,7 @@
# Extract the first word of "nm", so it can be a program name with args.
-@@ -18000,9 +21405,7 @@
+@@ -18000,9 +21416,7 @@
{ $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
$as_echo "$USE_MAINTAINER_MODE" >&6; }
@@ -43079,7 +42858,7 @@
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
-@@ -18026,9 +21429,7 @@
+@@ -18026,9 +21440,7 @@
esac
{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5
$as_echo "$platform_win32" >&6; }
@@ -43090,7 +42869,7 @@
PLATFORM_WIN32_TRUE=
PLATFORM_WIN32_FALSE='#'
else
-@@ -18037,9 +21438,7 @@
+@@ -18037,9 +21449,7 @@
fi
@@ -43101,7 +42880,7 @@
OS_WIN32_TRUE=
OS_WIN32_FALSE='#'
else
-@@ -18047,9 +21446,7 @@
+@@ -18047,9 +21457,7 @@
OS_WIN32_FALSE=
fi
@@ -43112,7 +42891,7 @@
OS_UNIX_TRUE=
OS_UNIX_FALSE='#'
else
-@@ -18057,9 +21454,7 @@
+@@ -18057,9 +21465,7 @@
OS_UNIX_FALSE=
fi
@@ -43123,7 +42902,7 @@
OS_LINUX_TRUE=
OS_LINUX_FALSE='#'
else
-@@ -18205,9 +21600,7 @@
+@@ -18205,9 +21611,7 @@
fi
@@ -43134,12 +42913,21 @@
MS_LIB_AVAILABLE_TRUE=
MS_LIB_AVAILABLE_FALSE='#'
else
-@@ -18363,54 +21756,536 @@
- Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
+@@ -18357,60 +21761,542 @@
+ # Ok.
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+-Check your system clock" >&5
+-$as_echo "$as_me: error: newly created file is older than distributed files!
+-Check your system clock" >&2;}
+- { (exit 1); exit 1; }; }
++ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++Check your system clock" >&5
++$as_echo "$as_me: error: newly created file is older than distributed files!
++Check your system clock" >&2;}
++ { (exit 1); exit 1; }; }
++fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
@@ -43623,11 +43411,7 @@
+
+ ac_compiler_gnu=no
+fi
-
--# Checks for programs.
--{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
--$as_echo_n "checking for library containing strerror... " >&6; }
--if test "${ac_cv_search_strerror+set}" = set; then
++
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
@@ -43638,7 +43422,14 @@
+ GCC=yes
+else
+ GCC=
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-# Checks for programs.
+-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-$as_echo_n "checking for library containing strerror... " >&6; }
+-if test "${ac_cv_search_strerror+set}" = set; then
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
@@ -43697,7 +43488,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -18419,62 +22294,128 @@
+@@ -18419,62 +22305,128 @@
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -43867,7 +43658,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18502,24 +22443,40 @@
+@@ -18502,24 +22454,40 @@
va_end (v);
return s;
}
@@ -43912,7 +43703,7 @@
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -18537,7 +22494,7 @@
+@@ -18537,7 +22505,7 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
@@ -43921,7 +43712,7 @@
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18545,23 +22502,144 @@
+@@ -18545,23 +22513,144 @@
fi
@@ -44077,7 +43868,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
-@@ -18878,10 +22956,11 @@
+@@ -18878,10 +22967,11 @@
{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5
$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
@@ -44093,7 +43884,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5
ac_status=$?
-@@ -18891,13 +22970,15 @@
+@@ -18891,13 +22981,15 @@
else
pkg_failed=yes
fi
@@ -44115,7 +43906,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.19.7 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5
ac_status=$?
-@@ -18907,8 +22988,9 @@
+@@ -18907,8 +22999,9 @@
else
pkg_failed=yes
fi
@@ -44127,7 +43918,7 @@
fi
-@@ -18921,9 +23003,9 @@
+@@ -18921,9 +23014,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -44139,7 +43930,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
-@@ -19024,9 +23106,7 @@
+@@ -19024,9 +23117,7 @@
{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5
$as_echo "$enable_explicit_deps" >&6; }
@@ -44150,7 +43941,7 @@
DISABLE_EXPLICIT_DEPS_TRUE=
DISABLE_EXPLICIT_DEPS_FALSE='#'
else
-@@ -24602,9 +28682,7 @@
+@@ -24602,9 +28693,7 @@
fi
@@ -44161,7 +43952,7 @@
BUILD_GDIPLUS_LOADERS_TRUE=
BUILD_GDIPLUS_LOADERS_FALSE='#'
else
-@@ -25858,9 +29936,7 @@
+@@ -25858,9 +29947,7 @@
@@ -44172,7 +43963,7 @@
BUILD_DYNAMIC_MODULES_TRUE=
BUILD_DYNAMIC_MODULES_FALSE='#'
else
-@@ -25953,9 +30029,7 @@
+@@ -25953,9 +30040,7 @@
@@ -44183,7 +43974,7 @@
INCLUDE_PNG_TRUE=
INCLUDE_PNG_FALSE='#'
else
-@@ -25963,9 +30037,7 @@
+@@ -25963,9 +30048,7 @@
INCLUDE_PNG_FALSE=
fi
@@ -44194,7 +43985,7 @@
INCLUDE_BMP_TRUE=
INCLUDE_BMP_FALSE='#'
else
-@@ -25973,9 +30045,7 @@
+@@ -25973,9 +30056,7 @@
INCLUDE_BMP_FALSE=
fi
@@ -44205,7 +43996,7 @@
INCLUDE_WBMP_TRUE=
INCLUDE_WBMP_FALSE='#'
else
-@@ -25983,9 +30053,7 @@
+@@ -25983,9 +30064,7 @@
INCLUDE_WBMP_FALSE=
fi
@@ -44216,7 +44007,7 @@
INCLUDE_GIF_TRUE=
INCLUDE_GIF_FALSE='#'
else
-@@ -25993,9 +30061,7 @@
+@@ -25993,9 +30072,7 @@
INCLUDE_GIF_FALSE=
fi
@@ -44227,7 +44018,7 @@
INCLUDE_ICO_TRUE=
INCLUDE_ICO_FALSE='#'
else
-@@ -26003,9 +30069,7 @@
+@@ -26003,9 +30080,7 @@
INCLUDE_ICO_FALSE=
fi
@@ -44238,7 +44029,7 @@
INCLUDE_ANI_TRUE=
INCLUDE_ANI_FALSE='#'
else
-@@ -26013,9 +30077,7 @@
+@@ -26013,9 +30088,7 @@
INCLUDE_ANI_FALSE=
fi
@@ -44249,7 +44040,7 @@
INCLUDE_JPEG_TRUE=
INCLUDE_JPEG_FALSE='#'
else
-@@ -26023,9 +30085,7 @@
+@@ -26023,9 +30096,7 @@
INCLUDE_JPEG_FALSE=
fi
@@ -44260,7 +44051,7 @@
INCLUDE_PNM_TRUE=
INCLUDE_PNM_FALSE='#'
else
-@@ -26033,9 +30093,7 @@
+@@ -26033,9 +30104,7 @@
INCLUDE_PNM_FALSE=
fi
@@ -44271,7 +44062,7 @@
INCLUDE_RAS_TRUE=
INCLUDE_RAS_FALSE='#'
else
-@@ -26043,9 +30101,7 @@
+@@ -26043,9 +30112,7 @@
INCLUDE_RAS_FALSE=
fi
@@ -44282,7 +44073,7 @@
INCLUDE_TIFF_TRUE=
INCLUDE_TIFF_FALSE='#'
else
-@@ -26053,9 +30109,7 @@
+@@ -26053,9 +30120,7 @@
INCLUDE_TIFF_FALSE=
fi
@@ -44293,7 +44084,7 @@
INCLUDE_XPM_TRUE=
INCLUDE_XPM_FALSE='#'
else
-@@ -26063,9 +30117,7 @@
+@@ -26063,9 +30128,7 @@
INCLUDE_XPM_FALSE=
fi
@@ -44304,7 +44095,7 @@
INCLUDE_XBM_TRUE=
INCLUDE_XBM_FALSE='#'
else
-@@ -26073,9 +30125,7 @@
+@@ -26073,9 +30136,7 @@
INCLUDE_XBM_FALSE=
fi
@@ -44315,7 +44106,7 @@
INCLUDE_TGA_TRUE=
INCLUDE_TGA_FALSE='#'
else
-@@ -26083,9 +30133,7 @@
+@@ -26083,9 +30144,7 @@
INCLUDE_TGA_FALSE=
fi
@@ -44326,7 +44117,7 @@
INCLUDE_PCX_TRUE=
INCLUDE_PCX_FALSE='#'
else
-@@ -26093,9 +30141,7 @@
+@@ -26093,9 +30152,7 @@
INCLUDE_PCX_FALSE=
fi
@@ -44337,7 +44128,7 @@
INCLUDE_ICNS_TRUE=
INCLUDE_ICNS_FALSE='#'
else
-@@ -26103,9 +30149,7 @@
+@@ -26103,9 +30160,7 @@
INCLUDE_ICNS_FALSE=
fi
@@ -44348,7 +44139,7 @@
INCLUDE_JASPER_TRUE=
INCLUDE_JASPER_FALSE='#'
else
-@@ -26115,9 +30159,7 @@
+@@ -26115,9 +30170,7 @@
# As all GDI+ loaders are either built-in or not, arbitrarily just
# check one of the variables here
@@ -44359,7 +44150,7 @@
INCLUDE_GDIPLUS_TRUE=
INCLUDE_GDIPLUS_FALSE='#'
else
-@@ -26266,9 +30308,7 @@
+@@ -26266,9 +30319,7 @@
{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5
$as_echo "$included_immodules" >&6; }
@@ -44370,7 +44161,7 @@
HAVE_INCLUDED_IMMMODULES_TRUE=
HAVE_INCLUDED_IMMMODULES_FALSE='#'
else
-@@ -26299,9 +30339,7 @@
+@@ -26299,9 +30350,7 @@
@@ -44381,7 +44172,7 @@
INCLUDE_IM_AM_ET_TRUE=
INCLUDE_IM_AM_ET_FALSE='#'
else
-@@ -26309,9 +30347,7 @@
+@@ -26309,9 +30358,7 @@
INCLUDE_IM_AM_ET_FALSE=
fi
@@ -44392,7 +44183,7 @@
INCLUDE_IM_CEDILLA_TRUE=
INCLUDE_IM_CEDILLA_FALSE='#'
else
-@@ -26319,9 +30355,7 @@
+@@ -26319,9 +30366,7 @@
INCLUDE_IM_CEDILLA_FALSE=
fi
@@ -44403,7 +44194,7 @@
INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE=
INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#'
else
-@@ -26329,9 +30363,7 @@
+@@ -26329,9 +30374,7 @@
INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE=
fi
@@ -44414,7 +44205,7 @@
INCLUDE_IM_IME_TRUE=
INCLUDE_IM_IME_FALSE='#'
else
-@@ -26339,9 +30371,7 @@
+@@ -26339,9 +30382,7 @@
INCLUDE_IM_IME_FALSE=
fi
@@ -44425,7 +44216,7 @@
INCLUDE_IM_INUKTITUT_TRUE=
INCLUDE_IM_INUKTITUT_FALSE='#'
else
-@@ -26349,9 +30379,7 @@
+@@ -26349,9 +30390,7 @@
INCLUDE_IM_INUKTITUT_FALSE=
fi
@@ -44436,7 +44227,7 @@
INCLUDE_IM_IPA_TRUE=
INCLUDE_IM_IPA_FALSE='#'
else
-@@ -26359,9 +30387,7 @@
+@@ -26359,9 +30398,7 @@
INCLUDE_IM_IPA_FALSE=
fi
@@ -44447,7 +44238,7 @@
INCLUDE_IM_MULTIPRESS_TRUE=
INCLUDE_IM_MULTIPRESS_FALSE='#'
else
-@@ -26369,9 +30395,7 @@
+@@ -26369,9 +30406,7 @@
INCLUDE_IM_MULTIPRESS_FALSE=
fi
@@ -44458,7 +44249,7 @@
INCLUDE_IM_THAI_TRUE=
INCLUDE_IM_THAI_FALSE='#'
else
-@@ -26379,9 +30403,7 @@
+@@ -26379,9 +30414,7 @@
INCLUDE_IM_THAI_FALSE=
fi
@@ -44469,7 +44260,7 @@
INCLUDE_IM_TI_ER_TRUE=
INCLUDE_IM_TI_ER_FALSE='#'
else
-@@ -26389,9 +30411,7 @@
+@@ -26389,9 +30422,7 @@
INCLUDE_IM_TI_ER_FALSE=
fi
@@ -44480,7 +44271,7 @@
INCLUDE_IM_TI_ET_TRUE=
INCLUDE_IM_TI_ET_FALSE='#'
else
-@@ -26399,9 +30419,7 @@
+@@ -26399,9 +30430,7 @@
INCLUDE_IM_TI_ET_FALSE=
fi
@@ -44491,7 +44282,7 @@
INCLUDE_IM_VIQR_TRUE=
INCLUDE_IM_VIQR_FALSE='#'
else
-@@ -26409,9 +30427,7 @@
+@@ -26409,9 +30438,7 @@
INCLUDE_IM_VIQR_FALSE=
fi
@@ -44502,7 +44293,7 @@
INCLUDE_IM_XIM_TRUE=
INCLUDE_IM_XIM_FALSE='#'
else
-@@ -26548,9 +30564,7 @@
+@@ -26548,9 +30575,7 @@
@@ -44513,7 +44304,7 @@
HAVE_TIFF_TRUE=
HAVE_TIFF_FALSE='#'
else
-@@ -26558,9 +30572,7 @@
+@@ -26558,9 +30583,7 @@
HAVE_TIFF_FALSE=
fi
@@ -44524,7 +44315,7 @@
HAVE_PNG_TRUE=
HAVE_PNG_FALSE='#'
else
-@@ -26568,9 +30580,7 @@
+@@ -26568,9 +30591,7 @@
HAVE_PNG_FALSE=
fi
@@ -44535,7 +44326,7 @@
HAVE_JPEG_TRUE=
HAVE_JPEG_FALSE='#'
else
-@@ -26578,9 +30588,7 @@
+@@ -26578,9 +30599,7 @@
HAVE_JPEG_FALSE=
fi
@@ -44546,7 +44337,7 @@
HAVE_JASPER_TRUE=
HAVE_JASPER_FALSE='#'
else
-@@ -27060,9 +31068,7 @@
+@@ -27060,9 +31079,7 @@
fi
fi
@@ -44557,7 +44348,7 @@
USE_MEDIALIB_TRUE=
USE_MEDIALIB_FALSE='#'
else
-@@ -27070,9 +31076,7 @@
+@@ -27070,9 +31087,7 @@
USE_MEDIALIB_FALSE=
fi
@@ -44568,7 +44359,7 @@
USE_MEDIALIB25_TRUE=
USE_MEDIALIB25_FALSE='#'
else
-@@ -27132,9 +31136,7 @@
+@@ -27132,9 +31147,7 @@
fi
fi
@@ -44579,7 +44370,7 @@
USE_MMX_TRUE=
USE_MMX_FALSE='#'
else
-@@ -27149,9 +31151,7 @@
+@@ -27149,9 +31162,7 @@
fi
@@ -44590,7 +44381,7 @@
CROSS_COMPILING_TRUE=
CROSS_COMPILING_FALSE='#'
else
-@@ -29314,9 +33314,7 @@
+@@ -29314,9 +33325,7 @@
_ACEOF
fi
@@ -44601,7 +44392,7 @@
HAVE_X11R6_TRUE=
HAVE_X11R6_FALSE='#'
else
-@@ -30567,9 +34565,7 @@
+@@ -30567,9 +34576,7 @@
fi
@@ -44612,7 +44403,7 @@
XINPUT_XFREE_TRUE=
XINPUT_XFREE_FALSE='#'
else
-@@ -30649,9 +34645,7 @@
+@@ -30649,9 +34656,7 @@
CPPFLAGS="$gtk_save_cppflags"
LIBS="$gtk_save_libs"
@@ -44623,7 +44414,7 @@
USE_X11_TRUE=
USE_X11_FALSE='#'
else
-@@ -30660,9 +34654,7 @@
+@@ -30660,9 +34665,7 @@
fi
else
@@ -44634,7 +44425,7 @@
XINPUT_XFREE_TRUE=
XINPUT_XFREE_FALSE='#'
else
-@@ -30670,9 +34662,7 @@
+@@ -30670,9 +34673,7 @@
XINPUT_XFREE_FALSE=
fi
@@ -44645,7 +44436,7 @@
USE_X11_TRUE=
USE_X11_FALSE='#'
else
-@@ -30680,9 +34670,7 @@
+@@ -30680,9 +34681,7 @@
USE_X11_FALSE=
fi
@@ -44656,7 +44447,7 @@
HAVE_X11R6_TRUE=
HAVE_X11R6_FALSE='#'
else
-@@ -30694,9 +34682,7 @@
+@@ -30694,9 +34693,7 @@
if test "x$gdktarget" = "xwin32"; then
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
@@ -44667,7 +44458,7 @@
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
else
-@@ -30705,9 +34691,7 @@
+@@ -30705,9 +34702,7 @@
fi
else
@@ -44678,7 +44469,7 @@
USE_WIN32_TRUE=
USE_WIN32_FALSE='#'
else
-@@ -30719,9 +34703,7 @@
+@@ -30719,9 +34714,7 @@
if test "x$gdktarget" = "xquartz"; then
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
@@ -44689,7 +44480,7 @@
USE_QUARTZ_TRUE=
USE_QUARTZ_FALSE='#'
else
-@@ -30730,9 +34712,7 @@
+@@ -30730,9 +34723,7 @@
fi
else
@@ -44700,7 +44491,7 @@
USE_QUARTZ_TRUE=
USE_QUARTZ_FALSE='#'
else
-@@ -30775,9 +34755,7 @@
+@@ -30775,9 +34766,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -44711,7 +44502,7 @@
USE_DIRECTFB_TRUE=
USE_DIRECTFB_FALSE='#'
else
-@@ -30786,9 +34764,7 @@
+@@ -30786,9 +34775,7 @@
fi
else
@@ -44722,7 +44513,48 @@
USE_DIRECTFB_TRUE=
USE_DIRECTFB_FALSE='#'
else
-@@ -31668,9 +35644,7 @@
+@@ -30902,18 +34889,19 @@
+
+ GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
+ if test "x$gdktarget" = "xx11"; then
+- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES cairo-xlib"
++ GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-xlib"
+ fi
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+
+ #
+ # If we aren't writing explicit dependencies, then don't put the extra libraries we need
+ # into the pkg-config files
+ #
+ if test $enable_explicit_deps != yes ; then
+- GDK_PACKAGES="$PANGO_PACKAGES"
+ GDK_EXTRA_LIBS=
++else
++ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
+ fi
+
+
+@@ -30923,6 +34911,7 @@
+
+
+
++
+ ########################################
+ # Check for Accessibility Toolkit flags
+ ########################################
+@@ -31035,7 +35024,7 @@
+ CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
+
+ if test $enable_explicit_deps != yes ; then
+- GDK_PIXBUF_EXTRA_LIBS=
++ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB"
+ fi
+
+
+@@ -31668,9 +35657,7 @@
fi
@@ -44733,7 +44565,7 @@
HAVE_CUPS_TRUE=
HAVE_CUPS_FALSE='#'
else
-@@ -31837,9 +35811,7 @@
+@@ -31837,9 +35824,7 @@
LIBS="$gtk_save_libs"
else
@@ -44744,7 +44576,7 @@
HAVE_CUPS_TRUE=
HAVE_CUPS_FALSE='#'
else
-@@ -32156,9 +36128,7 @@
+@@ -32156,9 +36141,7 @@
enable_test_print_backend=no
fi
@@ -44755,7 +44587,7 @@
TEST_PRINT_BACKEND_TRUE=
TEST_PRINT_BACKEND_FALSE='#'
else
-@@ -32281,9 +36251,7 @@
+@@ -32281,9 +36264,7 @@
done
@@ -44766,7 +44598,7 @@
ENABLE_GTK_DOC_TRUE=
ENABLE_GTK_DOC_FALSE='#'
else
-@@ -32291,9 +36259,7 @@
+@@ -32291,9 +36272,7 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -44777,7 +44609,7 @@
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
else
-@@ -32341,9 +36307,7 @@
+@@ -32341,9 +36320,7 @@
fi
@@ -44788,7 +44620,7 @@
HAVE_DOCBOOK_TRUE=
HAVE_DOCBOOK_FALSE='#'
else
-@@ -32517,9 +36481,7 @@
+@@ -32517,9 +36494,7 @@
fi
@@ -44799,7 +44631,21 @@
ENABLE_MAN_TRUE=
ENABLE_MAN_FALSE='#'
else
-@@ -32671,10 +36633,10 @@
+@@ -32650,6 +36625,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
++if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"ENABLE_STATIC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++ { (exit 1); exit 1; }; }
++fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -32671,10 +36653,10 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -44813,7 +44659,7 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -32720,6 +36682,13 @@
+@@ -32720,6 +36702,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -44827,7 +44673,7 @@
if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -33536,6 +37505,7 @@
+@@ -33536,6 +37525,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
@@ -44835,7 +44681,7 @@
AWK='$AWK'
test -n "\$AWK" || AWK=awk
_ACEOF
-@@ -33640,359 +37610,6 @@
+@@ -33640,359 +37630,6 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -45195,7 +45041,7 @@
if test "x$gdktarget" = "xx11" ; then
gdk_windowing='
-@@ -34036,7 +37653,6 @@
+@@ -34036,7 +37673,6 @@
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
@@ -45203,7 +45049,7 @@
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
"gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;;
-@@ -34605,6 +38221,11 @@
+@@ -34605,6 +38241,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -45215,7 +45061,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-@@ -34661,6 +38282,7 @@
+@@ -34661,6 +38302,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
@@ -45223,7 +45069,7 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-@@ -34715,21 +38337,22 @@
+@@ -34715,21 +38357,22 @@
{ (exit 1); exit 1; }; }
fi
# Compute "$ac_file"'s index in $config_headers.
@@ -45253,7 +45099,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -34764,8 +38387,9 @@
+@@ -34764,8 +38407,9 @@
# 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.
@@ -45265,7 +45111,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -34792,27 +38416,21 @@
+@@ -34792,27 +38436,21 @@
else
continue
fi
@@ -45306,7 +45152,7 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
-@@ -34885,814 +38503,6 @@
+@@ -34885,814 +38523,6 @@
done
done
;;
@@ -46121,9 +45967,10 @@
"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
-diff -urN a/contrib/gdk-pixbuf-xlib/Makefile.in b/contrib/gdk-pixbuf-xlib/Makefile.in
---- a/contrib/gdk-pixbuf-xlib/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/contrib/gdk-pixbuf-xlib/Makefile.in 2009-03-02 19:32:58.000000000 -0300
+Index: gtk+2.0-2.15.5/contrib/gdk-pixbuf-xlib/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/contrib/gdk-pixbuf-xlib/Makefile.in 2009-03-03 01:12:41.000000000 -0300
@@ -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.
@@ -46272,7 +46119,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +179,6 @@
+@@ -119,6 +161,7 @@
+ 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@
+@@ -137,8 +180,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -46281,7 +46136,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +189,20 @@
+@@ -149,98 +190,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -46381,7 +46236,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +213,20 @@
+@@ -251,32 +214,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -46415,7 +46270,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +237,6 @@
+@@ -287,8 +238,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -46424,7 +46279,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +248,10 @@
+@@ -300,28 +249,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -46453,7 +46308,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +260,25 @@
+@@ -330,22 +261,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -46484,7 +46339,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +300,8 @@
+@@ -367,8 +301,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -46494,7 +46349,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +310,12 @@
+@@ -377,9 +311,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -46508,7 +46363,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,29 +346,23 @@
+@@ -410,29 +347,23 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -46538,7 +46393,7 @@
libgdk_pixbuf_xlib_2_0_la_SOURCES = \
gdk-pixbuf-xlib-private.h \
gdk-pixbuf-xlib.c \
-@@ -440,99 +370,80 @@
+@@ -440,99 +371,80 @@
gdk-pixbuf-xlib-drawable.c \
gdk-pixbuf-xlibrgb.c
@@ -46676,7 +46531,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -543,100 +454,75 @@
+@@ -543,100 +455,75 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo at am__quote@
.c.o:
@@ -46806,7 +46661,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -646,23 +532,23 @@
+@@ -646,23 +533,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -46839,7 +46694,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -674,29 +560,23 @@
+@@ -674,29 +561,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46882,7 +46737,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -711,9 +591,10 @@
+@@ -711,9 +592,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
@@ -46895,7 +46750,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -733,7 +614,7 @@
+@@ -733,7 +615,7 @@
clean-generic:
distclean-generic:
@@ -46904,7 +46759,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -747,12 +628,14 @@
+@@ -747,12 +629,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -46920,7 +46775,7 @@
info: info-am
info-am:
-@@ -760,12 +643,20 @@
+@@ -760,12 +644,20 @@
install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \
install-pkgconfigDATA
@@ -46941,7 +46796,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -786,23 +677,27 @@
+@@ -786,23 +678,27 @@
ps-am:
@@ -46981,9 +46836,10 @@
uninstall-libgdk_pixbuf_xlibincludeHEADERS \
uninstall-pkgconfigDATA
-diff -urN a/contrib/Makefile.in b/contrib/Makefile.in
---- a/contrib/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/contrib/Makefile.in 2009-03-02 19:32:58.000000000 -0300
+Index: gtk+2.0-2.15.5/contrib/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/contrib/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/contrib/Makefile.in 2009-03-03 01:12:41.000000000 -0300
@@ -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.
@@ -47102,7 +46958,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -138,8 +147,6 @@
+@@ -120,6 +129,7 @@
+ 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 +148,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -47111,7 +46975,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,98 +157,20 @@
+@@ -150,98 +158,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -47211,7 +47075,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -252,32 +181,20 @@
+@@ -252,32 +182,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -47245,7 +47109,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -288,8 +205,6 @@
+@@ -288,8 +206,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -47254,7 +47118,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +216,10 @@
+@@ -301,28 +217,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -47283,7 +47147,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +228,25 @@
+@@ -331,22 +229,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -47314,7 +47178,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -368,8 +268,8 @@
+@@ -368,8 +269,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -47324,7 +47188,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,9 +278,12 @@
+@@ -378,9 +279,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -47338,7 +47202,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -411,31 +314,39 @@
+@@ -411,31 +315,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -47397,7 +47261,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -443,10 +354,6 @@
+@@ -443,10 +355,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -47408,7 +47272,7 @@
# 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,
-@@ -454,7 +361,13 @@
+@@ -454,7 +362,13 @@
# (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):
@@ -47423,7 +47287,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -466,15 +379,20 @@
+@@ -466,15 +380,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47448,7 +47312,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -495,7 +413,7 @@
+@@ -495,7 +414,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47457,7 +47321,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -506,35 +424,30 @@
+@@ -506,35 +425,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -47500,7 +47364,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -542,23 +455,23 @@
+@@ -542,23 +456,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -47533,7 +47397,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -570,29 +483,23 @@
+@@ -570,29 +484,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -47576,7 +47440,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -605,13 +512,17 @@
+@@ -605,13 +513,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -47598,7 +47462,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -622,7 +533,6 @@
+@@ -622,7 +534,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -47606,7 +47470,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -642,7 +552,7 @@
+@@ -642,7 +553,7 @@
clean-generic:
distclean-generic:
@@ -47615,7 +47479,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -653,25 +563,34 @@
+@@ -653,25 +564,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -47652,7 +47516,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -690,26 +609,24 @@
+@@ -690,26 +610,24 @@
ps-am:
@@ -47695,9 +47559,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in
---- a/demos/gtk-demo/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/demos/gtk-demo/Makefile.in 2009-03-02 19:32:58.000000000 -0300
+Index: gtk+2.0-2.15.5/demos/gtk-demo/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/demos/gtk-demo/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/demos/gtk-demo/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -47846,7 +47711,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +179,6 @@
+@@ -119,6 +161,7 @@
+ 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@
+@@ -137,8 +180,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -47855,7 +47728,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +189,20 @@
+@@ -149,98 +190,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -47955,7 +47828,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +213,20 @@
+@@ -251,32 +214,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -47989,7 +47862,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +237,6 @@
+@@ -287,8 +238,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -47998,7 +47871,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +248,10 @@
+@@ -300,28 +249,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -48027,7 +47900,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +260,25 @@
+@@ -330,22 +261,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -48058,7 +47931,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +300,8 @@
+@@ -367,8 +301,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -48068,7 +47941,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,17 +310,17 @@
+@@ -377,17 +311,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -48091,7 +47964,7 @@
TEST_PROGS =
### testing rules
-@@ -413,9 +346,7 @@
+@@ -413,9 +347,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -48101,7 +47974,7 @@
demos = \
appwindow.c \
assistant.c \
-@@ -449,7 +380,6 @@
+@@ -449,7 +381,6 @@
tree_store.c \
ui_manager.c
@@ -48109,7 +47982,7 @@
INCLUDES = \
-DDEMOCODEDIR="\"$(democodedir)\"" \
-I$(top_srcdir) \
-@@ -459,34 +389,26 @@
+@@ -459,34 +390,26 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -48144,7 +48017,7 @@
IMAGEFILES = alphatest.png \
apple-red.png \
background.jpg \
-@@ -502,95 +424,55 @@
+@@ -502,95 +425,55 @@
gnu-keys.png \
gtk-logo-rgb.gif
@@ -48271,7 +48144,7 @@
else :; fi; \
done
-@@ -598,8 +480,8 @@
+@@ -598,8 +481,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -48282,7 +48155,7 @@
done
clean-binPROGRAMS:
-@@ -610,10 +492,10 @@
+@@ -610,10 +493,10 @@
done
gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES)
@rm -f gtk-demo$(EXEEXT)
@@ -48295,7 +48168,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -652,82 +534,58 @@
+@@ -652,82 +535,58 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ui_manager.Po at am__quote@
.c.o:
@@ -48400,7 +48273,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -737,23 +595,23 @@
+@@ -737,23 +596,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -48433,7 +48306,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -765,29 +623,23 @@
+@@ -765,29 +624,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48476,7 +48349,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -803,9 +655,10 @@
+@@ -803,9 +656,10 @@
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(DATA)
@@ -48489,7 +48362,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
-@@ -826,7 +679,7 @@
+@@ -826,7 +680,7 @@
clean-generic:
distclean-generic:
@@ -48498,7 +48371,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -841,24 +694,34 @@
+@@ -841,24 +695,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -48534,7 +48407,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -879,21 +742,24 @@
+@@ -879,21 +743,24 @@
ps-am:
@@ -48570,9 +48443,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/demos/Makefile.in b/demos/Makefile.in
---- a/demos/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/demos/Makefile.in 2009-03-02 19:32:58.000000000 -0300
+Index: gtk+2.0-2.15.5/demos/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/demos/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/demos/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -48728,7 +48602,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -138,8 +186,6 @@
+@@ -120,6 +168,7 @@
+ 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 +187,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -48737,7 +48619,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,98 +196,20 @@
+@@ -150,98 +197,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -48837,7 +48719,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -252,32 +220,20 @@
+@@ -252,32 +221,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -48871,7 +48753,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -288,8 +244,6 @@
+@@ -288,8 +245,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -48880,7 +48762,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +255,10 @@
+@@ -301,28 +256,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -48909,7 +48791,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +267,25 @@
+@@ -331,22 +268,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -48940,7 +48822,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -368,8 +307,8 @@
+@@ -368,8 +308,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -48950,7 +48832,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,24 +317,19 @@
+@@ -378,24 +318,19 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -48982,7 +48864,7 @@
TEST_PROGS =
### testing rules
-@@ -421,9 +355,7 @@
+@@ -421,9 +356,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -48992,7 +48874,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -432,131 +364,74 @@
+@@ -432,131 +365,74 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -49153,7 +49035,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -566,25 +441,25 @@
+@@ -566,25 +442,25 @@
done
pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES)
@rm -f pixbuf-demo$(EXEEXT)
@@ -49186,7 +49068,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -598,37 +473,25 @@
+@@ -598,37 +474,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testpixbuf.Po at am__quote@
.c.o:
@@ -49236,7 +49118,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -636,10 +499,6 @@
+@@ -636,10 +500,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -49247,7 +49129,7 @@
# 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,
-@@ -647,7 +506,13 @@
+@@ -647,7 +507,13 @@
# (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):
@@ -49262,7 +49144,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -659,15 +524,20 @@
+@@ -659,15 +525,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49287,7 +49169,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -688,7 +558,7 @@
+@@ -688,7 +559,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49296,7 +49178,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -699,35 +569,30 @@
+@@ -699,35 +570,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -49339,7 +49221,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -735,23 +600,23 @@
+@@ -735,23 +601,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -49372,7 +49254,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -763,29 +628,23 @@
+@@ -763,29 +629,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -49415,7 +49297,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -796,15 +655,19 @@
+@@ -796,15 +656,19 @@
|| exit 1; \
fi; \
done
@@ -49440,7 +49322,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -816,7 +679,6 @@
+@@ -816,7 +680,6 @@
all-am: Makefile $(PROGRAMS)
installdirs: installdirs-recursive
installdirs-am:
@@ -49448,7 +49330,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -837,7 +699,7 @@
+@@ -837,7 +700,7 @@
clean-generic:
distclean-generic:
@@ -49457,7 +49339,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -853,24 +715,34 @@
+@@ -853,24 +716,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -49493,7 +49375,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -891,27 +763,25 @@
+@@ -891,27 +764,25 @@
ps-am:
@@ -49538,9 +49420,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/depcomp b/depcomp
---- a/depcomp 2009-02-24 00:53:12.000000000 -0300
-+++ b/depcomp 2009-03-02 19:33:06.000000000 -0300
+Index: gtk+2.0-2.15.5/depcomp
+===================================================================
+--- gtk+2.0-2.15.5.orig/depcomp 2009-02-24 00:53:12.000000000 -0300
++++ gtk+2.0-2.15.5/depcomp 2009-03-03 01:12:42.000000000 -0300
@@ -1,7 +1,10 @@
#! /bin/sh
-
@@ -49820,9 +49703,10 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urN a/docs/faq/Makefile.in b/docs/faq/Makefile.in
---- a/docs/faq/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/docs/faq/Makefile.in 2009-03-02 19:32:59.000000000 -0300
+Index: gtk+2.0-2.15.5/docs/faq/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/faq/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/docs/faq/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -49928,7 +49812,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +134,6 @@
+@@ -119,6 +116,7 @@
+ 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@
+@@ -137,8 +135,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -49937,7 +49829,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +144,20 @@
+@@ -149,98 +145,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -50037,7 +49929,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +168,20 @@
+@@ -251,32 +169,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -50071,7 +49963,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +192,6 @@
+@@ -287,8 +193,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -50080,7 +49972,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +203,10 @@
+@@ -300,28 +204,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -50109,7 +50001,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +215,25 @@
+@@ -330,22 +216,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -50140,7 +50032,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +255,8 @@
+@@ -367,8 +256,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -50150,7 +50042,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,16 +265,17 @@
+@@ -377,16 +266,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -50172,7 +50064,7 @@
TEST_PROGS =
### testing rules
-@@ -412,61 +301,67 @@
+@@ -412,61 +302,67 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -50274,7 +50166,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -484,7 +379,6 @@
+@@ -484,7 +380,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile
@@ -50282,7 +50174,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -505,7 +399,7 @@
+@@ -505,7 +400,7 @@
clean-generic:
distclean-generic:
@@ -50291,7 +50183,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -516,7 +410,7 @@
+@@ -516,7 +411,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -50300,7 +50192,7 @@
dvi: dvi-am
-@@ -528,12 +422,20 @@
+@@ -528,12 +423,20 @@
install-data-am:
@@ -50321,7 +50213,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -544,25 +446,27 @@
+@@ -544,25 +447,27 @@
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
@@ -50360,9 +50252,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/docs/Makefile.in b/docs/Makefile.in
---- a/docs/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/docs/Makefile.in 2009-03-02 19:32:59.000000000 -0300
+Index: gtk+2.0-2.15.5/docs/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/docs/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -50480,7 +50373,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +146,6 @@
+@@ -119,6 +128,7 @@
+ 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@
+@@ -137,8 +147,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -50489,7 +50390,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +156,20 @@
+@@ -149,98 +157,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -50589,7 +50490,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +180,20 @@
+@@ -251,32 +181,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -50623,7 +50524,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +204,6 @@
+@@ -287,8 +205,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -50632,7 +50533,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +215,10 @@
+@@ -300,28 +216,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -50661,7 +50562,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +227,25 @@
+@@ -330,22 +228,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -50692,7 +50593,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +267,8 @@
+@@ -367,8 +268,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -50702,7 +50603,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,30 +277,21 @@
+@@ -377,30 +278,21 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -50742,7 +50643,7 @@
TEST_PROGS =
### testing rules
-@@ -426,31 +317,39 @@
+@@ -426,31 +318,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -50801,7 +50702,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -458,10 +357,6 @@
+@@ -458,10 +358,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -50812,7 +50713,7 @@
# 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,
-@@ -469,7 +364,13 @@
+@@ -469,7 +365,13 @@
# (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):
@@ -50827,7 +50728,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -481,15 +382,20 @@
+@@ -481,15 +383,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50852,7 +50753,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -510,7 +416,7 @@
+@@ -510,7 +417,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50861,7 +50762,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -521,35 +427,30 @@
+@@ -521,35 +428,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -50904,7 +50805,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -557,23 +458,23 @@
+@@ -557,23 +459,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -50937,7 +50838,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -585,29 +486,23 @@
+@@ -585,29 +487,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50980,7 +50881,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -618,15 +513,19 @@
+@@ -618,15 +514,19 @@
|| exit 1; \
fi; \
done
@@ -51005,7 +50906,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -637,7 +536,6 @@
+@@ -637,7 +537,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -51013,7 +50914,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -657,7 +555,7 @@
+@@ -657,7 +556,7 @@
clean-generic:
distclean-generic:
@@ -51022,7 +50923,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -668,25 +566,34 @@
+@@ -668,25 +567,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -51059,7 +50960,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -705,26 +612,24 @@
+@@ -705,26 +613,24 @@
ps-am:
@@ -51102,9 +51003,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/docs/reference/gdk/Makefile.in b/docs/reference/gdk/Makefile.in
---- a/docs/reference/gdk/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/docs/reference/gdk/Makefile.in 2009-03-02 19:32:59.000000000 -0300
+Index: gtk+2.0-2.15.5/docs/reference/gdk/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/reference/gdk/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/docs/reference/gdk/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -51211,6 +51113,1963 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
+@@ -125,6 +123,7 @@
+ 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@
+@@ -143,8 +142,6 @@
+ 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@
+@@ -155,98 +152,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -257,32 +176,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -293,8 +200,6 @@
+ 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@
+@@ -306,28 +211,10 @@
+ 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@
+@@ -336,22 +223,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -373,8 +263,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -383,22 +273,19 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+-
+ # Other files to distribute
+-EXTRA_DIST = \
+- $(content_files) \
+- $(HTML_IMAGES) \
+- $(DOC_MAIN_SGML_FILE) \
+- $(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
+@@ -424,7 +311,6 @@
+ || { 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.
+@@ -474,7 +360,6 @@
+ $(GTK_DEBUG_FLAGS) \
+ $(GDK_DEP_CFLAGS)
+
+-
+ GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
+
+ # Extra options to supply to gtkdoc-mkdb
+@@ -576,7 +461,6 @@
+ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@@ -589,13 +473,10 @@
+ # 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 \
+@@ -603,31 +484,45 @@
+ $(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/gdk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = version.xml
+-DIST_SOURCES =
+-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)/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/gdk/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docs/reference/gdk/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-version.xml: $(top_builddir)/config.status version.xml.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
++version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ mostlyclean-libtool:
+@@ -635,39 +530,29 @@
+
+ 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)/../../.. $(distdir)/images
+- @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; \
+@@ -685,7 +570,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile all-local
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -707,7 +591,7 @@
+ -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"
+@@ -718,25 +602,34 @@
+
+ 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
+@@ -756,18 +649,23 @@
+
+ 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.0-2.15.5/docs/reference/gdk-pixbuf/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/reference/gdk-pixbuf/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/docs/reference/gdk-pixbuf/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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.
+@@ -21,17 +21,11 @@
+ ####################################
+ # Everything below here is generic #
+ ####################################
+-
+-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
+@@ -43,10 +37,28 @@
+ 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)/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 \
++ $(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 = version.xml
++SOURCES =
++DIST_SOURCES =
++man1dir = $(mandir)/man1
++am__installdirs = "$(DESTDIR)$(man1dir)"
++NROFF = nroff
++MANS = $(man_MANS)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -57,22 +69,17 @@
+ 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@
+@@ -87,21 +94,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -125,6 +127,7 @@
+ 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@
+@@ -143,8 +146,6 @@
+ 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@
+@@ -155,98 +156,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -257,32 +180,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -293,8 +204,6 @@
+ 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@
+@@ -306,28 +215,10 @@
+ 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@
+@@ -336,22 +227,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -373,8 +267,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -383,28 +277,20 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+-
+ # Other files to distribute
+-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
+-
++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
+@@ -430,7 +316,6 @@
+ || { 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.
+@@ -462,7 +347,6 @@
+ xpm-color-table.h \
+ test-images.h
+
+-
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+@@ -470,7 +354,6 @@
+ $(GTK_DEBUG_FLAGS) \
+ $(GTK_DEP_CFLAGS)
+
+-
+ GTKDOC_LIBS = \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+@@ -500,7 +383,6 @@
+ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@@ -513,13 +395,10 @@
+ # 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 \
+@@ -527,40 +406,49 @@
+ $(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)
+
+-
+ ########################################################################
+ man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
+-
+ BUILT_EXTRA_DIST = $(man_MANS)
+-subdir = docs/reference/gdk-pixbuf
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = version.xml
+-DIST_SOURCES =
+-
+-NROFF = nroff
+-MANS = $(man_MANS)
+-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)/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/gdk-pixbuf/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docs/reference/gdk-pixbuf/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-version.xml: $(top_builddir)/config.status version.xml.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
++version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ mostlyclean-libtool:
+@@ -568,15 +456,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+-man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(man1dir)
++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -595,8 +477,8 @@
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+ uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+@@ -616,8 +498,8 @@
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+- rm -f $(DESTDIR)$(man1dir)/$$inst; \
++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+ tags: TAGS
+ TAGS:
+@@ -625,29 +507,23 @@
+ 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; \
+@@ -665,9 +541,10 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(MANS) all-local
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(man1dir)
++ for dir in "$(DESTDIR)$(man1dir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -688,7 +565,7 @@
+ -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"
+@@ -699,25 +576,34 @@
+
+ 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-man
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man: install-man1
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -737,21 +623,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-local uninstall-man
++uninstall-am: uninstall-local uninstall-man
+
+ uninstall-man: uninstall-man1
+
++.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-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 \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ 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 \
+- uninstall-info-am uninstall-local uninstall-man uninstall-man1
++ uninstall-local uninstall-man uninstall-man1
+
+ # call as: $(XVFB_START) && someprogram
+
+Index: gtk+2.0-2.15.5/docs/reference/gtk/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/reference/gtk/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/docs/reference/gtk/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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.
+@@ -21,17 +21,11 @@
+ ####################################
+ # Everything below here is generic #
+ ####################################
+-
+-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
+@@ -43,10 +37,28 @@
+ 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)/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 \
++ $(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 = version.xml
++SOURCES =
++DIST_SOURCES =
++man1dir = $(mandir)/man1
++am__installdirs = "$(DESTDIR)$(man1dir)"
++NROFF = nroff
++MANS = $(man_MANS)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -57,25 +69,17 @@
+ 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@ \
+- -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@
+@@ -90,21 +94,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -128,6 +127,7 @@
+ 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@
+@@ -146,8 +146,6 @@
+ 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@
+@@ -158,98 +156,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -260,32 +180,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -296,8 +204,6 @@
+ 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@
+@@ -309,28 +215,10 @@
+ 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@
+@@ -339,22 +227,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -376,8 +267,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -386,22 +277,19 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+-
+ # Other files to distribute
+-EXTRA_DIST = \
+- $(content_files) \
+- $(HTML_IMAGES) \
+- $(DOC_MAIN_SGML_FILE) \
+- $(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
+@@ -427,7 +315,6 @@
+ || { 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.
+@@ -533,7 +420,6 @@
+ $(GTK_DEBUG_FLAGS) \
+ $(GTK_DEP_CFLAGS)
+
+-
+ GTKDOC_LIBS = \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+@@ -580,7 +466,6 @@
+ gtk-builder-convert.xml \
+ visual_index.xml
+
+-
+ expand_content_files = \
+ drawing-model.xml \
+ glossary.xml \
+@@ -784,7 +669,6 @@
+ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@@ -797,13 +681,10 @@
+ # 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 \
+@@ -811,40 +692,49 @@
+ $(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)
+
+-
+ ########################################################################
+ man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+-
+ BUILT_EXTRA_DIST = $(man_MANS)
+-subdir = docs/reference/gtk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = version.xml
+-DIST_SOURCES =
+-
+-NROFF = nroff
+-MANS = $(man_MANS)
+-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)/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/gtk/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu docs/reference/gtk/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-version.xml: $(top_builddir)/config.status version.xml.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
++version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ mostlyclean-libtool:
+@@ -852,15 +742,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+-man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(man1dir)
++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -879,8 +763,8 @@
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+ uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+@@ -900,8 +784,8 @@
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+- rm -f $(DESTDIR)$(man1dir)/$$inst; \
++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+ tags: TAGS
+ TAGS:
+@@ -909,29 +793,23 @@
+ ctags: CTAGS
+ CTAGS:
+
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-
+-top_distdir = ../../..
+-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+- $(mkinstalldirs) $(distdir)/$(srcdir)/images $(distdir)/$(top_srcdir)/gtk/stock-icons/20 $(distdir)/$(top_srcdir)/gtk/stock-icons/24 $(distdir)/$(top_srcdir)/gtk/stock-icons/32 $(distdir)/$(top_srcdir)/gtk/stock-icons/48 $(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; \
+@@ -949,9 +827,10 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(MANS) all-local
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(man1dir)
++ for dir in "$(DESTDIR)$(man1dir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -972,7 +851,7 @@
+ -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"
+@@ -983,25 +862,34 @@
+
+ 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-man
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man: install-man1
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -1021,21 +909,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-local uninstall-man
++uninstall-am: uninstall-local uninstall-man
+
+ uninstall-man: uninstall-man1
+
++.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-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 \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ 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 \
+- uninstall-info-am uninstall-local uninstall-man uninstall-man1
++ uninstall-local uninstall-man uninstall-man1
+
+ # call as: $(XVFB_START) && someprogram
+
+Index: gtk+2.0-2.15.5/docs/reference/libgail-util/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/reference/libgail-util/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/docs/reference/libgail-util/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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.
+@@ -21,17 +21,11 @@
+ ####################################
+ # Everything below here is generic #
+ ####################################
+-
+-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
+@@ -43,10 +37,23 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++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
++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 =
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -57,22 +64,17 @@
+ 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@
+@@ -87,21 +89,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -125,6 +122,7 @@
+ 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@
@@ -143,8 +141,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
@@ -51433,7 +53292,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -383,22 +272,19 @@
+@@ -383,13 +272,14 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -51446,48 +53305,37 @@
+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
--
- # Other files to distribute
--EXTRA_DIST = \
-- $(content_files) \
-- $(HTML_IMAGES) \
-- $(DOC_MAIN_SGML_FILE) \
-- $(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
-@@ -424,7 +310,6 @@
+ EXTRA_DIST = \
+ $(content_files) \
+ $(HTML_IMAGES) \
+@@ -422,7 +312,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
-
- AUTOMAKE_OPTIONS = 1.6
+ AUTOMAKE_OPTIONS = 1.7
# The name of the module.
-@@ -474,7 +359,6 @@
- $(GTK_DEBUG_FLAGS) \
- $(GDK_DEP_CFLAGS)
-
--
- GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
-
- # Extra options to supply to gtkdoc-mkdb
-@@ -576,7 +460,6 @@
- --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-
+@@ -445,16 +334,13 @@
+ -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 at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -589,13 +472,10 @@
+@@ -467,13 +353,10 @@
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
@@ -51501,7 +53349,7 @@
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
-@@ -603,31 +483,45 @@
+@@ -481,69 +364,73 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
@@ -51513,14 +53361,14 @@
-
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
--subdir = docs/reference/gdk
+-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 = version.xml
+-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \
-- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in
+- $(top_srcdir)/gtk-doc.make Makefile.am
all: all-am
.SUFFIXES:
@@ -51534,12 +53382,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gdk/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libgail-util/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docs/reference/gdk/Makefile
+ $(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)
--version.xml: $(top_builddir)/config.status version.xml.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
@@ -51557,11 +53404,9 @@
+ 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
-+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -635,39 +529,29 @@
+ -rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
@@ -51581,7 +53426,7 @@
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
-- $(mkinstalldirs) $(distdir)/../../.. $(distdir)/images
+- $(mkinstalldirs) $(distdir)/../../..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -51614,7 +53459,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -685,7 +569,6 @@
+@@ -561,7 +448,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile all-local
@@ -51622,7 +53467,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -707,7 +590,7 @@
+@@ -583,7 +469,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -51631,7 +53476,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -718,25 +601,34 @@
+@@ -594,25 +480,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -51668,7 +53513,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -756,18 +648,23 @@
+@@ -632,18 +527,23 @@
ps-am:
@@ -51702,9 +53547,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/docs/reference/gdk-pixbuf/Makefile.in b/docs/reference/gdk-pixbuf/Makefile.in
---- a/docs/reference/gdk-pixbuf/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/docs/reference/gdk-pixbuf/Makefile.in 2009-03-02 19:32:59.000000000 -0300
+Index: gtk+2.0-2.15.5/docs/reference/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/reference/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/docs/reference/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -51717,10 +53563,10 @@
# 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.
-@@ -21,17 +21,11 @@
- ####################################
- # Everything below here is generic #
- ####################################
+@@ -15,17 +15,11 @@
+ @SET_MAKE@
+
+ # GTK+ - The GIMP Toolkit
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
@@ -51728,23 +53574,22 @@
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
-@@ -43,10 +37,28 @@
+@@ -37,10 +31,35 @@
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)/Makefile.decl \
-+ $(top_srcdir)/gtk-doc.make
-+subdir = docs/reference/gdk-pixbuf
++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
@@ -51752,13 +53597,21 @@
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES = version.xml
++CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)"
-+NROFF = nroff
-+MANS = $(man_MANS)
++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@
@@ -51766,7 +53619,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -57,22 +69,17 @@
+@@ -51,22 +70,17 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -51790,7 +53643,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -87,21 +94,16 @@
+@@ -81,21 +95,16 @@
DB2HTML = @DB2HTML@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -51815,7 +53668,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -143,8 +145,6 @@
+@@ -119,6 +128,7 @@
+ 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@
+@@ -137,8 +147,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -51824,7 +53685,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -155,98 +155,20 @@
+@@ -149,98 +157,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -51924,7 +53785,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -257,32 +179,20 @@
+@@ -251,32 +181,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -51958,7 +53819,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -293,8 +203,6 @@
+@@ -287,8 +205,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -51967,7 +53828,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -306,28 +214,10 @@
+@@ -300,28 +216,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -51996,7 +53857,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -336,22 +226,25 @@
+@@ -330,22 +228,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -52027,7 +53888,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -373,8 +266,8 @@
+@@ -367,8 +268,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -52037,7 +53898,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -383,28 +276,20 @@
+@@ -377,9 +278,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -52051,1922 +53912,7 @@
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 = \
-- $(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
--
-+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
-@@ -430,7 +315,6 @@
- || { 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.
-@@ -462,7 +346,6 @@
- xpm-color-table.h \
- test-images.h
-
--
- INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
-@@ -470,7 +353,6 @@
- $(GTK_DEBUG_FLAGS) \
- $(GTK_DEP_CFLAGS)
-
--
- GTKDOC_LIBS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
-@@ -500,7 +382,6 @@
- --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
-
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -513,13 +394,10 @@
- # 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 \
-@@ -527,40 +405,49 @@
- $(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)
-
--
- ########################################################################
- man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1
--
- BUILT_EXTRA_DIST = $(man_MANS)
--subdir = docs/reference/gdk-pixbuf
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES = version.xml
--DIST_SOURCES =
--
--NROFF = nroff
--MANS = $(man_MANS)
--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)/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/gdk-pixbuf/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docs/reference/gdk-pixbuf/Makefile
--Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--version.xml: $(top_builddir)/config.status version.xml.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
-+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
- mostlyclean-libtool:
-@@ -568,15 +455,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
--
--man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -595,8 +476,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-@@ -616,8 +497,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-- rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
- tags: TAGS
- TAGS:
-@@ -625,29 +506,23 @@
- 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; \
-@@ -665,9 +540,10 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
- all-am: Makefile $(MANS) all-local
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-+ for dir in "$(DESTDIR)$(man1dir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -688,7 +564,7 @@
- -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"
-@@ -699,25 +575,34 @@
-
- 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-man
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -737,21 +622,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-local uninstall-man
-+uninstall-am: uninstall-local uninstall-man
-
- uninstall-man: uninstall-man1
-
-+.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-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 \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ 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 \
-- uninstall-info-am uninstall-local uninstall-man uninstall-man1
-+ uninstall-local uninstall-man uninstall-man1
-
- # call as: $(XVFB_START) && someprogram
-
-diff -urN a/docs/reference/gtk/Makefile.in b/docs/reference/gtk/Makefile.in
---- a/docs/reference/gtk/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/docs/reference/gtk/Makefile.in 2009-03-02 19:32:59.000000000 -0300
-@@ -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.
-@@ -21,17 +21,11 @@
- ####################################
- # Everything below here is generic #
- ####################################
--
--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
-@@ -43,10 +37,28 @@
- 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)/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 \
-+ $(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 = version.xml
-+SOURCES =
-+DIST_SOURCES =
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)"
-+NROFF = nroff
-+MANS = $(man_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-@@ -57,25 +69,17 @@
- 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@ \
-- -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@
-@@ -90,21 +94,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -146,8 +145,6 @@
- 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@
-@@ -158,98 +155,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -260,32 +179,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -296,8 +203,6 @@
- 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@
-@@ -309,28 +214,10 @@
- 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@
-@@ -339,22 +226,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -376,8 +266,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -386,22 +276,19 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
--
- # Other files to distribute
--EXTRA_DIST = \
-- $(content_files) \
-- $(HTML_IMAGES) \
-- $(DOC_MAIN_SGML_FILE) \
-- $(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
-@@ -427,7 +314,6 @@
- || { 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.
-@@ -533,7 +419,6 @@
- $(GTK_DEBUG_FLAGS) \
- $(GTK_DEP_CFLAGS)
-
--
- GTKDOC_LIBS = \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
- $(top_builddir)/gdk/$(gdktargetlib) \
-@@ -580,7 +465,6 @@
- gtk-builder-convert.xml \
- visual_index.xml
-
--
- expand_content_files = \
- drawing-model.xml \
- glossary.xml \
-@@ -784,7 +668,6 @@
- --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -797,13 +680,10 @@
- # 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 \
-@@ -811,40 +691,49 @@
- $(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)
-
--
- ########################################################################
- man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
--
- BUILT_EXTRA_DIST = $(man_MANS)
--subdir = docs/reference/gtk
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES = version.xml
--DIST_SOURCES =
--
--NROFF = nroff
--MANS = $(man_MANS)
--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)/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/gtk/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu docs/reference/gtk/Makefile
--Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--version.xml: $(top_builddir)/config.status version.xml.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
-+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
- mostlyclean-libtool:
-@@ -852,15 +741,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
--
--man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -879,8 +762,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-@@ -900,8 +783,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-- rm -f $(DESTDIR)$(man1dir)/$$inst; \
-+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
- tags: TAGS
- TAGS:
-@@ -909,29 +792,23 @@
- ctags: CTAGS
- CTAGS:
-
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
- distdir: $(DISTFILES)
-- $(mkinstalldirs) $(distdir)/$(srcdir)/images $(distdir)/$(top_srcdir)/gtk/stock-icons/20 $(distdir)/$(top_srcdir)/gtk/stock-icons/24 $(distdir)/$(top_srcdir)/gtk/stock-icons/32 $(distdir)/$(top_srcdir)/gtk/stock-icons/48 $(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; \
-@@ -949,9 +826,10 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
- all-am: Makefile $(MANS) all-local
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
-+ for dir in "$(DESTDIR)$(man1dir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -972,7 +850,7 @@
- -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"
-@@ -983,25 +861,34 @@
-
- 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-man
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man: install-man1
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -1021,21 +908,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-local uninstall-man
-+uninstall-am: uninstall-local uninstall-man
-
- uninstall-man: uninstall-man1
-
-+.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-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 \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ 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 \
-- uninstall-info-am uninstall-local uninstall-man uninstall-man1
-+ uninstall-local uninstall-man uninstall-man1
-
- # call as: $(XVFB_START) && someprogram
-
-diff -urN a/docs/reference/libgail-util/Makefile.in b/docs/reference/libgail-util/Makefile.in
---- a/docs/reference/libgail-util/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/docs/reference/libgail-util/Makefile.in 2009-03-02 19:32:59.000000000 -0300
-@@ -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.
-@@ -21,17 +21,11 @@
- ####################################
- # Everything below here is generic #
- ####################################
--
--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
-@@ -43,10 +37,23 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+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
-+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 =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-@@ -57,22 +64,17 @@
- 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@
-@@ -87,21 +89,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -143,8 +140,6 @@
- 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@
-@@ -155,98 +150,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -257,32 +174,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -293,8 +198,6 @@
- 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@
-@@ -306,28 +209,10 @@
- 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@
-@@ -336,22 +221,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -373,8 +261,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -383,13 +271,14 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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 = \
- $(content_files) \
- $(HTML_IMAGES) \
-@@ -422,7 +311,6 @@
- || { 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.
-@@ -445,16 +333,13 @@
- -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 at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
- @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@@ -467,13 +352,10 @@
- # 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 \
-@@ -481,69 +363,73 @@
- $(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; \
-@@ -561,7 +447,6 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
- all-am: Makefile all-local
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -583,7 +468,7 @@
- -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"
-@@ -594,25 +479,34 @@
-
- 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
-@@ -632,18 +526,23 @@
-
- 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
-
-diff -urN a/docs/reference/Makefile.in b/docs/reference/Makefile.in
---- a/docs/reference/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/docs/reference/Makefile.in 2009-03-02 19:32:59.000000000 -0300
-@@ -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 @@
- 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 @@
- 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,21 +95,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -137,8 +146,6 @@
- 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@
-@@ -149,98 +156,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -251,32 +180,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +204,6 @@
- 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@
-@@ -300,28 +215,10 @@
- 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@
-@@ -330,22 +227,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -367,8 +267,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -377,9 +277,12 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
-
-@@ -410,31 +313,39 @@
+@@ -410,31 +314,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -54025,7 +53971,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,10 +353,6 @@
+@@ -442,10 +354,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -54036,7 +53982,7 @@
# 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,
-@@ -453,7 +360,13 @@
+@@ -453,7 +361,13 @@
# (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):
@@ -54051,7 +53997,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -465,15 +378,20 @@
+@@ -465,15 +379,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54076,7 +54022,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -494,7 +412,7 @@
+@@ -494,7 +413,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54085,7 +54031,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -505,35 +423,30 @@
+@@ -505,35 +424,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -54128,7 +54074,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -541,23 +454,23 @@
+@@ -541,23 +455,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -54161,7 +54107,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -569,29 +482,23 @@
+@@ -569,29 +483,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54204,7 +54150,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,15 +509,19 @@
+@@ -602,15 +510,19 @@
|| exit 1; \
fi; \
done
@@ -54229,7 +54175,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -621,7 +532,6 @@
+@@ -621,7 +533,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -54237,7 +54183,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -641,7 +551,7 @@
+@@ -641,7 +552,7 @@
clean-generic:
distclean-generic:
@@ -54246,7 +54192,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,25 +562,34 @@
+@@ -652,25 +563,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -54283,7 +54229,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -689,26 +608,24 @@
+@@ -689,26 +609,24 @@
ps-am:
@@ -54326,9 +54272,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/docs/tools/Makefile.in b/docs/tools/Makefile.in
---- a/docs/tools/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/docs/tools/Makefile.in 2009-03-02 19:33:00.000000000 -0300
+Index: gtk+2.0-2.15.5/docs/tools/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/tools/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/docs/tools/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -54456,7 +54403,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +158,6 @@
+@@ -119,6 +140,7 @@
+ 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@
+@@ -137,8 +159,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -54465,7 +54420,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +168,20 @@
+@@ -149,98 +169,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -54565,7 +54520,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +192,20 @@
+@@ -251,32 +193,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -54599,7 +54554,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +216,6 @@
+@@ -287,8 +217,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -54608,7 +54563,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +227,10 @@
+@@ -300,28 +228,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -54637,7 +54592,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +239,25 @@
+@@ -330,22 +240,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -54668,7 +54623,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +279,8 @@
+@@ -367,8 +280,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -54678,7 +54633,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +289,12 @@
+@@ -377,9 +290,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -54692,7 +54647,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,7 +325,6 @@
+@@ -410,7 +326,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -54700,7 +54655,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -419,24 +333,17 @@
+@@ -419,24 +334,17 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -54725,7 +54680,7 @@
doc_shooter_DEPENDENCIES = $(DEPS)
doc_shooter_LDADD = $(LDADDS)
doc_shooter_SOURCES = \
-@@ -446,46 +353,39 @@
+@@ -446,46 +354,39 @@
widgets.c \
widgets.h
@@ -54799,7 +54754,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -495,10 +395,10 @@
+@@ -495,10 +396,10 @@
done
doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES)
@rm -f doc-shooter$(EXEEXT)
@@ -54812,7 +54767,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -508,37 +408,25 @@
+@@ -508,37 +409,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widgets.Po at am__quote@
.c.o:
@@ -54862,7 +54817,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -546,26 +434,15 @@
+@@ -546,26 +435,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -54892,7 +54847,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -575,23 +452,23 @@
+@@ -575,23 +453,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -54925,7 +54880,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -603,29 +480,23 @@
+@@ -603,29 +481,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54968,7 +54923,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -640,7 +511,6 @@
+@@ -640,7 +512,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -54976,7 +54931,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -661,7 +531,7 @@
+@@ -661,7 +532,7 @@
clean-generic:
distclean-generic:
@@ -54985,7 +54940,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -675,24 +545,34 @@
+@@ -675,24 +546,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -55021,7 +54976,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -713,19 +593,23 @@
+@@ -713,19 +594,23 @@
ps-am:
@@ -55054,9 +55009,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/docs/tutorial/Makefile.in b/docs/tutorial/Makefile.in
---- a/docs/tutorial/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/docs/tutorial/Makefile.in 2009-03-02 19:33:00.000000000 -0300
+Index: gtk+2.0-2.15.5/docs/tutorial/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/docs/tutorial/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/docs/tutorial/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -55162,7 +55118,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +134,6 @@
+@@ -119,6 +116,7 @@
+ 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@
+@@ -137,8 +135,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -55171,7 +55135,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +144,20 @@
+@@ -149,98 +145,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -55271,7 +55235,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +168,20 @@
+@@ -251,32 +169,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -55305,7 +55269,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +192,6 @@
+@@ -287,8 +193,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -55314,7 +55278,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +203,10 @@
+@@ -300,28 +204,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -55343,7 +55307,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +215,25 @@
+@@ -330,22 +216,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -55374,7 +55338,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +255,8 @@
+@@ -367,8 +256,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -55384,7 +55348,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,47 +265,28 @@
+@@ -377,47 +266,28 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -55447,7 +55411,7 @@
TEST_PROGS =
### testing rules
-@@ -443,61 +312,67 @@
+@@ -443,61 +313,67 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -55549,7 +55513,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -515,7 +390,6 @@
+@@ -515,7 +391,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile
@@ -55557,7 +55521,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -536,7 +410,7 @@
+@@ -536,7 +411,7 @@
clean-generic:
distclean-generic:
@@ -55566,7 +55530,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -547,7 +421,7 @@
+@@ -547,7 +422,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -55575,7 +55539,7 @@
dvi: dvi-am
-@@ -559,12 +433,20 @@
+@@ -559,12 +434,20 @@
install-data-am:
@@ -55596,7 +55560,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -575,25 +457,27 @@
+@@ -575,25 +458,27 @@
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
@@ -55635,9 +55599,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gdk/directfb/Makefile.in b/gdk/directfb/Makefile.in
---- a/gdk/directfb/Makefile.in 2009-03-02 16:04:19.000000000 -0300
-+++ b/gdk/directfb/Makefile.in 2009-03-02 19:33:01.000000000 -0300
+Index: gtk+2.0-2.15.5/gdk/directfb/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/directfb/Makefile.in 2009-03-02 16:04:19.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/directfb/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -55780,6 +55745,2129 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
+@@ -119,6 +155,7 @@
+ 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@
+@@ -137,8 +174,6 @@
+ 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@
+@@ -149,98 +184,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -251,32 +208,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -287,8 +232,6 @@
+ 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@
+@@ -300,28 +243,10 @@
+ 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@
+@@ -330,22 +255,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -367,8 +295,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -377,14 +305,17 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+@@ -410,9 +341,7 @@
+ || { 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 \
+@@ -423,13 +352,10 @@
+ @GTK_DEBUG_FLAGS@ \
+ @GDK_DEP_CFLAGS@
+
+-
+ LDADDS = \
+ @GDK_DEP_LIBS@
+
+-
+ noinst_LTLIBRARIES = libgdk-directfb.la
+-
+ libgdk_directfb_la_SOURCES = \
+ gdkapplaunchcontext-directfb.c \
+ gdkcolor-directfb.c \
+@@ -462,98 +388,57 @@
+ gdkwindowid.c \
+ x-cursors.xbm
+
+-
+ libgdkinclude_HEADERS = \
+ gdkdirectfb.h \
+ gdkprivate-directfb.h
+
+-subdir = gdk/directfb
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-
+-libgdk_directfb_la_LDFLAGS =
+-libgdk_directfb_la_LIBADD =
+-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
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkim-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-directfb.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowid.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 = $(libgdk_directfb_la_SOURCES)
+-HEADERS = $(libgdkinclude_HEADERS)
+-
+-DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \
+- $(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)/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/directfb/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu gdk/directfb/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
+ libgdk-directfb.la: $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_DEPENDENCIES)
+- $(LINK) $(libgdk_directfb_la_LDFLAGS) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS)
++ $(LINK) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -585,82 +470,58 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindowid.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at 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:
+-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 =
+-
+-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)
+@@ -670,23 +531,23 @@
+ 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
+@@ -698,29 +559,23 @@
+
+ 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; \
+@@ -735,9 +590,10 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ 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
+ install-data: install-data-am
+@@ -757,7 +613,7 @@
+ 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"
+@@ -771,24 +627,34 @@
+ -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
+@@ -809,19 +675,23 @@
+
+ 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.0-2.15.5/gdk/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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,13 @@
+
+ # 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,143 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \
++ $(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
++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)$(gdkincludedir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \
++ $(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 \
++ 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
++ at USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.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_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libgdk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
++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 \
++ 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 \
++ 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) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libgdk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
++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 \
++ 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) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libgdk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. at 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_directfb_2_0_la_SOURCES) \
++ $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) \
++ $(libgdk_x11_2_0_la_SOURCES)
++DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \
++ $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \
++ $(am__libgdk_win32_2_0_la_SOURCES_DIST) \
++ $(am__libgdk_x11_2_0_la_SOURCES_DIST)
++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)
++gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER)
++HEADERS = $(gdkinclude_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@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -51,22 +181,17 @@
+ 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,21 +206,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -119,6 +239,7 @@
+ 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@
+@@ -137,8 +258,6 @@
+ 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@
+@@ -149,98 +268,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -251,32 +292,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -287,8 +316,6 @@
+ 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@
+@@ -300,28 +327,10 @@
+ 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@
+@@ -330,22 +339,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -367,8 +379,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -377,32 +389,22 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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 = \
+- keynames.txt \
+- keyname-table.h \
+- gen-keyname-table.pl \
+- gdkconfig.h.win32 \
+- gdkkeysyms-update.pl \
+- gdk.def \
+- gdkmarshalers.list \
+- gdkmedialib.h \
+- gdkwindowimpl.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 gdkwindowimpl.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
+@@ -428,10 +430,8 @@
+ || { 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 \
+@@ -441,9 +441,7 @@
+ $(GTK_DEBUG_FLAGS) \
+ $(GDK_DEP_CFLAGS)
+
+-
+ gtarget = $(gdktarget)
+-
+ @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
+
+ # libtool stuff: set version and export symbols for resolving
+@@ -457,7 +455,6 @@
+ $(LIBTOOL_EXPORT_OPTIONS)
+
+ @USE_MEDIALIB_FALSE at medialib_sources =
+-
+ @USE_MEDIALIB_TRUE at medialib_sources = \
+ @USE_MEDIALIB_TRUE@ gdkmedialib.c
+
+@@ -501,15 +498,12 @@
+ gdkvisual.h \
+ gdkwindow.h
+
+-
+ gdk_built_public_sources = \
+ gdkenumtypes.h
+
+-
+ gdk_built_private_headers = \
+ gdkalias.h
+
+-
+ gdk_c_sources = \
+ $(medialib_sources) \
+ gdk.c \
+@@ -546,7 +540,6 @@
+ gdkwindow.c \
+ gdkwindowimpl.c
+
+-
+ gdk_built_sources = \
+ gdkaliasdef.c \
+ gdkenumtypes.c \
+@@ -556,7 +549,6 @@
+ $(gdk_built_private_headers)
+
+
+-
+ #
+ # setup GDK sources and their dependencies
+ #
+@@ -569,40 +561,31 @@
+ gdkenumtypes.c \
+ gdkmarshalers.h
+
+-
+ libgdk_directfb_2_0_la_SOURCES = $(common_sources)
+ libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+
+ libgdk_directfb_2_0_la_LDFLAGS = $(LDADD)
+-
+ libgdk_x11_2_0_la_SOURCES = $(common_sources)
+ libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+
+ libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
+-
+ libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+ libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+
+ libgdk_quartz_2_0_la_LDFLAGS = $(LDADD)
+-
+ libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
+ libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+
+ libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+ libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
+-
+ @MS_LIB_AVAILABLE_TRUE at noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
+-
+ @OS_LINUX_TRUE at TESTS = abicheck.sh pltcheck.sh
+-
+ lib_LTLIBRARIES = $(gdktargetlib)
+-
+ EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
+-
+ MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
+ EXTRA_HEADERS =
+
+@@ -616,183 +599,79 @@
+ $(gdk_built_sources) \
+ gdkconfig.h
+
+-
+ DISTCLEANFILES = gdkconfig.h stamp-gc-h
+-subdir = gdk
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-
+-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 \
+- 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
+- at USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo
+- at USE_MEDIALIB_FALSE@am__objects_1 =
+-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 \
+- 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)
+-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_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 \
+- 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)
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcairo.Plo ./$(DEPDIR)/gdkcolor.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplaymanager.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd.Plo ./$(DEPDIR)/gdkdraw.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkenumtypes.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents.Plo ./$(DEPDIR)/gdkfont.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc.Plo ./$(DEPDIR)/gdkglobals.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeynames.Plo ./$(DEPDIR)/gdkkeys.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeyuni.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmedialib.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpango.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-drawable.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-render.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpolyreg-generic.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkrectangle.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkregion-generic.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkrgb.Plo ./$(DEPDIR)/gdkscreen.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual.Plo ./$(DEPDIR)/gdkwindow.Plo \
+- at 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) \
+- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \
+- $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \
+- $(am__libgdk_win32_2_0_la_SOURCES_DIST) \
+- $(am__libgdk_x11_2_0_la_SOURCES_DIST)
+-DATA = $(noinst_DATA)
+-
+-HEADERS = $(gdkinclude_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 = $(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)
+ $(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/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu gdk/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
+ libgdk-directfb-2.0.la: $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_DEPENDENCIES)
+- $(LINK) $(libgdk_directfb_2_0_la_LDFLAGS) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS)
++ $(libgdk_directfb_2_0_la_LINK) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS)
+ libgdk-quartz-2.0.la: $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_DEPENDENCIES)
+- $(LINK) $(libgdk_quartz_2_0_la_LDFLAGS) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS)
++ $(libgdk_quartz_2_0_la_LINK) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS)
+ libgdk-win32-2.0.la: $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_DEPENDENCIES)
+- $(LINK) $(libgdk_win32_2_0_la_LDFLAGS) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS)
++ $(libgdk_win32_2_0_la_LINK) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS)
+ libgdk-x11-2.0.la: $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_DEPENDENCIES)
+- $(LINK) $(libgdk_x11_2_0_la_LDFLAGS) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS)
++ $(libgdk_x11_2_0_la_LINK) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -831,64 +710,47 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindowimpl.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at 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:
+-gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-gdkincludeHEADERS: $(gdkinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(gdkincludedir)
++ test -z "$(gdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gdkincludedir)"
+ @list='$(gdkinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f"; \
+- $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(gdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gdkincludedir)/$$f'"; \
++ $(gdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gdkincludedir)/$$f"; \
+ done
+
+ uninstall-gdkincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(gdkinclude_HEADERS)'; for p in $$list; do \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(gdkincludedir)/$$f"; \
+- rm -f $(DESTDIR)$(gdkincludedir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(gdkincludedir)/$$f'"; \
++ rm -f "$(DESTDIR)$(gdkincludedir)/$$f"; \
+ done
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -898,7 +760,13 @@
+ # (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 \
+@@ -910,15 +778,20 @@
+ 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)' ;; \
+@@ -939,7 +812,7 @@
+ 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 \
+@@ -950,35 +823,30 @@
+ 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; \
+@@ -986,23 +854,23 @@
+ 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
+@@ -1016,9 +884,9 @@
+ -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=./; \
+@@ -1027,25 +895,25 @@
+ 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 \
+@@ -1070,46 +938,40 @@
+ 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; \
+@@ -1122,13 +984,17 @@
+ done
+ 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; \
+@@ -1140,8 +1006,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gdkincludedir)
+-
++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gdkincludedir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+ install-exec: install-exec-recursive
+@@ -1162,14 +1029,14 @@
+ clean-generic:
+
+ distclean-generic:
+- -rm -f $(CONFIG_CLEAN_FILES)
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ 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-generic clean-libLTLIBRARIES clean-libtool \
+@@ -1179,26 +1046,36 @@
+ -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:
+
+ install-data-am: install-data-local install-gdkincludeHEADERS
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-exec-local install-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
++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
+@@ -1219,32 +1096,30 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-gdkincludeHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES uninstall-local
++uninstall-am: uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \
++ uninstall-local
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-exec-am install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
+- 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 \
+- install-am install-data install-data-am install-data-local \
+- install-data-recursive install-exec install-exec-am \
+- install-exec-local install-exec-recursive \
+- install-gdkincludeHEADERS install-info install-info-am \
+- install-info-recursive install-libLTLIBRARIES 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-gdkincludeHEADERS uninstall-info-am \
+- 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 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 \
++ install-dvi-am install-exec install-exec-am install-exec-hook \
++ install-exec-local install-gdkincludeHEADERS 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 \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
++ uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \
++ uninstall-local
+
+ # call as: $(XVFB_START) && someprogram
+
+Index: gtk+2.0-2.15.5/gdk/quartz/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/quartz/Makefile.in 2009-03-02 16:04:19.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/quartz/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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 @@
+ 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
++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)
++libgdk_quartz_la_LIBADD =
++am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.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 \
++ gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo
++libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS)
++DEFAULT_INCLUDES = -I. at 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_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)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -51,22 +96,17 @@
+ 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,21 +121,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -119,6 +154,7 @@
+ 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@
@@ -137,8 +173,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
@@ -56002,7 +58090,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,14 +304,17 @@
+@@ -377,9 +304,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -56016,12 +58104,6 @@
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
@@ -410,9 +340,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -56030,81 +58112,79 @@
libgdkincludedir = $(includedir)/gtk-2.0/gdk
-
INCLUDES = \
- -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
- -DGDK_COMPILATION \
-@@ -423,13 +351,10 @@
- @GTK_DEBUG_FLAGS@ \
- @GDK_DEP_CFLAGS@
-
--
- LDADDS = \
- @GDK_DEP_LIBS@
-
--
- noinst_LTLIBRARIES = libgdk-directfb.la
--
- libgdk_directfb_la_SOURCES = \
- gdkapplaunchcontext-directfb.c \
- gdkcolor-directfb.c \
-@@ -462,98 +387,57 @@
- gdkwindowid.c \
- x-cursors.xbm
+ -DG_LOG_DOMAIN=\"Gdk\" \
+ -DGDK_COMPILATION \
+@@ -423,11 +351,8 @@
+ $(GDK_DEP_CFLAGS) \
+ "-xobjective-c"
+
+-
+ LDADDS = $(GDK_DEP_LIBS)
+-
+ noinst_LTLIBRARIES = libgdk-quartz.la
+-
+ libgdk_quartz_la_SOURCES = \
+ GdkQuartzView.c \
+ GdkQuartzView.h \
+@@ -466,98 +391,56 @@
+ gdkwindow-quartz.h \
+ xcursors.h
-
libgdkinclude_HEADERS = \
- gdkdirectfb.h \
- gdkprivate-directfb.h
-
--subdir = gdk/directfb
+ gdkquartz.h
+
+-subdir = gdk/quartz
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-
--libgdk_directfb_la_LDFLAGS =
--libgdk_directfb_la_LIBADD =
--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)
+-libgdk_quartz_la_LDFLAGS =
+-libgdk_quartz_la_LIBADD =
+-am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.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 \
+- 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)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkim-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-directfb.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowid.Plo
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GdkQuartzView.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/GdkQuartzWindow.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkeventloop-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkim-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-quartz.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-quartz.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -56112,12 +58192,12 @@
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgdk_directfb_la_SOURCES)
+-DIST_SOURCES = $(libgdk_quartz_la_SOURCES)
-HEADERS = $(libgdkinclude_HEADERS)
-
--DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \
-- $(top_srcdir)/Makefile.decl AUTHORS Makefile.am TODO
--SOURCES = $(libgdk_directfb_la_SOURCES)
+-DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \
+- $(top_srcdir)/Makefile.decl Makefile.am
+-SOURCES = $(libgdk_quartz_la_SOURCES)
-
all: all-am
@@ -56133,9 +58213,9 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/directfb/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/quartz/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu gdk/directfb/Makefile
+ $(AUTOMAKE) --gnu gdk/quartz/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -56165,9 +58245,9 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
- libgdk-directfb.la: $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_DEPENDENCIES)
-- $(LINK) $(libgdk_directfb_la_LDFLAGS) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS)
-+ $(LINK) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS)
+ libgdk-quartz.la: $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_DEPENDENCIES)
+- $(LINK) $(libgdk_quartz_la_LDFLAGS) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS)
++ $(LINK) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
@@ -56175,8 +58255,8 @@
distclean-compile:
-rm -f *.tab.c
-@@ -585,82 +469,58 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindowid.Plo at am__quote@
+@@ -591,82 +474,58 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindow-quartz.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -56280,7 +58360,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -670,23 +530,23 @@
+@@ -676,23 +535,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -56313,7 +58393,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -698,29 +558,23 @@
+@@ -704,29 +563,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -56356,7 +58436,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -735,9 +589,10 @@
+@@ -741,9 +594,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -56369,7 +58449,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -757,7 +612,7 @@
+@@ -763,7 +617,7 @@
clean-generic:
distclean-generic:
@@ -56378,7 +58458,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -771,24 +626,34 @@
+@@ -777,24 +631,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -56414,7 +58494,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -809,19 +674,23 @@
+@@ -815,19 +679,23 @@
ps-am:
@@ -56448,9 +58528,10 @@
uninstall-libgdkincludeHEADERS
# call as: $(XVFB_START) && someprogram
-diff -urN a/gdk/Makefile.in b/gdk/Makefile.in
---- a/gdk/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/gdk/Makefile.in 2009-03-02 19:33:01.000000000 -0300
+Index: gtk+2.0-2.15.5/gdk/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/tests/Makefile.in 2009-03-02 16:04:19.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/tests/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -56463,34 +58544,35 @@
# 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,13 @@
+@@ -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 = ..
+-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,143 @@
+@@ -37,10 +31,26 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
-+DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl COPYING
-+subdir = gdk
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++ $(top_srcdir)/Makefile.decl
++check_PROGRAMS =
++TESTS = $(am__EXEEXT_1)
++subdir = gdk/tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
@@ -56499,128 +58581,9 @@
+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)$(gdkincludedir)"
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \
-+ $(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 \
-+ 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
-+ at USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.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_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(libgdk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
-+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 \
-+ 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 \
-+ 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) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(libgdk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
-+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 \
-+ 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) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(libgdk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at 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_directfb_2_0_la_SOURCES) \
-+ $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) \
-+ $(libgdk_x11_2_0_la_SOURCES)
-+DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \
-+ $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \
-+ $(am__libgdk_win32_2_0_la_SOURCES_DIST) \
-+ $(am__libgdk_x11_2_0_la_SOURCES_DIST)
-+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)
-+gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-+HEADERS = $(gdkinclude_HEADERS)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
-+ETAGS = etags
-+CTAGS = ctags
++SOURCES =
++DIST_SOURCES =
++am__EXEEXT_1 =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
@@ -56628,7 +58591,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -51,22 +181,17 @@
+@@ -51,22 +61,17 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -56652,7 +58615,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -81,21 +206,16 @@
+@@ -81,21 +86,16 @@
DB2HTML = @DB2HTML@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -56677,7 +58640,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +257,6 @@
+@@ -119,6 +119,7 @@
+ 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@
+@@ -137,8 +138,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -56686,7 +58657,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +267,20 @@
+@@ -149,98 +148,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -56786,7 +58757,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +291,20 @@
+@@ -251,32 +172,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -56820,7 +58791,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +315,6 @@
+@@ -287,8 +196,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -56829,7 +58800,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +326,10 @@
+@@ -300,28 +207,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -56858,7 +58829,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +338,25 @@
+@@ -330,22 +219,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -56889,7 +58860,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +378,8 @@
+@@ -367,8 +259,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -56899,7 +58870,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,32 +388,22 @@
+@@ -377,9 +269,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -56913,274 +58884,49 @@
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 \
-- gdkwindowimpl.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 gdkwindowimpl.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
-@@ -428,10 +429,8 @@
+@@ -410,21 +305,14 @@
|| { 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 \
-@@ -441,9 +440,7 @@
- $(GTK_DEBUG_FLAGS) \
- $(GDK_DEP_CFLAGS)
-
--
- gtarget = $(gdktarget)
--
- @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
-
- # libtool stuff: set version and export symbols for resolving
-@@ -457,7 +454,6 @@
- $(LIBTOOL_EXPORT_OPTIONS)
-
- @USE_MEDIALIB_FALSE at medialib_sources =
--
- @USE_MEDIALIB_TRUE at medialib_sources = \
- @USE_MEDIALIB_TRUE@ gdkmedialib.c
-
-@@ -501,15 +497,12 @@
- gdkvisual.h \
- gdkwindow.h
-
--
- gdk_built_public_sources = \
- gdkenumtypes.h
-
--
- gdk_built_private_headers = \
- gdkalias.h
-
--
- gdk_c_sources = \
- $(medialib_sources) \
- gdk.c \
-@@ -546,7 +539,6 @@
- gdkwindow.c \
- gdkwindowimpl.c
-
--
- gdk_built_sources = \
- gdkaliasdef.c \
- gdkenumtypes.c \
-@@ -556,7 +548,6 @@
- $(gdk_built_private_headers)
-
-
--
- #
- # setup GDK sources and their dependencies
- #
-@@ -569,40 +560,31 @@
- gdkenumtypes.c \
- gdkmarshalers.h
-
--
- libgdk_directfb_2_0_la_SOURCES = $(common_sources)
- libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-
- libgdk_directfb_2_0_la_LDFLAGS = $(LDADD)
--
- libgdk_x11_2_0_la_SOURCES = $(common_sources)
- libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-
- libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
--
- libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
- libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-
- libgdk_quartz_2_0_la_LDFLAGS = $(LDADD)
--
- libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
- libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-
- libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
- libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
--
- @MS_LIB_AVAILABLE_TRUE at noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
--
- @OS_LINUX_TRUE at TESTS = abicheck.sh pltcheck.sh
--
- lib_LTLIBRARIES = $(gdktargetlib)
--
- EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
--
- MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
- EXTRA_HEADERS =
-
-@@ -616,183 +598,79 @@
- $(gdk_built_sources) \
- gdkconfig.h
-
--
- DISTCLEANFILES = gdkconfig.h stamp-gc-h
--subdir = gdk
+ NULL =
+-
+-# check_PROGRAMS=check-gdk-cairo
+-check_PROGRAMS =
+-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)
+@@ -435,28 +323,42 @@
+ $(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 =
--LTLIBRARIES = $(lib_LTLIBRARIES)
--
--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 \
-- 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
-- at USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo
-- at USE_MEDIALIB_FALSE@am__objects_1 =
--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 \
-- 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)
--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_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 \
-- 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)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcairo.Plo ./$(DEPDIR)/gdkcolor.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplaymanager.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd.Plo ./$(DEPDIR)/gdkdraw.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkenumtypes.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents.Plo ./$(DEPDIR)/gdkfont.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc.Plo ./$(DEPDIR)/gdkglobals.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeynames.Plo ./$(DEPDIR)/gdkkeys.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeyuni.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmedialib.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpango.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-drawable.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-render.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpolyreg-generic.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkrectangle.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkregion-generic.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkrgb.Plo ./$(DEPDIR)/gdkscreen.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual.Plo ./$(DEPDIR)/gdkwindow.Plo \
-- at 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) \
-- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \
-- $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \
-- $(am__libgdk_win32_2_0_la_SOURCES_DIST) \
-- $(am__libgdk_x11_2_0_la_SOURCES_DIST)
--DATA = $(noinst_DATA)
--
--HEADERS = $(gdkinclude_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 = $(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)
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+-check_PROGRAMS =
+-DIST_SOURCES =
+-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \
+- Makefile.am
+ 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 \
@@ -57191,12 +58937,11 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/tests/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu gdk/Makefile
+ $(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)
--libLTLIBRARIES_INSTALL = $(INSTALL)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
@@ -57214,110 +58959,10 @@
+ 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
- libgdk-directfb-2.0.la: $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_DEPENDENCIES)
-- $(LINK) $(libgdk_directfb_2_0_la_LDFLAGS) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS)
-+ $(libgdk_directfb_2_0_la_LINK) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS)
- libgdk-quartz-2.0.la: $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_DEPENDENCIES)
-- $(LINK) $(libgdk_quartz_2_0_la_LDFLAGS) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS)
-+ $(libgdk_quartz_2_0_la_LINK) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS)
- libgdk-win32-2.0.la: $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_DEPENDENCIES)
-- $(LINK) $(libgdk_win32_2_0_la_LDFLAGS) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS)
-+ $(libgdk_win32_2_0_la_LINK) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS)
- libgdk-x11-2.0.la: $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_DEPENDENCIES)
-- $(LINK) $(libgdk_x11_2_0_la_LDFLAGS) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS)
-+ $(libgdk_x11_2_0_la_LINK) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -831,64 +709,47 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindowimpl.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
+
+ clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; for p in $$list; do \
+@@ -470,10 +372,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -57325,160 +58970,11 @@
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
--gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER)
- install-gdkincludeHEADERS: $(gdkinclude_HEADERS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(gdkincludedir)
-+ test -z "$(gdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gdkincludedir)"
- @list='$(gdkinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f"; \
-- $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(gdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gdkincludedir)/$$f'"; \
-+ $(gdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gdkincludedir)/$$f"; \
- done
-
- uninstall-gdkincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(gdkinclude_HEADERS)'; for p in $$list; do \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " rm -f $(DESTDIR)$(gdkincludedir)/$$f"; \
-- rm -f $(DESTDIR)$(gdkincludedir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(gdkincludedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(gdkincludedir)/$$f"; \
- done
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -898,7 +759,13 @@
- # (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 \
-@@ -910,15 +777,20 @@
- 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)' ;; \
-@@ -939,7 +811,7 @@
- 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 \
-@@ -950,35 +822,30 @@
- 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; \
-@@ -986,23 +853,23 @@
- 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
-@@ -1016,9 +883,9 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ tags: TAGS
+ TAGS:
+
+@@ -482,9 +380,9 @@
+
check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
@@ -57489,7 +58985,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1027,25 +894,25 @@
+@@ -493,25 +391,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -57525,7 +59021,7 @@
;; \
esac; \
else \
-@@ -1070,46 +937,40 @@
+@@ -536,46 +434,40 @@
skipped=""; \
if test "$$skip" -ne 0; then \
skipped="($$skip tests were not run)"; \
@@ -57552,11 +59048,11 @@
else :; fi
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
--top_distdir = ..
+-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
-- $(mkinstalldirs) $(distdir)/..
+- $(mkinstalldirs) $(distdir)/../..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -57589,153 +59085,98 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1122,13 +983,17 @@
- done
- 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; \
-@@ -1140,8 +1005,9 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gdkincludedir)
--
-+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gdkincludedir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
-@@ -1162,14 +1028,14 @@
- clean-generic:
+@@ -591,7 +483,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: check-am
+ all-am: Makefile
+-
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -613,35 +504,46 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
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-generic clean-libLTLIBRARIES clean-libtool \
-@@ -1179,26 +1045,36 @@
- -rm -rf ./$(DEPDIR)
+ 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 -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
-- distclean-libtool distclean-local distclean-tags
-+ distclean-local distclean-tags
-
- dvi: dvi-recursive
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
dvi-am:
-+html: html-recursive
-+
- info: info-recursive
++html: html-am
++
+ info: info-am
info-am:
- install-data-am: install-data-local install-gdkincludeHEADERS
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am: install-exec-local install-libLTLIBRARIES
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
+ 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-recursive
-+
-+install-ps: install-ps-recursive
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
+
installcheck-am:
- maintainer-clean: maintainer-clean-recursive
-@@ -1219,32 +1095,30 @@
+ maintainer-clean: maintainer-clean-am
+@@ -660,17 +562,21 @@
ps-am:
--uninstall-am: uninstall-gdkincludeHEADERS uninstall-info-am \
-- uninstall-libLTLIBRARIES uninstall-local
-+uninstall-am: uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \
-+ uninstall-local
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-exec-am install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
-- 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 \
-- install-am install-data install-data-am install-data-local \
-- install-data-recursive install-exec install-exec-am \
-- install-exec-local install-exec-recursive \
-- install-gdkincludeHEADERS install-info install-info-am \
-- install-info-recursive install-libLTLIBRARIES 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-gdkincludeHEADERS uninstall-info-am \
-- 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 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 \
-+ install-dvi-am install-exec install-exec-am install-exec-hook \
-+ install-exec-local install-gdkincludeHEADERS install-html \
-+ install-html-am install-info install-info-am \
-+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-TESTS check-am check-local clean \
+ clean-checkPROGRAMS 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
++ 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 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-gdkincludeHEADERS uninstall-libLTLIBRARIES \
-+ uninstall-local
++ 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
-diff -urN a/gdk/quartz/Makefile.in b/gdk/quartz/Makefile.in
---- a/gdk/quartz/Makefile.in 2009-03-02 16:04:19.000000000 -0300
-+++ b/gdk/quartz/Makefile.in 2009-03-02 19:33:01.000000000 -0300
+Index: gtk+2.0-2.15.5/gdk/win32/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/win32/Makefile.in 2009-03-02 16:04:19.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/win32/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -57766,7 +59207,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -37,10 +33,59 @@
+@@ -37,10 +33,69 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -57774,7 +59215,7 @@
host_triplet = @host@
+DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
-+subdir = gdk/quartz
++subdir = gdk/win32
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.in
@@ -57784,18 +59225,18 @@
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libgdk_quartz_la_LIBADD =
-+am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.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 \
-+ gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo
-+libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS)
++libgdk_win32_la_LIBADD =
++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. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
@@ -57808,8 +59249,15 @@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
-+SOURCES = $(libgdk_quartz_la_SOURCES)
-+DIST_SOURCES = $(libgdk_quartz_la_SOURCES)
++SOURCES = $(libgdk_win32_la_SOURCES)
++DIST_SOURCES = $(libgdk_win32_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
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -57819,8 +59267,11 @@
+am__installdirs = "$(DESTDIR)$(libgdkincludedir)"
+libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libgdkinclude_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@
@@ -57828,7 +59279,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -51,22 +96,17 @@
+@@ -51,22 +106,17 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -57852,7 +59303,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -81,21 +121,16 @@
+@@ -81,21 +131,16 @@
DB2HTML = @DB2HTML@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -57877,7 +59328,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +172,6 @@
+@@ -119,6 +164,7 @@
+ 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@
+@@ -137,8 +183,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -57886,7 +59345,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +182,20 @@
+@@ -149,98 +193,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -57986,7 +59445,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +206,20 @@
+@@ -251,32 +217,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -58020,7 +59479,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +230,6 @@
+@@ -287,8 +241,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -58029,7 +59488,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +241,10 @@
+@@ -300,28 +252,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -58058,7 +59517,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +253,25 @@
+@@ -330,22 +264,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -58089,7 +59548,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +293,8 @@
+@@ -367,8 +304,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -58099,7 +59558,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +303,12 @@
+@@ -377,17 +314,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -58113,7 +59572,16 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +339,7 @@
+ # initialize variables for unconditional += appending
+-EXTRA_DIST = \
+- bdfcursor.c \
+- makefile.msc
+-
++EXTRA_DIST = bdfcursor.c makefile.msc
+ TEST_PROGS =
+
+ ### testing rules
+@@ -413,9 +350,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -58121,79 +59589,79 @@
libgdkincludedir = $(includedir)/gtk-2.0/gdk
-
INCLUDES = \
- -DG_LOG_DOMAIN=\"Gdk\" \
- -DGDK_COMPILATION \
-@@ -423,11 +350,8 @@
- $(GDK_DEP_CFLAGS) \
- "-xobjective-c"
+ -DG_LOG_DOMAIN=\"Gdk\" \
+ -DINSIDE_GDK_WIN32 \
+@@ -427,13 +362,9 @@
+ $(GDK_WIN32_EXTRA_CFLAGS)\
+ -DGDK_COMPILATION
-
LDADDS = $(GDK_DEP_LIBS)
-
- noinst_LTLIBRARIES = libgdk-quartz.la
--
- libgdk_quartz_la_SOURCES = \
- GdkQuartzView.c \
- GdkQuartzView.h \
-@@ -466,98 +390,56 @@
- gdkwindow-quartz.h \
- xcursors.h
+ noinst_LTLIBRARIES = libgdk-win32.la
+-
+ SUBDIRS = rc
+-
+ libgdk_win32_la_SOURCES = \
+ xcursors.h \
+ gdkapplaunchcontext-win32.c \
+@@ -471,103 +402,56 @@
+ wintab.h \
+ pktdef.h
-
libgdkinclude_HEADERS = \
- gdkquartz.h
-
--subdir = gdk/quartz
+ gdkwin32.h
+
+-subdir = gdk/win32
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-
--libgdk_quartz_la_LDFLAGS =
--libgdk_quartz_la_LIBADD =
--am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.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 \
-- gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo
--libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS)
+-libgdk_win32_la_LDFLAGS =
+-libgdk_win32_la_LIBADD =
+-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
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GdkQuartzView.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/GdkQuartzWindow.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkeventloop-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkim-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-quartz.Plo \
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkim-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-win32.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-quartz.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-quartz.Plo
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-win32.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwin32id.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-win32.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -58201,14 +59669,21 @@
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libgdk_quartz_la_SOURCES)
+-DIST_SOURCES = $(libgdk_win32_la_SOURCES)
-HEADERS = $(libgdkinclude_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 = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.decl Makefile.am
--SOURCES = $(libgdk_quartz_la_SOURCES)
--
- all: all-am
+-DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(libgdk_win32_la_SOURCES)
+-
+ all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -58222,9 +59697,9 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/quartz/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/win32/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu gdk/quartz/Makefile
+ $(AUTOMAKE) --gnu gdk/win32/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
@@ -58254,9 +59729,9 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
- libgdk-quartz.la: $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_DEPENDENCIES)
-- $(LINK) $(libgdk_quartz_la_LDFLAGS) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS)
-+ $(LINK) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS)
+ libgdk-win32.la: $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_DEPENDENCIES)
+- $(LINK) $(libgdk_win32_la_LDFLAGS) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS)
++ $(LINK) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
@@ -58264,8 +59739,8 @@
distclean-compile:
-rm -f *.tab.c
-@@ -591,82 +473,58 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindow-quartz.Plo at am__quote@
+@@ -600,64 +484,47 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindow-win32.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -58347,6 +59822,60 @@
+ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \
done
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -667,7 +534,13 @@
+ # (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 \
+@@ -679,15 +552,20 @@
+ 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)' ;; \
+@@ -708,7 +586,7 @@
+ 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 \
+@@ -719,35 +597,30 @@
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
-ETAGS = etags
-ETAGSFLAGS =
-
@@ -58367,9 +59896,26 @@
mkid -fID $$unique
+tags: TAGS
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -676,23 +534,23 @@
+ 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; \
+@@ -755,23 +628,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -58387,7 +59933,7 @@
+ $$tags $$unique; \
+ fi
ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
@@ -58402,7 +59948,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -704,29 +562,23 @@
+@@ -783,29 +656,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58445,20 +59991,44 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -741,9 +593,10 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
+@@ -816,15 +683,19 @@
+ || 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; \
+@@ -835,8 +706,9 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
--
- installdirs:
+ installdirs: installdirs-recursive
+ installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir)
+-
+ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -763,7 +616,7 @@
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -856,7 +728,7 @@
clean-generic:
distclean-generic:
@@ -58467,62 +60037,66 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -777,24 +630,34 @@
+@@ -870,24 +742,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
- dvi: dvi-am
+ dvi: dvi-recursive
dvi-am:
-+html: html-am
-+
- info: info-am
++html: html-recursive
++
+ info: info-recursive
info-am:
install-data-am: install-libgdkincludeHEADERS
-+install-dvi: install-dvi-am
++install-dvi: install-dvi-recursive
+
install-exec-am:
-+install-html: install-html-am
-+
- install-info: install-info-am
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
install-man:
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
+
installcheck-am:
- maintainer-clean: maintainer-clean-am
-@@ -815,19 +678,23 @@
+ maintainer-clean: maintainer-clean-recursive
+@@ -908,28 +790,26 @@
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 \
+
+-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-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \
- 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-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 \
++.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 \
@@ -58530,16 +60104,25 @@
+ 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
+ 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-libgdkincludeHEADERS uninstall-recursive
++ 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
# call as: $(XVFB_START) && someprogram
-diff -urN a/gdk/tests/Makefile.in b/gdk/tests/Makefile.in
---- a/gdk/tests/Makefile.in 2009-03-02 16:04:19.000000000 -0300
-+++ b/gdk/tests/Makefile.in 2009-03-02 19:33:01.000000000 -0300
+
+Index: gtk+2.0-2.15.5/gdk/win32/rc/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/win32/rc/Makefile.in 2009-03-02 16:04:19.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/win32/rc/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -58552,35 +60135,32 @@
# 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@
+@@ -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 = ../..
+-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,26 @@
+@@ -37,10 +32,24 @@
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 =
-+TESTS = $(am__EXEEXT_1)
-+subdir = gdk/tests
++ $(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
@@ -58588,10 +60168,10 @@
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_FILES = gdk.rc
+SOURCES =
+DIST_SOURCES =
-+am__EXEEXT_1 =
++DATA = $(noinst_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
@@ -58599,7 +60179,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -51,22 +61,17 @@
+@@ -51,22 +60,17 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -58623,7 +60203,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -81,21 +86,16 @@
+@@ -81,21 +85,16 @@
DB2HTML = @DB2HTML@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -58648,6 +60228,14 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
+@@ -119,6 +118,7 @@
+ 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@
@@ -137,8 +137,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
@@ -58870,7 +60458,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +268,12 @@
+@@ -377,18 +268,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -58884,1576 +60472,6 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,21 +304,14 @@
- || { 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
--check_PROGRAMS =
--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)
-@@ -435,28 +322,42 @@
- $(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 =
--DIST_SOURCES =
--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)/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 \
-@@ -470,10 +371,6 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -482,9 +379,9 @@
-
-
- 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=./; \
-@@ -493,25 +390,25 @@
- 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 \
-@@ -536,46 +433,40 @@
- 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; \
-@@ -591,7 +482,6 @@
- $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -613,35 +503,46 @@
- -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 -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- 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
-@@ -660,17 +561,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-TESTS check-am check-local clean \
- clean-checkPROGRAMS 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
-+ 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 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
-
-diff -urN a/gdk/win32/Makefile.in b/gdk/win32/Makefile.in
---- a/gdk/win32/Makefile.in 2009-03-02 16:04:19.000000000 -0300
-+++ b/gdk/win32/Makefile.in 2009-03-02 19:33:01.000000000 -0300
-@@ -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,69 @@
- 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/win32
-+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)
-+libgdk_win32_la_LIBADD =
-+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. at 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_win32_la_SOURCES)
-+DIST_SOURCES = $(libgdk_win32_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
-+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)
-+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 +106,17 @@
- 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,21 +131,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -137,8 +182,6 @@
- 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@
-@@ -149,98 +192,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -251,32 +216,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +240,6 @@
- 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@
-@@ -300,28 +251,10 @@
- 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@
-@@ -330,22 +263,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -367,8 +303,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -377,17 +313,17 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
-@@ -413,9 +349,7 @@
- || { 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 \
-@@ -427,13 +361,9 @@
- $(GDK_WIN32_EXTRA_CFLAGS)\
- -DGDK_COMPILATION
-
--
- LDADDS = $(GDK_DEP_LIBS)
--
- noinst_LTLIBRARIES = libgdk-win32.la
--
- SUBDIRS = rc
--
- libgdk_win32_la_SOURCES = \
- xcursors.h \
- gdkapplaunchcontext-win32.c \
-@@ -471,103 +401,56 @@
- wintab.h \
- pktdef.h
-
--
- libgdkinclude_HEADERS = \
- gdkwin32.h
-
--subdir = gdk/win32
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(noinst_LTLIBRARIES)
--
--libgdk_win32_la_LDFLAGS =
--libgdk_win32_la_LIBADD =
--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
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkim-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-win32.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwin32id.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-win32.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 = $(libgdk_win32_la_SOURCES)
--HEADERS = $(libgdkinclude_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 = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \
-- $(top_srcdir)/Makefile.decl Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(libgdk_win32_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 gdk/win32/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu gdk/win32/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
- libgdk-win32.la: $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_DEPENDENCIES)
-- $(LINK) $(libgdk_win32_la_LDFLAGS) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS)
-+ $(LINK) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -600,64 +483,47 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gdkwindow-win32.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at 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:
--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
-
- # This directory's subdirectories are mostly independent; you can cd
-@@ -667,7 +533,13 @@
- # (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 \
-@@ -679,15 +551,20 @@
- 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)' ;; \
-@@ -708,7 +585,7 @@
- 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 \
-@@ -719,35 +596,30 @@
- 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; \
-@@ -755,23 +627,23 @@
- 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
-@@ -783,29 +655,23 @@
-
- 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; \
-@@ -816,15 +682,19 @@
- || 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; \
-@@ -835,8 +705,9 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir)
--
-+ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -856,7 +727,7 @@
- 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"
-@@ -870,24 +741,34 @@
- -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-libgdkincludeHEADERS
-
-+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
-@@ -908,28 +789,26 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS
-+uninstall-am: uninstall-libgdkincludeHEADERS
-
--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-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 \
-+.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 \
-- 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
-+ 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
-
- # call as: $(XVFB_START) && someprogram
-
-diff -urN a/gdk/win32/rc/Makefile.in b/gdk/win32/rc/Makefile.in
---- a/gdk/win32/rc/Makefile.in 2009-03-02 16:04:19.000000000 -0300
-+++ b/gdk/win32/rc/Makefile.in 2009-03-02 19:33:02.000000000 -0300
-@@ -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,24 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.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
-+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.rc
-+SOURCES =
-+DIST_SOURCES =
-+DATA = $(noinst_DATA)
-+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 +60,17 @@
- 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,21 +85,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -137,8 +136,6 @@
- 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@
-@@ -149,98 +146,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -251,32 +170,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +194,6 @@
- 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@
-@@ -300,28 +205,10 @@
- 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@
-@@ -330,22 +217,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -367,8 +257,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -377,18 +267,17 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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 = \
- gdk.rc \
@@ -60464,7 +60482,7 @@
TEST_PROGS =
### testing rules
-@@ -414,27 +303,40 @@
+@@ -414,27 +304,40 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -60520,7 +60538,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-@@ -442,39 +344,29 @@
+@@ -442,39 +345,29 @@
clean-libtool:
-rm -rf .libs _libs
@@ -60573,7 +60591,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -489,7 +381,6 @@
+@@ -489,7 +382,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
@@ -60581,7 +60599,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -510,7 +401,7 @@
+@@ -510,7 +402,7 @@
clean-generic:
distclean-generic:
@@ -60590,7 +60608,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -521,24 +412,34 @@
+@@ -521,24 +413,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -60626,7 +60644,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -557,17 +458,21 @@
+@@ -557,17 +459,21 @@
ps-am:
@@ -60656,9 +60674,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in
---- a/gdk/x11/Makefile.in 2009-03-02 16:04:19.000000000 -0300
-+++ b/gdk/x11/Makefile.in 2009-03-02 19:33:02.000000000 -0300
+Index: gtk+2.0-2.15.5/gdk/x11/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk/x11/Makefile.in 2009-03-02 16:04:19.000000000 -0300
++++ gtk+2.0-2.15.5/gdk/x11/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -60828,7 +60847,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -139,8 +200,6 @@
+@@ -121,6 +182,7 @@
+ 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 +201,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -60837,7 +60864,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -151,98 +210,20 @@
+@@ -151,98 +211,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -60937,7 +60964,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -253,32 +234,20 @@
+@@ -253,32 +235,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -60971,7 +60998,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -289,8 +258,6 @@
+@@ -289,8 +259,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -60980,7 +61007,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -302,28 +269,10 @@
+@@ -302,28 +270,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -61009,7 +61036,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -332,22 +281,25 @@
+@@ -332,22 +282,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -61040,7 +61067,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,8 +321,8 @@
+@@ -369,8 +322,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -61050,7 +61077,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -379,9 +331,12 @@
+@@ -379,9 +332,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -61064,7 +61091,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -389,12 +344,8 @@
+@@ -389,12 +345,8 @@
# We need to include all these C files here since the conditionals
# don't seem to be correctly expanded for the dist files.
@@ -61078,7 +61105,7 @@
TEST_PROGS =
### testing rules
-@@ -420,9 +371,7 @@
+@@ -420,9 +372,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -61088,7 +61115,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdk\" \
-DGDK_COMPILATION \
-@@ -432,178 +381,69 @@
+@@ -432,178 +382,69 @@
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
@@ -61309,7 +61336,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -613,10 +453,10 @@
+@@ -613,10 +454,10 @@
done
checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES)
@rm -f checksettings$(EXEEXT)
@@ -61322,7 +61349,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -656,82 +496,58 @@
+@@ -656,82 +497,58 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsettings-common.Plo at am__quote@
.c.o:
@@ -61427,7 +61454,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -741,23 +557,23 @@
+@@ -741,23 +558,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -61460,7 +61487,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -771,9 +587,9 @@
+@@ -771,9 +588,9 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -61472,7 +61499,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -782,25 +598,25 @@
+@@ -782,25 +599,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -61508,7 +61535,7 @@
;; \
esac; \
else \
-@@ -825,46 +641,40 @@
+@@ -825,46 +642,40 @@
skipped=""; \
if test "$$skip" -ne 0; then \
skipped="($$skip tests were not run)"; \
@@ -61572,7 +61599,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -879,9 +689,10 @@
+@@ -879,9 +690,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
@@ -61585,7 +61612,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -901,7 +712,7 @@
+@@ -901,7 +713,7 @@
clean-generic:
distclean-generic:
@@ -61594,7 +61621,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -915,24 +726,34 @@
+@@ -915,24 +727,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -61630,7 +61657,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -953,20 +774,24 @@
+@@ -953,20 +775,24 @@
ps-am:
@@ -61664,9 +61691,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gdk-pixbuf/Makefile.in b/gdk-pixbuf/Makefile.in
---- a/gdk-pixbuf/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/gdk-pixbuf/Makefile.in 2009-03-02 19:33:00.000000000 -0300
+Index: gtk+2.0-2.15.5/gdk-pixbuf/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk-pixbuf/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/gdk-pixbuf/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -61699,7 +61727,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -37,1444 +35,1366 @@
+@@ -37,1444 +35,1368 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -63042,6 +63070,7 @@
+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@
@@ -63257,6 +63286,7 @@
- at INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la
- at 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)
- at INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la
@@ -64211,7 +64241,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)
+test_gdk_pixbuf_LDADD = $(LDADDS)
+gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
@@ -64410,7 +64440,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -1483,116 +1403,115 @@
+@@ -1483,116 +1405,115 @@
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -64578,7 +64608,7 @@
else :; fi; \
done
-@@ -1600,8 +1519,8 @@
+@@ -1600,8 +1521,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -64589,7 +64619,7 @@
done
clean-binPROGRAMS:
-@@ -1619,16 +1538,16 @@
+@@ -1619,16 +1540,16 @@
done
gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES)
@rm -f gdk-pixbuf-csource$(EXEEXT)
@@ -64610,7 +64640,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -1676,64 +1595,47 @@
+@@ -1676,64 +1597,47 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-gdk-pixbuf.Po at am__quote@
.c.o:
@@ -64694,7 +64724,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -1743,7 +1645,13 @@
+@@ -1743,7 +1647,13 @@
# (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):
@@ -64709,7 +64739,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1755,15 +1663,20 @@
+@@ -1755,15 +1665,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64734,7 +64764,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1784,7 +1697,7 @@
+@@ -1784,7 +1699,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64743,7 +64773,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1795,35 +1708,30 @@
+@@ -1795,35 +1710,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -64786,7 +64816,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -1831,23 +1739,23 @@
+@@ -1831,23 +1741,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -64819,7 +64849,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1861,9 +1769,9 @@
+@@ -1861,9 +1771,9 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -64831,7 +64861,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1872,25 +1780,25 @@
+@@ -1872,25 +1782,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -64867,7 +64897,7 @@
;; \
esac; \
else \
-@@ -1915,46 +1823,40 @@
+@@ -1915,46 +1825,40 @@
skipped=""; \
if test "$$skip" -ne 0; then \
skipped="($$skip tests were not run)"; \
@@ -64931,7 +64961,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1965,15 +1867,19 @@
+@@ -1965,15 +1869,19 @@
|| exit 1; \
fi; \
done
@@ -64956,7 +64986,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -1982,13 +1888,16 @@
+@@ -1982,13 +1890,16 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
@@ -64976,7 +65006,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -2010,13 +1919,13 @@
+@@ -2010,13 +1921,13 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -64992,7 +65022,7 @@
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -2027,12 +1936,14 @@
+@@ -2027,12 +1938,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -65008,7 +65038,7 @@
info: info-recursive
info-am:
-@@ -2042,12 +1953,20 @@
+@@ -2042,12 +1955,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -65029,7 +65059,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -2068,35 +1987,34 @@
+@@ -2068,35 +1989,34 @@
ps-am:
@@ -65090,9 +65120,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gdk-pixbuf/pixops/Makefile.in b/gdk-pixbuf/pixops/Makefile.in
---- a/gdk-pixbuf/pixops/Makefile.in 2009-03-02 16:04:18.000000000 -0300
-+++ b/gdk-pixbuf/pixops/Makefile.in 2009-03-02 19:33:00.000000000 -0300
+Index: gtk+2.0-2.15.5/gdk-pixbuf/pixops/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gdk-pixbuf/pixops/Makefile.in 2009-03-02 16:04:18.000000000 -0300
++++ gtk+2.0-2.15.5/gdk-pixbuf/pixops/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -65234,7 +65265,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +172,6 @@
+@@ -119,6 +154,7 @@
+ 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@
+@@ -137,8 +173,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -65243,7 +65282,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +182,20 @@
+@@ -149,98 +183,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -65343,7 +65382,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +206,20 @@
+@@ -251,32 +207,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -65377,7 +65416,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +230,6 @@
+@@ -287,8 +231,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -65386,7 +65425,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +241,10 @@
+@@ -300,28 +242,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -65415,7 +65454,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +253,25 @@
+@@ -330,22 +254,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -65446,7 +65485,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +293,8 @@
+@@ -367,8 +294,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -65456,7 +65495,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,18 +303,17 @@
+@@ -377,18 +304,17 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -65480,7 +65519,7 @@
TEST_PROGS =
### testing rules
-@@ -414,97 +339,70 @@
+@@ -414,97 +340,70 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -65607,7 +65646,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -514,58 +412,62 @@
+@@ -514,58 +413,62 @@
done
timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES)
@rm -f timescale$(EXEEXT)
@@ -65699,7 +65738,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -573,26 +475,15 @@
+@@ -573,26 +476,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -65729,7 +65768,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -602,23 +493,23 @@
+@@ -602,23 +494,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -65762,7 +65801,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -630,29 +521,23 @@
+@@ -630,29 +522,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -65805,7 +65844,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -667,7 +552,6 @@
+@@ -667,7 +553,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
@@ -65813,7 +65852,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -688,7 +572,7 @@
+@@ -688,7 +573,7 @@
clean-generic:
distclean-generic:
@@ -65822,7 +65861,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -702,24 +586,34 @@
+@@ -702,24 +587,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -65858,7 +65897,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -740,19 +634,23 @@
+@@ -740,19 +635,23 @@
ps-am:
@@ -65888,9 +65927,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gtk/Makefile.in b/gtk/Makefile.in
---- a/gtk/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/gtk/Makefile.in 2009-03-02 19:33:02.000000000 -0300
+Index: gtk+2.0-2.15.5/gtk/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gtk/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/gtk/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -65938,7 +65978,7 @@
@OS_LINUX_TRUE at am__append_1 = abicheck.sh pltcheck.sh
@HAVE_INCLUDED_IMMMODULES_TRUE at am__append_2 = $(INCLUDED_IMMODULE_OBJ)
@HAVE_INCLUDED_IMMMODULES_TRUE at am__append_3 = $(INCLUDED_IMMODULE_OBJ)
-@@ -61,1767 +66,943 @@
+@@ -61,1767 +66,949 @@
@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__append_12 = gtksearchenginequartz.h
@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__append_13 = $(gtk_use_quartz_c_sources)
@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE at am__append_14 = $(gtk_use_stub_c_sources)
@@ -67902,6 +67942,7 @@
+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@
@@ -68137,6 +68178,8 @@
+ 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
++
++ at 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 \
@@ -68473,8 +68516,6 @@
-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 \
-+ at USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f"
-+
+# Makefile.am for gtk+/gtk
+ at USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f"
+SUBDIRS = theme-bits . tests
@@ -68499,6 +68540,8 @@
+ -I$(top_srcdir)/gdk \
+ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
+ -DGDK_DISABLE_DEPRECATED \
++ -DMAEMO_CHANGES \
++ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
+ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
@@ -68609,24 +68652,27 @@
+# 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 \
++ gtkfilechooserutils.h \
++ gtkquery.h \
++ gtksearchengine.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 \
++gtk_private_h_sources = 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 \
++ 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 $(gtk_clipboard_dnd_h_sources) \
+ $(am__append_4) $(am__append_6) $(am__append_8) \
@@ -68637,7 +68683,7 @@
gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \
gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \
gtkaction.c gtkactiongroup.c gtkactivatable.c gtkadjustment.c \
-@@ -1845,18 +1026,18 @@
+@@ -1845,18 +1032,18 @@
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 \
@@ -68668,7 +68714,7 @@
gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \
gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \
gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \
-@@ -1868,8 +1049,8 @@
+@@ -1868,8 +1055,8 @@
gtkscrolledwindow.c gtkselection.c gtkseparator.c \
gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \
gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \
@@ -68679,7 +68725,7 @@
gtktextbuffer.c gtktextbufferrichtext.c \
gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \
gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \
-@@ -1884,372 +1065,501 @@
+@@ -1884,372 +1071,501 @@
gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \
gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \
gtkwidget.c gtkwindow-decorate.c gtkwindow.c \
@@ -69499,7 +69545,7 @@
else :; fi; \
done
-@@ -2257,8 +1567,8 @@
+@@ -2257,8 +1573,8 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -69510,7 +69556,7 @@
done
clean-binPROGRAMS:
-@@ -2269,20 +1579,19 @@
+@@ -2269,20 +1585,19 @@
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)
@@ -69536,7 +69582,7 @@
else :; fi; \
done
-@@ -2290,12 +1599,12 @@
+@@ -2290,12 +1605,12 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
@@ -69552,7 +69598,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -2563,82 +1872,64 @@
+@@ -2563,82 +1878,64 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/updateiconcache.Po at am__quote@
.c.o:
@@ -69661,7 +69707,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -2648,7 +1939,13 @@
+@@ -2648,7 +1945,13 @@
# (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):
@@ -69676,7 +69722,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2660,15 +1957,20 @@
+@@ -2660,15 +1963,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69701,7 +69747,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -2689,7 +1991,7 @@
+@@ -2689,7 +1997,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69710,7 +69756,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2700,35 +2002,30 @@
+@@ -2700,35 +2008,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -69753,7 +69799,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -2736,23 +2033,23 @@
+@@ -2736,23 +2039,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -69786,7 +69832,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -2766,9 +2063,9 @@
+@@ -2766,9 +2069,9 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -69798,7 +69844,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -2777,25 +2074,25 @@
+@@ -2777,25 +2080,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -69834,7 +69880,7 @@
;; \
esac; \
else \
-@@ -2820,46 +2117,40 @@
+@@ -2820,46 +2123,40 @@
skipped=""; \
if test "$$skip" -ne 0; then \
skipped="($$skip tests were not run)"; \
@@ -69898,7 +69944,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -2872,13 +2163,17 @@
+@@ -2872,13 +2169,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -69920,7 +69966,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -2893,8 +2188,9 @@
+@@ -2893,8 +2194,9 @@
installdirs: installdirs-recursive
installdirs-am:
@@ -69932,7 +69978,7 @@
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
-@@ -2916,13 +2212,13 @@
+@@ -2916,13 +2218,13 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -69948,7 +69994,7 @@
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-@@ -2932,12 +2228,14 @@
+@@ -2932,12 +2234,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -69964,7 +70010,7 @@
info: info-recursive
info-am:
-@@ -2945,15 +2243,23 @@
+@@ -2945,15 +2249,23 @@
install-data-am: install-data-local install-gtkincludeHEADERS \
install-gtkunixprintincludeHEADERS
@@ -69988,7 +70034,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -2976,35 +2282,34 @@
+@@ -2976,35 +2288,34 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-gtkincludeHEADERS \
@@ -70047,9 +70093,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in
---- a/gtk/tests/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/gtk/tests/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+Index: gtk+2.0-2.15.5/gtk/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gtk/tests/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/gtk/tests/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -70217,7 +70264,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -138,8 +198,6 @@
+@@ -120,6 +180,7 @@
+ 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 +199,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -70226,7 +70281,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,98 +208,20 @@
+@@ -150,98 +209,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -70326,7 +70381,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -252,32 +232,20 @@
+@@ -252,32 +233,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -70360,7 +70415,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -288,8 +256,6 @@
+@@ -288,8 +257,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -70369,7 +70424,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +267,10 @@
+@@ -301,28 +268,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -70398,7 +70453,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +279,25 @@
+@@ -331,22 +280,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -70429,7 +70484,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -368,8 +319,8 @@
+@@ -368,8 +320,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -70439,7 +70494,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,16 +329,20 @@
+@@ -378,16 +330,20 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -70463,7 +70518,7 @@
### testing rules
-@@ -412,7 +367,6 @@
+@@ -412,7 +368,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -70471,7 +70526,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -422,20 +376,16 @@
+@@ -422,20 +377,16 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -70492,7 +70547,7 @@
testing_SOURCES = testing.c
testing_LDADD = $(progs_ldadd)
liststore_SOURCES = liststore.c
-@@ -470,128 +420,39 @@
+@@ -470,128 +421,39 @@
defaultvalue_LDADD = $(progs_ldadd)
textbuffer_SOURCES = textbuffer.c pixbuf-init.c
textbuffer_LDADD = $(progs_ldadd)
@@ -70648,7 +70703,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -601,37 +462,37 @@
+@@ -601,37 +463,37 @@
done
builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES)
@rm -f builder$(EXEEXT)
@@ -70697,7 +70752,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -649,37 +510,25 @@
+@@ -649,37 +511,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/treeview-scrolling.Po at am__quote@
.c.o:
@@ -70747,7 +70802,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -687,26 +536,15 @@
+@@ -687,26 +537,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -70777,7 +70832,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -716,23 +554,23 @@
+@@ -716,23 +555,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -70810,7 +70865,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -744,29 +582,23 @@
+@@ -744,29 +583,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -70853,7 +70908,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -781,7 +613,6 @@
+@@ -781,7 +614,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -70861,7 +70916,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -802,7 +633,7 @@
+@@ -802,7 +634,7 @@
clean-generic:
distclean-generic:
@@ -70870,7 +70925,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -816,24 +647,34 @@
+@@ -816,24 +648,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -70906,7 +70961,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -854,18 +695,23 @@
+@@ -854,18 +696,23 @@
ps-am:
@@ -70939,9 +70994,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/gtk/theme-bits/Makefile.in b/gtk/theme-bits/Makefile.in
---- a/gtk/theme-bits/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/gtk/theme-bits/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+Index: gtk+2.0-2.15.5/gtk/theme-bits/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/gtk/theme-bits/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/gtk/theme-bits/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -71065,7 +71121,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +154,6 @@
+@@ -119,6 +136,7 @@
+ 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@
+@@ -137,8 +155,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -71074,7 +71138,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +164,20 @@
+@@ -149,98 +165,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -71174,7 +71238,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +188,20 @@
+@@ -251,32 +189,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -71208,7 +71272,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +212,6 @@
+@@ -287,8 +213,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -71217,7 +71281,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +223,10 @@
+@@ -300,28 +224,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -71246,7 +71310,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +235,25 @@
+@@ -330,22 +236,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -71277,7 +71341,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +275,8 @@
+@@ -367,8 +276,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -71287,7 +71351,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,14 +285,18 @@
+@@ -377,14 +286,18 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -71308,7 +71372,7 @@
TEST_PROGS =
### testing rules
-@@ -410,56 +322,46 @@
+@@ -410,56 +323,46 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -71392,7 +71456,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -469,10 +371,10 @@
+@@ -469,10 +372,10 @@
done
decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES)
@rm -f decompose-bits$(EXEEXT)
@@ -71405,7 +71469,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -480,37 +382,25 @@
+@@ -480,37 +383,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/decompose-bits.Po at am__quote@
.c.o:
@@ -71455,7 +71519,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -518,26 +408,15 @@
+@@ -518,26 +409,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -71485,7 +71549,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -547,23 +426,23 @@
+@@ -547,23 +427,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -71518,7 +71582,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -575,29 +454,23 @@
+@@ -575,29 +455,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -71561,7 +71625,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -612,7 +485,6 @@
+@@ -612,7 +486,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -71569,7 +71633,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -633,7 +505,7 @@
+@@ -633,7 +506,7 @@
clean-generic:
distclean-generic:
@@ -71578,7 +71642,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -647,24 +519,34 @@
+@@ -647,24 +520,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -71614,7 +71678,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -685,18 +567,23 @@
+@@ -685,18 +568,23 @@
ps-am:
@@ -71647,9 +71711,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/INSTALL b/INSTALL
---- a/INSTALL 2009-03-02 17:11:28.000000000 -0300
-+++ b/INSTALL 2009-03-02 19:33:07.000000000 -0300
+Index: gtk+2.0-2.15.5/INSTALL
+===================================================================
+--- gtk+2.0-2.15.5.orig/INSTALL 2009-03-02 17:11:28.000000000 -0300
++++ gtk+2.0-2.15.5/INSTALL 2009-03-03 01:12:42.000000000 -0300
@@ -1,41 +1,237 @@
-Prerequisites
-=============
@@ -71924,9 +71989,10 @@
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
-diff -urN a/install-sh b/install-sh
---- a/install-sh 2009-02-24 00:53:12.000000000 -0300
-+++ b/install-sh 2009-03-02 19:32:58.000000000 -0300
+Index: gtk+2.0-2.15.5/install-sh
+===================================================================
+--- gtk+2.0-2.15.5.orig/install-sh 2009-02-24 00:53:12.000000000 -0300
++++ gtk+2.0-2.15.5/install-sh 2009-03-03 01:12:42.000000000 -0300
@@ -1,7 +1,8 @@
#!/bin/sh
-#
@@ -72632,9 +72698,10 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urN a/ltmain.sh b/ltmain.sh
---- a/ltmain.sh 2009-02-25 17:39:39.000000000 -0300
-+++ b/ltmain.sh 2008-04-29 18:33:55.000000000 -0300
+Index: gtk+2.0-2.15.5/ltmain.sh
+===================================================================
+--- gtk+2.0-2.15.5.orig/ltmain.sh 2009-02-25 17:39:39.000000000 -0300
++++ gtk+2.0-2.15.5/ltmain.sh 2009-03-03 01:12:42.000000000 -0300
@@ -1,83 +1,52 @@
-# Generated from ltmain.m4sh.
-
@@ -86848,9 +86915,10 @@
# End:
-# vi:sw=2
-
-diff -urN a/m4macros/Makefile.in b/m4macros/Makefile.in
---- a/m4macros/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/m4macros/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+Index: gtk+2.0-2.15.5/m4macros/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/m4macros/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/m4macros/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -86964,7 +87032,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +144,6 @@
+@@ -119,6 +126,7 @@
+ 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@
+@@ -137,8 +145,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -86973,7 +87049,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +154,20 @@
+@@ -149,98 +155,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -87073,7 +87149,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +178,20 @@
+@@ -251,32 +179,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -87107,7 +87183,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +202,6 @@
+@@ -287,8 +203,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -87116,7 +87192,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +213,10 @@
+@@ -300,28 +214,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -87145,7 +87221,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +225,25 @@
+@@ -330,22 +226,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -87176,7 +87252,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +265,8 @@
+@@ -367,8 +266,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -87186,7 +87262,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +275,12 @@
+@@ -377,9 +276,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -87200,7 +87276,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,56 +311,63 @@
+@@ -410,56 +312,63 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -87291,7 +87367,7 @@
done
tags: TAGS
TAGS:
-@@ -467,29 +375,23 @@
+@@ -467,29 +376,23 @@
ctags: CTAGS
CTAGS:
@@ -87334,7 +87410,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -504,9 +406,10 @@
+@@ -504,9 +407,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
@@ -87347,7 +87423,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -526,7 +429,7 @@
+@@ -526,7 +430,7 @@
clean-generic:
distclean-generic:
@@ -87356,7 +87432,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -537,24 +440,34 @@
+@@ -537,24 +441,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -87392,7 +87468,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -573,17 +486,22 @@
+@@ -573,17 +487,22 @@
ps-am:
@@ -87421,9 +87497,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/Makefile.in b/Makefile.in
---- a/Makefile.in 2009-03-02 16:04:17.000000000 -0300
-+++ b/Makefile.in 2009-03-02 19:33:07.000000000 -0300
+Index: gtk+2.0-2.15.5/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/Makefile.in 2009-03-02 16:04:17.000000000 -0300
++++ gtk+2.0-2.15.5/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -87453,7 +87530,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -37,11 +32,70 @@
+@@ -37,11 +32,71 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@@ -87508,7 +87585,8 @@
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
++ perf contrib docs m4macros
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
@@ -87526,7 +87604,7 @@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
-@@ -52,22 +106,17 @@
+@@ -52,22 +107,17 @@
AWK = @AWK@
BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
@@ -87550,7 +87628,7 @@
CUPS_API_MAJOR = @CUPS_API_MAJOR@
CUPS_API_MINOR = @CUPS_API_MINOR@
CUPS_CFLAGS = @CUPS_CFLAGS@
-@@ -82,21 +131,16 @@
+@@ -82,21 +132,16 @@
DB2HTML = @DB2HTML@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -87575,7 +87653,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -138,8 +182,6 @@
+@@ -120,6 +165,7 @@
+ 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 +184,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -87584,7 +87670,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,98 +192,20 @@
+@@ -150,98 +194,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -87684,7 +87770,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -252,32 +216,20 @@
+@@ -252,32 +218,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -87718,7 +87804,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -288,8 +240,6 @@
+@@ -288,8 +242,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -87727,7 +87813,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +251,10 @@
+@@ -301,28 +253,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -87756,7 +87842,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +263,25 @@
+@@ -331,22 +265,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -87787,7 +87873,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -368,8 +303,8 @@
+@@ -368,8 +305,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -87797,7 +87883,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,122 +313,71 @@
+@@ -378,122 +315,71 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -87979,12 +88065,14 @@
TEST_PROGS =
### testing rules
-@@ -519,18 +403,15 @@
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+@@ -520,17 +406,17 @@
&& DISPLAY=:$$XID && export DISPLAY
--
- SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++# don't build perf measurement tools in static builds
++ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4
@@ -88000,7 +88088,7 @@
DISTCLEANFILES = \
gtk+-unix-print-2.0.pc \
gtk+-$(GDKTARGET)-2.0.pc \
-@@ -541,95 +422,83 @@
+@@ -541,95 +427,83 @@
gail-uninstalled.pc \
config.lt
@@ -88138,7 +88226,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-@@ -640,24 +509,22 @@
+@@ -640,24 +514,22 @@
distclean-libtool:
-rm -f libtool
@@ -88170,7 +88258,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -667,7 +534,13 @@
+@@ -667,7 +539,13 @@
# (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):
@@ -88185,7 +88273,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -679,15 +552,20 @@
+@@ -679,15 +557,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -88210,7 +88298,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -708,7 +586,7 @@
+@@ -708,7 +591,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -88219,7 +88307,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -719,35 +597,30 @@
+@@ -719,35 +602,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -88262,7 +88350,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -755,23 +628,23 @@
+@@ -755,23 +633,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -88295,7 +88383,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -783,40 +656,25 @@
+@@ -783,40 +661,25 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -88350,7 +88438,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -827,15 +685,19 @@
+@@ -827,15 +690,19 @@
|| exit 1; \
fi; \
done
@@ -88375,7 +88463,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -846,22 +708,55 @@
+@@ -846,22 +713,55 @@
-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 \
@@ -88436,7 +88524,7 @@
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
-@@ -881,19 +776,20 @@
+@@ -881,19 +781,20 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
@@ -88462,7 +88550,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -918,8 +814,9 @@
+@@ -918,8 +819,9 @@
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
@@ -88474,7 +88562,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -939,7 +836,7 @@
+@@ -939,7 +841,7 @@
clean-generic:
distclean-generic:
@@ -88483,7 +88571,7 @@
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
-@@ -952,13 +849,15 @@
+@@ -952,13 +854,15 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
@@ -88501,7 +88589,7 @@
info: info-recursive
info-am:
-@@ -967,12 +866,20 @@
+@@ -967,12 +871,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -88522,7 +88610,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -993,29 +900,28 @@
+@@ -993,29 +905,28 @@
ps-am:
@@ -88572,9 +88660,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/missing b/missing
---- a/missing 2009-02-24 00:53:12.000000000 -0300
-+++ b/missing 2009-03-02 19:32:58.000000000 -0300
+Index: gtk+2.0-2.15.5/missing
+===================================================================
+--- gtk+2.0-2.15.5.orig/missing 2009-02-24 00:53:12.000000000 -0300
++++ gtk+2.0-2.15.5/missing 2009-03-03 01:12:42.000000000 -0300
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -88970,9 +89059,10 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -urN a/mkinstalldirs b/mkinstalldirs
---- a/mkinstalldirs 2009-02-24 00:53:12.000000000 -0300
-+++ b/mkinstalldirs 2009-03-02 19:33:07.000000000 -0300
+Index: gtk+2.0-2.15.5/mkinstalldirs
+===================================================================
+--- gtk+2.0-2.15.5.orig/mkinstalldirs 2009-02-24 00:53:12.000000000 -0300
++++ gtk+2.0-2.15.5/mkinstalldirs 2009-03-03 01:12:42.000000000 -0300
@@ -1,21 +1,36 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -89133,9 +89223,10 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -urN a/modules/engines/Makefile.in b/modules/engines/Makefile.in
---- a/modules/engines/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/modules/engines/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/engines/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/engines/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/modules/engines/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -89253,7 +89344,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +146,6 @@
+@@ -119,6 +128,7 @@
+ 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@
+@@ -137,8 +147,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -89262,7 +89361,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +156,20 @@
+@@ -149,98 +157,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -89362,7 +89461,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +180,20 @@
+@@ -251,32 +181,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -89396,7 +89495,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +204,6 @@
+@@ -287,8 +205,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -89405,7 +89504,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +215,10 @@
+@@ -300,28 +216,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -89434,7 +89533,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +227,25 @@
+@@ -330,22 +228,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -89465,7 +89564,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +267,8 @@
+@@ -367,8 +268,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -89475,7 +89574,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +277,12 @@
+@@ -377,9 +278,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -89489,7 +89588,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,33 +313,40 @@
+@@ -410,33 +314,40 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -89550,7 +89649,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -444,10 +354,6 @@
+@@ -444,10 +355,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -89561,7 +89660,7 @@
# 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,
-@@ -455,7 +361,13 @@
+@@ -455,7 +362,13 @@
# (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):
@@ -89576,7 +89675,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -467,15 +379,20 @@
+@@ -467,15 +380,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -89601,7 +89700,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -496,7 +413,7 @@
+@@ -496,7 +414,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -89610,7 +89709,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -507,35 +424,30 @@
+@@ -507,35 +425,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -89653,7 +89752,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -543,23 +455,23 @@
+@@ -543,23 +456,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -89686,7 +89785,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -571,29 +483,23 @@
+@@ -571,29 +484,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -89729,7 +89828,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -606,13 +512,17 @@
+@@ -606,13 +513,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -89751,7 +89850,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -623,7 +533,6 @@
+@@ -623,7 +534,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -89759,7 +89858,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -643,7 +552,7 @@
+@@ -643,7 +553,7 @@
clean-generic:
distclean-generic:
@@ -89768,7 +89867,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -654,25 +563,34 @@
+@@ -654,25 +564,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -89805,7 +89904,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -691,26 +609,24 @@
+@@ -691,26 +610,24 @@
ps-am:
@@ -89848,9 +89947,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/engines/ms-windows/Makefile.in b/modules/engines/ms-windows/Makefile.in
---- a/modules/engines/ms-windows/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/modules/engines/ms-windows/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/engines/ms-windows/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/engines/ms-windows/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/modules/engines/ms-windows/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -89999,7 +90099,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +179,6 @@
+@@ -119,6 +161,7 @@
+ 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@
+@@ -137,8 +180,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -90008,7 +90116,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +189,20 @@
+@@ -149,98 +190,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -90108,7 +90216,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +213,20 @@
+@@ -251,32 +214,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -90142,7 +90250,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +237,6 @@
+@@ -287,8 +238,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -90151,7 +90259,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +248,10 @@
+@@ -300,28 +249,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -90180,7 +90288,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +260,25 @@
+@@ -330,22 +261,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -90211,7 +90319,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +300,8 @@
+@@ -367,8 +301,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -90221,7 +90329,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +310,12 @@
+@@ -377,9 +311,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -90235,7 +90343,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +346,7 @@
+@@ -410,9 +347,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -90245,7 +90353,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -420,18 +354,14 @@
+@@ -420,18 +355,14 @@
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEP_CFLAGS)
@@ -90264,7 +90372,7 @@
libwimp_la_SOURCES = \
msw_rc_style.c \
msw_rc_style.h \
-@@ -442,95 +372,75 @@
+@@ -442,95 +373,75 @@
xp_theme_defs.h \
xp_theme.h
@@ -90397,7 +90505,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -541,37 +451,25 @@
+@@ -541,37 +452,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xp_theme.Plo at am__quote@
.c.o:
@@ -90447,7 +90555,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -579,10 +477,6 @@
+@@ -579,10 +478,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -90458,7 +90566,7 @@
# 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,
-@@ -590,7 +484,13 @@
+@@ -590,7 +485,13 @@
# (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):
@@ -90473,7 +90581,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -602,15 +502,20 @@
+@@ -602,15 +503,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -90498,7 +90606,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -631,7 +536,7 @@
+@@ -631,7 +537,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -90507,7 +90615,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -642,35 +547,30 @@
+@@ -642,35 +548,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -90550,7 +90658,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -678,23 +578,23 @@
+@@ -678,23 +579,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -90583,7 +90691,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -706,29 +606,23 @@
+@@ -706,29 +607,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -90626,7 +90734,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -739,15 +633,19 @@
+@@ -739,15 +634,19 @@
|| exit 1; \
fi; \
done
@@ -90651,7 +90759,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -758,8 +656,9 @@
+@@ -758,8 +657,9 @@
all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
@@ -90663,7 +90771,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -779,7 +678,7 @@
+@@ -779,7 +679,7 @@
clean-generic:
distclean-generic:
@@ -90672,7 +90780,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -793,24 +692,34 @@
+@@ -793,24 +693,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -90708,7 +90816,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -831,28 +740,27 @@
+@@ -831,28 +741,27 @@
ps-am:
@@ -90755,9 +90863,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- a/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-03-02 19:33:04.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -90871,7 +90980,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +144,6 @@
+@@ -119,6 +126,7 @@
+ 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@
+@@ -137,8 +145,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -90880,7 +90997,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +154,20 @@
+@@ -149,98 +155,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -90980,7 +91097,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +178,20 @@
+@@ -251,32 +179,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -91014,7 +91131,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +202,6 @@
+@@ -287,8 +203,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -91023,7 +91140,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +213,10 @@
+@@ -300,28 +214,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -91052,7 +91169,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +225,25 @@
+@@ -330,22 +226,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -91083,7 +91200,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +265,8 @@
+@@ -367,8 +266,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -91093,7 +91210,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +275,12 @@
+@@ -377,9 +276,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -91107,7 +91224,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,54 +311,62 @@
+@@ -410,54 +312,62 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -91196,7 +91313,7 @@
done
tags: TAGS
TAGS:
-@@ -465,29 +374,23 @@
+@@ -465,29 +375,23 @@
ctags: CTAGS
CTAGS:
@@ -91239,7 +91356,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -502,9 +405,10 @@
+@@ -502,9 +406,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(DATA)
@@ -91252,7 +91369,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -524,7 +428,7 @@
+@@ -524,7 +429,7 @@
clean-generic:
distclean-generic:
@@ -91261,7 +91378,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -535,24 +439,34 @@
+@@ -535,24 +440,34 @@
distclean: distclean-am
-rm -f Makefile
@@ -91297,7 +91414,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -571,17 +485,21 @@
+@@ -571,17 +486,21 @@
ps-am:
@@ -91327,9 +91444,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/engines/ms-windows/Theme/Makefile.in b/modules/engines/ms-windows/Theme/Makefile.in
---- a/modules/engines/ms-windows/Theme/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/modules/engines/ms-windows/Theme/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/engines/ms-windows/Theme/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/modules/engines/ms-windows/Theme/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -91447,7 +91565,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +146,6 @@
+@@ -119,6 +128,7 @@
+ 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@
+@@ -137,8 +147,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -91456,7 +91582,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +156,20 @@
+@@ -149,98 +157,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -91556,7 +91682,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +180,20 @@
+@@ -251,32 +181,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -91590,7 +91716,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +204,6 @@
+@@ -287,8 +205,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -91599,7 +91725,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +215,10 @@
+@@ -300,28 +216,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -91628,7 +91754,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +227,25 @@
+@@ -330,22 +228,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -91659,7 +91785,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +267,8 @@
+@@ -367,8 +268,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -91669,7 +91795,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +277,12 @@
+@@ -377,9 +278,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -91683,7 +91809,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,31 +313,39 @@
+@@ -410,31 +314,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -91742,7 +91868,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,10 +353,6 @@
+@@ -442,10 +354,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -91753,7 +91879,7 @@
# 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,
-@@ -453,7 +360,13 @@
+@@ -453,7 +361,13 @@
# (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):
@@ -91768,7 +91894,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -465,15 +378,20 @@
+@@ -465,15 +379,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -91793,7 +91919,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -494,7 +412,7 @@
+@@ -494,7 +413,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -91802,7 +91928,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -505,35 +423,30 @@
+@@ -505,35 +424,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -91845,7 +91971,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -541,23 +454,23 @@
+@@ -541,23 +455,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -91878,7 +92004,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -569,29 +482,23 @@
+@@ -569,29 +483,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -91921,7 +92047,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,15 +509,19 @@
+@@ -602,15 +510,19 @@
|| exit 1; \
fi; \
done
@@ -91946,7 +92072,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -621,7 +532,6 @@
+@@ -621,7 +533,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -91954,7 +92080,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -641,7 +551,7 @@
+@@ -641,7 +552,7 @@
clean-generic:
distclean-generic:
@@ -91963,7 +92089,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,25 +562,34 @@
+@@ -652,25 +563,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -92000,7 +92126,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -689,26 +608,24 @@
+@@ -689,26 +609,24 @@
ps-am:
@@ -92043,9 +92169,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/engines/pixbuf/Makefile.in b/modules/engines/pixbuf/Makefile.in
---- a/modules/engines/pixbuf/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/modules/engines/pixbuf/Makefile.in 2009-03-02 19:33:04.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/engines/pixbuf/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/engines/pixbuf/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/modules/engines/pixbuf/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -92185,7 +92312,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +170,6 @@
+@@ -119,6 +152,7 @@
+ 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@
+@@ -137,8 +171,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -92194,7 +92329,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +180,20 @@
+@@ -149,98 +181,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -92294,7 +92429,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +204,20 @@
+@@ -251,32 +205,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -92328,7 +92463,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +228,6 @@
+@@ -287,8 +229,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -92337,7 +92472,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +239,10 @@
+@@ -300,28 +240,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -92366,7 +92501,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +251,25 @@
+@@ -330,22 +252,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -92397,7 +92532,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +291,8 @@
+@@ -367,8 +292,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -92407,7 +92542,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +301,12 @@
+@@ -377,9 +302,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -92421,7 +92556,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +337,7 @@
+@@ -410,9 +338,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -92431,7 +92566,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -420,18 +345,14 @@
+@@ -420,18 +346,14 @@
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEP_CFLAGS)
@@ -92450,7 +92585,7 @@
libpixmap_la_SOURCES = \
pixbuf-draw.c \
pixbuf-main.c \
-@@ -441,85 +362,73 @@
+@@ -441,85 +363,73 @@
pixbuf-style.h \
pixbuf.h
@@ -92573,7 +92708,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -530,37 +439,25 @@
+@@ -530,37 +440,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pixbuf-render.Plo at am__quote@
.c.o:
@@ -92623,7 +92758,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -568,26 +465,15 @@
+@@ -568,26 +466,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -92653,7 +92788,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -597,23 +483,23 @@
+@@ -597,23 +484,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -92686,7 +92821,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -625,29 +511,23 @@
+@@ -625,29 +512,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -92729,7 +92864,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -662,9 +542,10 @@
+@@ -662,9 +543,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES)
@@ -92742,7 +92877,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -684,7 +565,7 @@
+@@ -684,7 +566,7 @@
clean-generic:
distclean-generic:
@@ -92751,7 +92886,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -698,24 +579,34 @@
+@@ -698,24 +580,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -92787,7 +92922,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -736,20 +627,24 @@
+@@ -736,20 +628,24 @@
ps-am:
@@ -92822,9 +92957,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/input/Makefile.in b/modules/input/Makefile.in
---- a/modules/input/Makefile.in 2009-03-02 16:04:21.000000000 -0300
-+++ b/modules/input/Makefile.in 2009-03-02 19:33:04.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/input/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/input/Makefile.in 2009-03-02 16:04:21.000000000 -0300
++++ gtk+2.0-2.15.5/modules/input/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -93163,7 +93299,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +369,6 @@
+@@ -119,6 +351,7 @@
+ 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@
+@@ -137,8 +370,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -93172,7 +93316,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +379,20 @@
+@@ -149,98 +380,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -93272,7 +93416,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +403,20 @@
+@@ -251,32 +404,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -93306,7 +93450,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +427,6 @@
+@@ -287,8 +428,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -93315,7 +93459,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +438,10 @@
+@@ -300,28 +439,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -93344,7 +93488,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +450,25 @@
+@@ -330,22 +451,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -93375,7 +93519,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +490,8 @@
+@@ -367,8 +491,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -93385,7 +93529,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +500,12 @@
+@@ -377,9 +501,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -93399,7 +93543,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +536,7 @@
+@@ -410,9 +537,7 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -93409,7 +93553,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -424,22 +548,18 @@
+@@ -424,22 +549,18 @@
$(GTK_DEP_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE)
@@ -93432,7 +93576,7 @@
im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_xim_la_SOURCES = \
gtkimcontextxim.c \
-@@ -450,42 +570,36 @@
+@@ -450,42 +571,36 @@
im_xim_la_LIBADD = $(LDADDS)
@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE at STATIC_XIM_MODULE = libstatic-im-xim.la
@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE at XIM_MODULE = im-xim.la
@@ -93475,7 +93619,7 @@
im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_thai_la_SOURCES = \
thai-charprop.c \
-@@ -498,28 +612,24 @@
+@@ -498,28 +613,24 @@
im_thai_la_LIBADD = $(LDADDS)
@INCLUDE_IM_THAI_TRUE at STATIC_THAI_MODULE = libstatic-im-thai.la
@INCLUDE_IM_THAI_FALSE at THAI_MODULE = im-thai.la
@@ -93504,7 +93648,7 @@
im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
im_ime_la_SOURCES = \
gtkimcontextime.c \
-@@ -532,7 +642,6 @@
+@@ -532,7 +643,6 @@
libstatic_im_ime_la_LIBADD = -limm32
@INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE at STATIC_IME_MODULE = libstatic-im-ime.la
@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE at IME_MODULE = im-ime.la
@@ -93512,7 +93656,7 @@
multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
im_multipress_la_CPPFLAGS = $(multipress_defs)
libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
-@@ -546,13 +655,10 @@
+@@ -546,13 +656,11 @@
im_multipress_la_LIBADD = $(LDADDS)
@INCLUDE_IM_MULTIPRESS_TRUE at STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la
@INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
@@ -93520,14 +93664,15 @@
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
-
-- at CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false
- @CROSS_COMPILING_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
--
-+ at CROSS_COMPILING_TRUE@RUN_QUERY_IMMODULES_TEST = false
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
++ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
+ @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
+- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
+-
@BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
@BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
@BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \
-@@ -567,7 +673,6 @@
+@@ -567,7 +675,6 @@
@BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \
@BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE)
@@ -93535,7 +93680,7 @@
noinst_LTLIBRARIES = \
$(STATIC_AM_ET_MODULE) \
$(STATIC_CEDILLA_MODULE) \
-@@ -582,234 +687,64 @@
+@@ -582,234 +689,64 @@
$(STATIC_VIQR_MODULE) \
$(STATIC_XIM_MODULE)
@@ -93805,7 +93950,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -818,61 +753,61 @@
+@@ -818,61 +755,61 @@
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -93893,7 +94038,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -898,214 +833,86 @@
+@@ -898,214 +835,86 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/thai-charprop.Plo at am__quote@
.c.o:
@@ -94146,7 +94291,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -1115,23 +922,23 @@
+@@ -1115,23 +924,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -94179,7 +94324,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1143,29 +950,23 @@
+@@ -1143,29 +952,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -94222,7 +94367,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1179,10 +980,12 @@
+@@ -1179,10 +982,12 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
@@ -94237,7 +94382,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -1203,7 +1006,7 @@
+@@ -1203,7 +1008,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
@@ -94246,7 +94391,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1217,12 +1020,14 @@
+@@ -1217,12 +1022,14 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -94262,7 +94407,7 @@
info: info-am
info-am:
-@@ -1231,12 +1036,20 @@
+@@ -1231,12 +1038,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -94283,7 +94428,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1257,22 +1070,27 @@
+@@ -1257,22 +1072,27 @@
ps-am:
@@ -94318,9 +94463,30 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/Makefile.in b/modules/Makefile.in
---- a/modules/Makefile.in 2009-03-02 16:04:20.000000000 -0300
-+++ b/modules/Makefile.in 2009-03-02 19:33:03.000000000 -0300
+@@ -1355,7 +1175,18 @@
+ included-modules: $(noinst_LTLIBRARIES)
+
+ gtk.immodules: Makefile.am $(module_LTLIBRARIES)
+- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
++ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
++ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > gtk.immodules" ; \
++ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules; \
++ else \
++ echo "***" ; \
++ echo "*** Warning: gtk.immodules not built" ; \
++ echo "***" ; \
++ echo "*** Generate this file manually on host" ; \
++ echo "*** system using gtk-query-immodules-2.0" ; \
++ echo "***" ; \
++ touch gtk.immodules; \
++ fi
+
+ @CROSS_COMPILING_FALSE at all-local: gtk.immodules
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: gtk+2.0-2.15.5/modules/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/Makefile.in 2009-03-02 16:04:20.000000000 -0300
++++ gtk+2.0-2.15.5/modules/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -94439,7 +94605,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -138,8 +147,6 @@
+@@ -120,6 +129,7 @@
+ 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 +148,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -94448,7 +94622,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -150,98 +157,20 @@
+@@ -150,98 +158,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -94548,7 +94722,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -252,32 +181,20 @@
+@@ -252,32 +182,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -94582,7 +94756,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -288,8 +205,6 @@
+@@ -288,8 +206,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -94591,7 +94765,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -301,28 +216,10 @@
+@@ -301,28 +217,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -94620,7 +94794,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -331,22 +228,25 @@
+@@ -331,22 +229,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -94651,7 +94825,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -368,8 +268,8 @@
+@@ -368,8 +269,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -94661,7 +94835,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -378,9 +278,12 @@
+@@ -378,9 +279,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -94675,7 +94849,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -411,31 +314,39 @@
+@@ -411,31 +315,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -94734,7 +94908,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -443,10 +354,6 @@
+@@ -443,10 +355,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -94745,7 +94919,7 @@
# 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,
-@@ -454,7 +361,13 @@
+@@ -454,7 +362,13 @@
# (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):
@@ -94760,7 +94934,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -466,15 +379,20 @@
+@@ -466,15 +380,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -94785,7 +94959,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -495,7 +413,7 @@
+@@ -495,7 +414,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -94794,7 +94968,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -506,35 +424,30 @@
+@@ -506,35 +425,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -94837,7 +95011,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -542,23 +455,23 @@
+@@ -542,23 +456,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -94870,7 +95044,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -570,29 +483,23 @@
+@@ -570,29 +484,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -94913,7 +95087,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -605,13 +512,17 @@
+@@ -605,13 +513,17 @@
done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
@@ -94935,7 +95109,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -622,7 +533,6 @@
+@@ -622,7 +534,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -94943,7 +95117,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -642,7 +552,7 @@
+@@ -642,7 +553,7 @@
clean-generic:
distclean-generic:
@@ -94952,7 +95126,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -653,25 +563,34 @@
+@@ -653,25 +564,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -94989,7 +95163,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -690,26 +609,24 @@
+@@ -690,26 +610,24 @@
ps-am:
@@ -95032,9 +95206,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/other/gail/libgail-util/Makefile.in b/modules/other/gail/libgail-util/Makefile.in
---- a/modules/other/gail/libgail-util/Makefile.in 2009-03-02 16:04:21.000000000 -0300
-+++ b/modules/other/gail/libgail-util/Makefile.in 2009-03-02 19:33:05.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/other/gail/libgail-util/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/other/gail/libgail-util/Makefile.in 2009-03-02 16:04:21.000000000 -0300
++++ gtk+2.0-2.15.5/modules/other/gail/libgail-util/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -95178,7 +95353,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +174,6 @@
+@@ -119,6 +156,7 @@
+ 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@
+@@ -137,8 +175,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -95187,7 +95370,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +184,20 @@
+@@ -149,98 +185,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -95287,7 +95470,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +208,20 @@
+@@ -251,32 +209,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -95321,7 +95504,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +232,6 @@
+@@ -287,8 +233,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -95330,7 +95513,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +243,10 @@
+@@ -300,28 +244,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -95359,7 +95542,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +255,25 @@
+@@ -330,22 +256,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -95390,7 +95573,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +295,8 @@
+@@ -367,8 +296,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -95400,7 +95583,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +305,12 @@
+@@ -377,9 +306,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -95414,7 +95597,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -412,32 +343,24 @@
+@@ -412,32 +344,24 @@
@OS_WIN32_TRUE at export_symbols = -export-symbols $(srcdir)/gailutil.def
@OS_WIN32_TRUE at no_undefined = -no-undefined
@@ -95447,7 +95630,7 @@
libgailutil_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -448,102 +371,87 @@
+@@ -448,102 +372,87 @@
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
@@ -95587,7 +95770,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -552,148 +460,72 @@
+@@ -552,148 +461,72 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgailutil_la-gailtextutil.Plo at am__quote@
.c.o:
@@ -95766,7 +95949,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -703,23 +535,23 @@
+@@ -703,23 +536,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -95799,7 +95982,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -731,29 +563,23 @@
+@@ -731,29 +564,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -95842,7 +96025,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -768,9 +594,10 @@
+@@ -768,9 +595,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
@@ -95855,7 +96038,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -790,7 +617,7 @@
+@@ -790,7 +618,7 @@
clean-generic:
distclean-generic:
@@ -95864,7 +96047,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -804,24 +631,34 @@
+@@ -804,24 +632,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -95900,7 +96083,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -842,21 +679,25 @@
+@@ -842,21 +680,25 @@
ps-am:
@@ -95937,9 +96120,10 @@
uninstall-libgailutilincludeHEADERS uninstall-local
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/other/gail/Makefile.in b/modules/other/gail/Makefile.in
---- a/modules/other/gail/Makefile.in 2009-03-02 16:04:21.000000000 -0300
-+++ b/modules/other/gail/Makefile.in 2009-03-02 19:33:05.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/other/gail/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/other/gail/Makefile.in 2009-03-02 16:04:21.000000000 -0300
++++ gtk+2.0-2.15.5/modules/other/gail/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -96123,7 +96307,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +214,6 @@
+@@ -119,6 +196,7 @@
+ 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@
+@@ -137,8 +215,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -96132,7 +96324,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +224,20 @@
+@@ -149,98 +225,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -96232,7 +96424,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +248,20 @@
+@@ -251,32 +249,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -96266,7 +96458,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +272,6 @@
+@@ -287,8 +273,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -96275,7 +96467,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +283,10 @@
+@@ -300,28 +284,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -96304,7 +96496,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +295,25 @@
+@@ -330,22 +296,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -96335,7 +96527,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +335,8 @@
+@@ -367,8 +336,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -96345,7 +96537,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +345,12 @@
+@@ -377,9 +346,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -96359,7 +96551,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,14 +381,10 @@
+@@ -410,14 +382,10 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -96374,7 +96566,7 @@
gail_c_sources = \
gail-private-macros.h \
gail.c \
-@@ -477,9 +444,7 @@
+@@ -477,9 +445,7 @@
gailwidget.c \
gailwindow.c
@@ -96384,7 +96576,7 @@
gail_private_h_sources = \
gail.h \
gailadjustment.h \
-@@ -538,21 +503,17 @@
+@@ -538,21 +504,17 @@
gailutil.h \
gailwindow.h
@@ -96406,7 +96598,7 @@
libgail_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/modules/other \
-@@ -565,13 +526,11 @@
+@@ -565,13 +527,11 @@
-DGTK_DISABLE_DEPRECATED \
$(AM_CPPFLAGS)
@@ -96420,7 +96612,7 @@
libgail_la_LIBADD = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
-@@ -580,180 +539,76 @@
+@@ -580,180 +540,76 @@
$(GTK_DEP_LIBS) \
$(INTLLIBS)
@@ -96638,7 +96830,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -816,1912 +671,439 @@
+@@ -816,1912 +672,439 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgail_la-gailwindow.Plo at am__quote@
.c.o:
@@ -98794,7 +98986,7 @@
done
# This directory's subdirectories are mostly independent; you can cd
-@@ -2731,7 +1113,13 @@
+@@ -2731,7 +1114,13 @@
# (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):
@@ -98809,7 +99001,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2743,15 +1131,20 @@
+@@ -2743,15 +1132,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -98834,7 +99026,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -2772,7 +1165,7 @@
+@@ -2772,7 +1166,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -98843,7 +99035,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -2783,35 +1176,30 @@
+@@ -2783,35 +1177,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -98886,7 +99078,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -2819,23 +1207,23 @@
+@@ -2819,23 +1208,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -98919,7 +99111,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -2847,29 +1235,23 @@
+@@ -2847,29 +1236,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -98962,7 +99154,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -2880,15 +1262,19 @@
+@@ -2880,15 +1263,19 @@
|| exit 1; \
fi; \
done
@@ -98987,7 +99179,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -2899,8 +1285,9 @@
+@@ -2899,8 +1286,9 @@
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs: installdirs-recursive
installdirs-am:
@@ -98999,7 +99191,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -2920,7 +1307,7 @@
+@@ -2920,7 +1308,7 @@
clean-generic:
distclean-generic:
@@ -99008,7 +99200,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -2934,24 +1321,35 @@
+@@ -2934,24 +1322,35 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -99046,7 +99238,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -2972,30 +1370,28 @@
+@@ -2972,30 +1371,28 @@
ps-am:
@@ -99096,9 +99288,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/other/gail/tests/Makefile.in b/modules/other/gail/tests/Makefile.in
---- a/modules/other/gail/tests/Makefile.in 2009-03-02 16:04:21.000000000 -0300
-+++ b/modules/other/gail/tests/Makefile.in 2009-03-02 19:33:05.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/other/gail/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/other/gail/tests/Makefile.in 2009-03-02 16:04:21.000000000 -0300
++++ gtk+2.0-2.15.5/modules/other/gail/tests/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -99363,7 +99556,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +295,6 @@
+@@ -119,6 +277,7 @@
+ 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@
+@@ -137,8 +296,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -99372,7 +99573,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +305,20 @@
+@@ -149,98 +306,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -99472,7 +99673,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +329,20 @@
+@@ -251,32 +330,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -99506,7 +99707,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +353,6 @@
+@@ -287,8 +354,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -99515,7 +99716,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +364,10 @@
+@@ -300,28 +365,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -99544,7 +99745,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +376,25 @@
+@@ -330,22 +377,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -99575,7 +99776,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +416,8 @@
+@@ -367,8 +417,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -99585,7 +99786,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +426,12 @@
+@@ -377,9 +427,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -99599,7 +99800,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,15 +462,11 @@
+@@ -410,15 +463,11 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -99615,7 +99816,7 @@
noinst_LTLIBRARIES = \
libtestaction.la \
libtestbutton.la \
-@@ -439,7 +487,6 @@
+@@ -439,7 +488,6 @@
libtesttreetable.la \
libtestvalues.la
@@ -99623,7 +99824,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-@@ -449,34 +496,28 @@
+@@ -449,34 +497,28 @@
-DGDK_DISABLE_DEPRECATED\
-DGTK_DISABLE_DEPRECATED
@@ -99658,7 +99859,7 @@
libtestaction_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -484,13 +525,11 @@
+@@ -484,13 +526,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99672,7 +99873,7 @@
libtestbutton_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -498,13 +537,11 @@
+@@ -498,13 +538,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99686,7 +99887,7 @@
libtestcombo_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -512,11 +549,9 @@
+@@ -512,11 +550,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99698,7 +99899,7 @@
libtestcomponent_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -524,11 +559,9 @@
+@@ -524,11 +560,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99710,7 +99911,7 @@
libtestimage_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -536,13 +569,11 @@
+@@ -536,13 +570,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99724,7 +99925,7 @@
libtestmenuitem_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -550,13 +581,11 @@
+@@ -550,13 +582,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99738,7 +99939,7 @@
libtestnotebook_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -564,13 +593,11 @@
+@@ -564,13 +594,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99752,7 +99953,7 @@
libtestobject_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -578,13 +605,11 @@
+@@ -578,13 +606,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99766,7 +99967,7 @@
libtestoptionmenu_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -592,13 +617,11 @@
+@@ -592,13 +618,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99780,7 +99981,7 @@
libtestpaned_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -606,13 +629,11 @@
+@@ -606,13 +630,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99794,7 +99995,7 @@
libtestprops_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -620,11 +641,9 @@
+@@ -620,11 +642,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99806,7 +100007,7 @@
libtestselection_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -632,11 +651,9 @@
+@@ -632,11 +652,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99818,7 +100019,7 @@
libteststatusbar_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -644,7 +661,6 @@
+@@ -644,7 +662,6 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99826,7 +100027,7 @@
libtesttable_la_SOURCES = \
testlib.c \
testlib.h \
-@@ -652,7 +668,6 @@
+@@ -652,7 +669,6 @@
testtextlib.h \
testtable.c
@@ -99834,7 +100035,7 @@
libtesttable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -660,7 +675,6 @@
+@@ -660,7 +676,6 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99842,7 +100043,7 @@
libtesttext_la_SOURCES = \
testlib.c \
testlib.h \
-@@ -668,7 +682,6 @@
+@@ -668,7 +683,6 @@
testtextlib.h \
testtext.c
@@ -99850,7 +100051,7 @@
libtesttext_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -676,13 +689,11 @@
+@@ -676,13 +690,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99864,7 +100065,7 @@
libtesttoplevel_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -690,13 +701,11 @@
+@@ -690,13 +702,11 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99878,7 +100079,7 @@
libtesttreetable_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -704,11 +713,9 @@
+@@ -704,11 +714,9 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -99890,7 +100091,7 @@
libtestvalues_la_LDFLAGS = \
-rpath $(moduledir) -module -avoid-version $(no_undefined) \
$(top_builddir)/gtk/$(gtktargetlib) \
-@@ -716,150 +723,63 @@
+@@ -716,150 +724,63 @@
$(GTK_DEP_LIBS) \
$(LDFLAGS)
@@ -100076,7 +100277,7 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-@@ -868,51 +788,51 @@
+@@ -868,51 +789,51 @@
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
@@ -100149,7 +100350,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -940,37 +860,25 @@
+@@ -940,37 +861,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testvalues.Plo at am__quote@
.c.o:
@@ -100199,7 +100400,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -978,26 +886,15 @@
+@@ -978,26 +887,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -100229,7 +100430,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -1007,23 +904,23 @@
+@@ -1007,23 +905,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -100262,7 +100463,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1035,29 +932,23 @@
+@@ -1035,29 +933,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -100305,7 +100506,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1072,9 +963,10 @@
+@@ -1072,9 +964,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES)
@@ -100318,7 +100519,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -1094,7 +986,7 @@
+@@ -1094,7 +987,7 @@
clean-generic:
distclean-generic:
@@ -100327,7 +100528,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1108,24 +1000,34 @@
+@@ -1108,24 +1001,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -100363,7 +100564,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -1146,20 +1048,24 @@
+@@ -1146,20 +1049,24 @@
ps-am:
@@ -100397,9 +100598,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/other/Makefile.in b/modules/other/Makefile.in
---- a/modules/other/Makefile.in 2009-03-02 16:04:21.000000000 -0300
-+++ b/modules/other/Makefile.in 2009-03-02 19:33:04.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/other/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/other/Makefile.in 2009-03-02 16:04:21.000000000 -0300
++++ gtk+2.0-2.15.5/modules/other/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -100517,7 +100719,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +146,6 @@
+@@ -119,6 +128,7 @@
+ 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@
+@@ -137,8 +147,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -100526,7 +100736,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +156,20 @@
+@@ -149,98 +157,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -100626,7 +100836,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +180,20 @@
+@@ -251,32 +181,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -100660,7 +100870,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +204,6 @@
+@@ -287,8 +205,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -100669,7 +100879,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +215,10 @@
+@@ -300,28 +216,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -100698,7 +100908,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +227,25 @@
+@@ -330,22 +228,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -100729,7 +100939,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +267,8 @@
+@@ -367,8 +268,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -100739,7 +100949,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,9 +277,12 @@
+@@ -377,9 +278,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -100753,7 +100963,7 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,31 +313,39 @@
+@@ -410,31 +314,39 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -100812,7 +101022,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -442,10 +353,6 @@
+@@ -442,10 +354,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -100823,7 +101033,7 @@
# 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,
-@@ -453,7 +360,13 @@
+@@ -453,7 +361,13 @@
# (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):
@@ -100838,7 +101048,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -465,15 +378,20 @@
+@@ -465,15 +379,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -100863,7 +101073,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -494,7 +412,7 @@
+@@ -494,7 +413,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -100872,7 +101082,7 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -505,35 +423,30 @@
+@@ -505,35 +424,30 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
@@ -100915,7 +101125,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
-@@ -541,23 +454,23 @@
+@@ -541,23 +455,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -100948,7 +101158,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -569,29 +482,23 @@
+@@ -569,29 +483,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -100991,7 +101201,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,15 +509,19 @@
+@@ -602,15 +510,19 @@
|| exit 1; \
fi; \
done
@@ -101016,7 +101226,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -621,7 +532,6 @@
+@@ -621,7 +533,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
@@ -101024,7 +101234,7 @@
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
-@@ -641,7 +551,7 @@
+@@ -641,7 +552,7 @@
clean-generic:
distclean-generic:
@@ -101033,7 +101243,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -652,25 +562,34 @@
+@@ -652,25 +563,34 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -101070,7 +101280,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -689,26 +608,24 @@
+@@ -689,26 +609,24 @@
ps-am:
@@ -101113,9 +101323,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/printbackends/cups/Makefile.in b/modules/printbackends/cups/Makefile.in
---- a/modules/printbackends/cups/Makefile.in 2009-03-02 16:04:22.000000000 -0300
-+++ b/modules/printbackends/cups/Makefile.in 2009-03-02 19:33:05.000000000 -0300
+Index: gtk+2.0-2.15.5/modules/printbackends/cups/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/printbackends/cups/Makefile.in 2009-03-02 16:04:22.000000000 -0300
++++ gtk+2.0-2.15.5/modules/printbackends/cups/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -101257,6 +101468,3145 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
+@@ -119,6 +154,7 @@
+ 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@
+@@ -137,8 +173,6 @@
+ 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@
+@@ -149,98 +183,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -251,32 +207,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -287,8 +231,6 @@
+ 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@
+@@ -300,28 +242,10 @@
+ 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@
+@@ -330,22 +254,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -367,8 +294,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -377,9 +304,12 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+
+@@ -410,9 +340,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-
+ @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
+-
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/gtk \
+@@ -424,107 +352,90 @@
+ $(GTK_DEP_CFLAGS) \
+ $(GTK_DEBUG_FLAGS)
+
+-
+ LDADDS = \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+
+-
+ backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+-
+ backend_LTLIBRARIES = libprintbackend-cups.la
+-
+ libprintbackend_cups_la_SOURCES = \
+ gtkprintbackendcups.c \
+ gtkprintercups.c \
+ gtkcupsutils.c
+
+-
+ noinst_HEADERS = \
+ gtkprintbackendcups.h \
+ gtkprintercups.h \
+ gtkcupsutils.h
+
+-
+ libprintbackend_cups_la_LDFLAGS = -avoid-version -module $(no_undefined)
+ libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS)
+-subdir = modules/printbackends/cups
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(backend_LTLIBRARIES)
+-
+-libprintbackend_cups_la_DEPENDENCIES = \
+- $(top_builddir)/gtk/$(gtktargetlib) \
+- $(top_builddir)/gdk/$(gdktargetlib)
+-am_libprintbackend_cups_la_OBJECTS = gtkprintbackendcups.lo \
+- gtkprintercups.lo gtkcupsutils.lo
+-libprintbackend_cups_la_OBJECTS = $(am_libprintbackend_cups_la_OBJECTS)
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkcupsutils.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gtkprintbackendcups.Plo \
+- at AMDEP_TRUE@ ./$(DEPDIR)/gtkprintercups.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 = $(libprintbackend_cups_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-
+-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)/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/printbackends/cups/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-backendLTLIBRARIES_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-backendLTLIBRARIES: $(backend_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
+- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
+ else :; fi; \
+ done
+
+ uninstall-backendLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+- p="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
+ done
+
+ clean-backendLTLIBRARIES:
+ -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
+ @list='$(backend_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
+ libprintbackend-cups.la: $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_DEPENDENCIES)
+- $(LINK) -rpath $(backenddir) $(libprintbackend_cups_la_LDFLAGS) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS)
++ $(libprintbackend_cups_la_LINK) -rpath $(backenddir) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -534,37 +445,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprintercups.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -572,26 +471,15 @@
+ 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)
+@@ -601,23 +489,23 @@
+ 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
+@@ -629,29 +517,23 @@
+
+ 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; \
+@@ -666,9 +548,10 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ for dir in "$(DESTDIR)$(backenddir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -688,7 +571,7 @@
+ 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"
+@@ -702,24 +585,34 @@
+ -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-backendLTLIBRARIES
+
++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
+@@ -740,20 +633,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
++uninstall-am: uninstall-backendLTLIBRARIES
++
++.MAKE: install-am install-strip
+
+ .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 \
+- install-am install-backendLTLIBRARIES 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-backendLTLIBRARIES \
+- 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-backendLTLIBRARIES 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-backendLTLIBRARIES
+
+ # call as: $(XVFB_START) && someprogram
+
+Index: gtk+2.0-2.15.5/modules/printbackends/file/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/printbackends/file/Makefile.in 2009-03-02 16:04:22.000000000 -0300
++++ gtk+2.0-2.15.5/modules/printbackends/file/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(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
++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)$(backenddir)"
++backendLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(backend_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libprintbackend_file_la_DEPENDENCIES = \
++ $(top_builddir)/gtk/$(gtktargetlib) \
++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1)
++am_libprintbackend_file_la_OBJECTS = \
++ libprintbackend_file_la-gtkprintbackendfile.lo
++libprintbackend_file_la_OBJECTS = \
++ $(am_libprintbackend_file_la_OBJECTS)
++libprintbackend_file_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++ $(libprintbackend_file_la_CFLAGS) $(CFLAGS) \
++ $(libprintbackend_file_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. at 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 = $(libprintbackend_file_la_SOURCES)
++DIST_SOURCES = $(libprintbackend_file_la_SOURCES)
++HEADERS = $(noinst_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 +96,17 @@
+ 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,21 +121,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -119,6 +154,7 @@
+ 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@
+@@ -137,8 +173,6 @@
+ 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@
+@@ -149,98 +183,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -251,32 +207,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -287,8 +231,6 @@
+ 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@
+@@ -300,28 +242,10 @@
+ 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@
+@@ -330,22 +254,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -367,8 +294,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -377,9 +304,12 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+
+@@ -410,17 +340,12 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-
+ @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
+-
+ backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+-
+ backend_LTLIBRARIES = libprintbackend-file.la
+-
+ libprintbackend_file_la_SOURCES = \
+ gtkprintbackendfile.c
+
+-
+ libprintbackend_file_la_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/gtk \
+@@ -430,100 +355,86 @@
+ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ $(AM_CPPFLAGS)
+
+-
+ libprintbackend_file_la_CFLAGS = \
+ $(GTK_DEP_CFLAGS) \
+ $(AM_CFLAGS)
+
+-
+ libprintbackend_file_la_LDFLAGS = \
+ -avoid-version -module $(no_undefined)
+
+-
+ libprintbackend_file_la_LIBADD = \
+ $(top_builddir)/gtk/$(gtktargetlib) \
+ $(top_builddir)/gdk/$(gdktargetlib) \
+ $(GTK_DEP_LIBS)
+
+-
+ noinst_HEADERS = \
+ gtkprintbackendfile.h
+
+-subdir = modules/printbackends/file
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(backend_LTLIBRARIES)
+-
+-libprintbackend_file_la_DEPENDENCIES = \
+- $(top_builddir)/gtk/$(gtktargetlib) \
+- $(top_builddir)/gdk/$(gdktargetlib)
+-am_libprintbackend_file_la_OBJECTS = \
+- libprintbackend_file_la-gtkprintbackendfile.lo
+-libprintbackend_file_la_OBJECTS = $(am_libprintbackend_file_la_OBJECTS)
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = \
+- at AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.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 = $(libprintbackend_file_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-
+-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)/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/printbackends/file/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/printbackends/file/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-backendLTLIBRARIES_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-backendLTLIBRARIES: $(backend_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
+- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
+ else :; fi; \
+ done
+
+ uninstall-backendLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+- p="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
+ done
+
+ clean-backendLTLIBRARIES:
+ -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
+ @list='$(backend_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
+ libprintbackend-file.la: $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_DEPENDENCIES)
+- $(LINK) -rpath $(backenddir) $(libprintbackend_file_la_LDFLAGS) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS)
++ $(libprintbackend_file_la_LINK) -rpath $(backenddir) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -531,70 +442,32 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+-
+-libprintbackend_file_la-gtkprintbackendfile.o: gtkprintbackendfile.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.o -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
+-
+-libprintbackend_file_la-gtkprintbackendfile.obj: gtkprintbackendfile.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libprintbackend_file_la-gtkprintbackendfile.lo: gtkprintbackendfile.c
+- at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -602,26 +475,15 @@
+ 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)
+@@ -631,23 +493,23 @@
+ 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
+@@ -659,29 +521,23 @@
+
+ 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; \
+@@ -696,9 +552,10 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ for dir in "$(DESTDIR)$(backenddir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -718,7 +575,7 @@
+ 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"
+@@ -732,24 +589,34 @@
+ -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-backendLTLIBRARIES
+
++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
+@@ -770,20 +637,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
++uninstall-am: uninstall-backendLTLIBRARIES
++
++.MAKE: install-am install-strip
+
+ .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 \
+- install-am install-backendLTLIBRARIES 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-backendLTLIBRARIES \
+- 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-backendLTLIBRARIES 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-backendLTLIBRARIES
+
+ # call as: $(XVFB_START) && someprogram
+
+Index: gtk+2.0-2.15.5/modules/printbackends/lpr/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/printbackends/lpr/Makefile.in 2009-03-02 16:04:22.000000000 -0300
++++ gtk+2.0-2.15.5/modules/printbackends/lpr/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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,56 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(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
++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)$(backenddir)"
++backendLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(backend_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
++ $(top_builddir)/gtk/$(gtktargetlib)
++libprintbackend_lpr_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
++am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo
++libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS)
++libprintbackend_lpr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libprintbackend_lpr_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. at 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 = $(libprintbackend_lpr_la_SOURCES)
++DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES)
++HEADERS = $(noinst_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 +93,17 @@
+ 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,21 +118,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -119,6 +151,7 @@
+ 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@
+@@ -137,8 +170,6 @@
+ 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@
+@@ -149,98 +180,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -251,32 +204,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -287,8 +228,6 @@
+ 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@
+@@ -300,28 +239,10 @@
+ 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@
+@@ -330,22 +251,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -367,8 +291,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -377,9 +301,12 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+
+@@ -410,9 +337,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-
+ @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
+-
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/gtk \
+@@ -423,98 +348,85 @@
+ $(GTK_DEP_CFLAGS) \
+ $(GTK_DEBUG_FLAGS)
+
+-
+ LDADDS = \
+ $(GTK_DEP_LIBS) \
+ $(top_builddir)/gtk/$(gtktargetlib)
+
+-
+ backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+-
+ backend_LTLIBRARIES = libprintbackend-lpr.la
+-
+ libprintbackend_lpr_la_SOURCES = \
+ gtkprintbackendlpr.c
+
+-
+ noinst_HEADERS = \
+ gtkprintbackendlpr.h
+
+-
+ libprintbackend_lpr_la_LDFLAGS = -avoid-version -module $(no_undefined)
+ libprintbackend_lpr_la_LIBADD = $(LDADDS)
+-subdir = modules/printbackends/lpr
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(backend_LTLIBRARIES)
+-
+-libprintbackend_lpr_la_DEPENDENCIES = \
+- $(top_builddir)/gtk/$(gtktargetlib)
+-am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo
+-libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS)
+-
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkprintbackendlpr.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 = $(libprintbackend_lpr_la_SOURCES)
+-HEADERS = $(noinst_HEADERS)
+-
+-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)/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/printbackends/lpr/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/printbackends/lpr/Makefile
+-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-backendLTLIBRARIES_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-backendLTLIBRARIES: $(backend_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
+- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
+ else :; fi; \
+ done
+
+ uninstall-backendLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
+- p="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
+- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
++ p=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
+ done
+
+ clean-backendLTLIBRARIES:
+ -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
+ @list='$(backend_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
+ libprintbackend-lpr.la: $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_DEPENDENCIES)
+- $(LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_LDFLAGS) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS)
++ $(libprintbackend_lpr_la_LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT) core *.core
++ -rm -f *.$(OBJEXT)
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -522,37 +434,25 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprintbackendlpr.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -560,26 +460,15 @@
+ 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)
+@@ -589,23 +478,23 @@
+ 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
+@@ -617,29 +506,23 @@
+
+ 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; \
+@@ -654,9 +537,10 @@
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+-
+ installdirs:
+- $(mkinstalldirs) $(DESTDIR)$(backenddir)
++ for dir in "$(DESTDIR)$(backenddir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -676,7 +560,7 @@
+ 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"
+@@ -690,24 +574,34 @@
+ -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-backendLTLIBRARIES
+
++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
+@@ -728,20 +622,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
++uninstall-am: uninstall-backendLTLIBRARIES
++
++.MAKE: install-am install-strip
+
+ .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 \
+- install-am install-backendLTLIBRARIES 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-backendLTLIBRARIES \
+- 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-backendLTLIBRARIES 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-backendLTLIBRARIES
+
+ # call as: $(XVFB_START) && someprogram
+
+Index: gtk+2.0-2.15.5/modules/printbackends/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/printbackends/Makefile.in 2009-03-02 16:04:21.000000000 -0300
++++ gtk+2.0-2.15.5/modules/printbackends/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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,12 +31,36 @@
+ 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 at am__append_1 = cups
+ @TEST_PRINT_BACKEND_TRUE at am__append_2 = test
++subdir = modules/printbackends
++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
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -53,22 +71,17 @@
+ 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@
+@@ -83,21 +96,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -121,6 +129,7 @@
+ 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 +148,6 @@
+ 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,98 +158,20 @@
+ 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@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBJASPER = @LIBJASPER@
+ LIBJPEG = @LIBJPEG@
+@@ -253,32 +182,20 @@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
+-LIPO = @LIPO@
+ 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@
++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@
+-OTOOL = @OTOOL@
+-OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -289,8 +206,6 @@
+ 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@
+@@ -302,28 +217,10 @@
+ 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@
+@@ -332,22 +229,25 @@
+ 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_DUMPBIN = @ac_ct_DUMPBIN@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++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@
+@@ -369,8 +269,8 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
++mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+@@ -379,9 +279,12 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-
++top_build_prefix = @top_build_prefix@
++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
+
+@@ -412,32 +315,40 @@
+ || { 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
+-subdir = modules/printbackends
+-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
+ 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/printbackends/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu modules/printbackends/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
+@@ -445,10 +356,6 @@
+ 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,
+@@ -456,7 +363,13 @@
+ # (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 \
+@@ -468,15 +381,20 @@
+ 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)' ;; \
+@@ -497,7 +415,7 @@
+ 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 \
+@@ -508,35 +426,30 @@
+ 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; \
+@@ -544,23 +457,23 @@
+ 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
+@@ -572,29 +485,23 @@
+
+ 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; \
+@@ -607,13 +514,17 @@
+ done
+ 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; \
+@@ -624,7 +535,6 @@
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -644,7 +554,7 @@
+ 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"
+@@ -655,25 +565,34 @@
+
+ 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
+@@ -692,26 +611,24 @@
+
+ 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.0-2.15.5/modules/printbackends/test/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/modules/printbackends/test/Makefile.in 2009-03-02 16:04:22.000000000 -0300
++++ gtk+2.0-2.15.5/modules/printbackends/test/Makefile.in 2009-03-03 01:12:42.000000000 -0300
+@@ -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,58 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
++build_triplet = @build@
+ host_triplet = @host@
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(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
++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)$(backenddir)"
++backendLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(backend_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libprintbackend_test_la_DEPENDENCIES = \
++ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1)
++am_libprintbackend_test_la_OBJECTS = \
++ libprintbackend_test_la-gtkprintbackendtest.lo
++libprintbackend_test_la_OBJECTS = \
++ $(am_libprintbackend_test_la_OBJECTS)
++libprintbackend_test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++ $(libprintbackend_test_la_CFLAGS) $(CFLAGS) \
++ $(libprintbackend_test_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. at 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 = $(libprintbackend_test_la_SOURCES)
++DIST_SOURCES = $(libprintbackend_test_la_SOURCES)
++HEADERS = $(noinst_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 +95,17 @@
+ 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,21 +120,16 @@
+ 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@
+-DUMPBIN = @DUMPBIN@
++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@
+-FGREP = @FGREP@
++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@
+@@ -119,6 +153,7 @@
+ 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@
@@ -137,8 +172,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
@@ -101493,65 +104843,64 @@
GTESTER = gtester # in $PATH for non-GLIB packages
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
-@@ -410,9 +339,7 @@
+@@ -410,17 +339,12 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
-
@PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
-
- INCLUDES = \
+ backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+-
+ backend_LTLIBRARIES = libprintbackend-test.la
+-
+ libprintbackend_test_la_SOURCES = \
+ gtkprintbackendtest.c
+
+-
+ libprintbackend_test_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gtk \
-@@ -424,107 +351,90 @@
+@@ -430,98 +354,85 @@
+ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
+ $(AM_CPPFLAGS)
+
+-
+ libprintbackend_test_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \
- $(GTK_DEBUG_FLAGS)
-
--
- LDADDS = \
+ $(AM_CFLAGS)
+
+-
+ libprintbackend_test_la_LDFLAGS = \
+ -avoid-version -module $(no_undefined)
+
+-
+ libprintbackend_test_la_LIBADD = \
$(top_builddir)/gtk/$(gtktargetlib) \
- $(top_builddir)/gdk/$(gdktargetlib) \
$(GTK_DEP_LIBS)
-
- backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
--
- backend_LTLIBRARIES = libprintbackend-cups.la
--
- libprintbackend_cups_la_SOURCES = \
- gtkprintbackendcups.c \
- gtkprintercups.c \
- gtkcupsutils.c
-
--
noinst_HEADERS = \
- gtkprintbackendcups.h \
- gtkprintercups.h \
- gtkcupsutils.h
-
--
- libprintbackend_cups_la_LDFLAGS = -avoid-version -module $(no_undefined)
- libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS)
--subdir = modules/printbackends/cups
+ gtkprintbackendtest.h
+
+-subdir = modules/printbackends/test
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(backend_LTLIBRARIES)
-
--libprintbackend_cups_la_DEPENDENCIES = \
-- $(top_builddir)/gtk/$(gtktargetlib) \
-- $(top_builddir)/gdk/$(gdktargetlib)
--am_libprintbackend_cups_la_OBJECTS = gtkprintbackendcups.lo \
-- gtkprintercups.lo gtkcupsutils.lo
--libprintbackend_cups_la_OBJECTS = $(am_libprintbackend_cups_la_OBJECTS)
+-libprintbackend_test_la_DEPENDENCIES = \
+- $(top_builddir)/gtk/$(gtktargetlib)
+-am_libprintbackend_test_la_OBJECTS = \
+- libprintbackend_test_la-gtkprintbackendtest.lo
+-libprintbackend_test_la_OBJECTS = $(am_libprintbackend_test_la_OBJECTS)
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkcupsutils.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gtkprintbackendcups.Plo \
-- at AMDEP_TRUE@ ./$(DEPDIR)/gtkprintercups.Plo
+- at AMDEP_TRUE@DEP_FILES = \
+- at AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -101559,12 +104908,12 @@
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(libprintbackend_cups_la_SOURCES)
+-DIST_SOURCES = $(libprintbackend_test_la_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.decl Makefile.am
--SOURCES = $(libprintbackend_cups_la_SOURCES)
+-SOURCES = $(libprintbackend_test_la_SOURCES)
-
all: all-am
@@ -101580,9 +104929,9 @@
+ exit 1;; \
+ esac; \
+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/test/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile
+ $(AUTOMAKE) --gnu modules/printbackends/test/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-backendLTLIBRARIES_INSTALL = $(INSTALL)
@@ -101638,9 +104987,9 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
- libprintbackend-cups.la: $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_DEPENDENCIES)
-- $(LINK) -rpath $(backenddir) $(libprintbackend_cups_la_LDFLAGS) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS)
-+ $(libprintbackend_cups_la_LINK) -rpath $(backenddir) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS)
+ libprintbackend-test.la: $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_DEPENDENCIES)
+- $(LINK) -rpath $(backenddir) $(libprintbackend_test_la_LDFLAGS) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS)
++ $(libprintbackend_test_la_LINK) -rpath $(backenddir) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
@@ -101648,8 +104997,8 @@
distclean-compile:
-rm -f *.tab.c
-@@ -534,37 +444,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprintercups.Plo at am__quote@
+@@ -529,70 +440,32 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -101693,12 +105042,49 @@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+-
+-libprintbackend_test_la-gtkprintbackendtest.o: gtkprintbackendtest.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.o -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
+-
+-libprintbackend_test_la-gtkprintbackendtest.obj: gtkprintbackendtest.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi`
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+ libprintbackend_test_la-gtkprintbackendtest.lo: gtkprintbackendtest.c
+- at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \
+- at am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo"; \
+- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \
+- at am__fastdepCC_TRUE@ fi
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPlo' @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
+
mostlyclean-libtool:
-rm -f *.lo
-@@ -572,26 +470,15 @@
+@@ -600,26 +473,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -101728,7 +105114,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -601,23 +488,23 @@
+@@ -629,23 +491,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -101761,7 +105147,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -629,29 +516,23 @@
+@@ -657,29 +519,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -101804,7 +105190,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -666,9 +547,10 @@
+@@ -694,9 +550,10 @@
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -101817,7 +105203,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-@@ -688,7 +570,7 @@
+@@ -716,7 +573,7 @@
clean-generic:
distclean-generic:
@@ -101826,7 +105212,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -702,24 +584,34 @@
+@@ -730,24 +587,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -101862,7 +105248,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -740,20 +632,24 @@
+@@ -768,20 +635,24 @@
ps-am:
@@ -101898,3140 +105284,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/modules/printbackends/file/Makefile.in b/modules/printbackends/file/Makefile.in
---- a/modules/printbackends/file/Makefile.in 2009-03-02 16:04:22.000000000 -0300
-+++ b/modules/printbackends/file/Makefile.in 2009-03-02 19:33:06.000000000 -0300
-@@ -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 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(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
-+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)$(backenddir)"
-+backendLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(backend_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libprintbackend_file_la_DEPENDENCIES = \
-+ $(top_builddir)/gtk/$(gtktargetlib) \
-+ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1)
-+am_libprintbackend_file_la_OBJECTS = \
-+ libprintbackend_file_la-gtkprintbackendfile.lo
-+libprintbackend_file_la_OBJECTS = \
-+ $(am_libprintbackend_file_la_OBJECTS)
-+libprintbackend_file_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+ $(libprintbackend_file_la_CFLAGS) $(CFLAGS) \
-+ $(libprintbackend_file_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at 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 = $(libprintbackend_file_la_SOURCES)
-+DIST_SOURCES = $(libprintbackend_file_la_SOURCES)
-+HEADERS = $(noinst_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 +96,17 @@
- 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,21 +121,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -137,8 +172,6 @@
- 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@
-@@ -149,98 +182,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -251,32 +206,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +230,6 @@
- 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@
-@@ -300,28 +241,10 @@
- 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@
-@@ -330,22 +253,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -367,8 +293,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -377,9 +303,12 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
-
-@@ -410,17 +339,12 @@
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- && DISPLAY=:$$XID && export DISPLAY
-
--
- @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
--
- backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
--
- backend_LTLIBRARIES = libprintbackend-file.la
--
- libprintbackend_file_la_SOURCES = \
- gtkprintbackendfile.c
-
--
- libprintbackend_file_la_CPPFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/gtk \
-@@ -430,100 +354,86 @@
- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
- $(AM_CPPFLAGS)
-
--
- libprintbackend_file_la_CFLAGS = \
- $(GTK_DEP_CFLAGS) \
- $(AM_CFLAGS)
-
--
- libprintbackend_file_la_LDFLAGS = \
- -avoid-version -module $(no_undefined)
-
--
- libprintbackend_file_la_LIBADD = \
- $(top_builddir)/gtk/$(gtktargetlib) \
- $(top_builddir)/gdk/$(gdktargetlib) \
- $(GTK_DEP_LIBS)
-
--
- noinst_HEADERS = \
- gtkprintbackendfile.h
-
--subdir = modules/printbackends/file
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(backend_LTLIBRARIES)
--
--libprintbackend_file_la_DEPENDENCIES = \
-- $(top_builddir)/gtk/$(gtktargetlib) \
-- $(top_builddir)/gdk/$(gdktargetlib)
--am_libprintbackend_file_la_OBJECTS = \
-- libprintbackend_file_la-gtkprintbackendfile.lo
--libprintbackend_file_la_OBJECTS = $(am_libprintbackend_file_la_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = \
-- at AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.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 = $(libprintbackend_file_la_SOURCES)
--HEADERS = $(noinst_HEADERS)
--
--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)/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/printbackends/file/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu modules/printbackends/file/Makefile
--Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--backendLTLIBRARIES_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-backendLTLIBRARIES: $(backend_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(backenddir)
-+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
- @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
-- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-backendLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
- done
-
- clean-backendLTLIBRARIES:
- -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
- @list='$(backend_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
- libprintbackend-file.la: $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_DEPENDENCIES)
-- $(LINK) -rpath $(backenddir) $(libprintbackend_file_la_LDFLAGS) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS)
-+ $(libprintbackend_file_la_LINK) -rpath $(backenddir) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -531,70 +441,32 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
--
--libprintbackend_file_la-gtkprintbackendfile.o: gtkprintbackendfile.c
-- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.o -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
--
--libprintbackend_file_la-gtkprintbackendfile.obj: gtkprintbackendfile.c
-- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- libprintbackend_file_la-gtkprintbackendfile.lo: gtkprintbackendfile.c
-- at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -602,26 +474,15 @@
- 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)
-@@ -631,23 +492,23 @@
- 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
-@@ -659,29 +520,23 @@
-
- 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; \
-@@ -696,9 +551,10 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(backenddir)
-+ for dir in "$(DESTDIR)$(backenddir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -718,7 +574,7 @@
- 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"
-@@ -732,24 +588,34 @@
- -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-backendLTLIBRARIES
-
-+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
-@@ -770,20 +636,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
-+uninstall-am: uninstall-backendLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-
- .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 \
-- install-am install-backendLTLIBRARIES 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-backendLTLIBRARIES \
-- 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-backendLTLIBRARIES 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-backendLTLIBRARIES
-
- # call as: $(XVFB_START) && someprogram
-
-diff -urN a/modules/printbackends/lpr/Makefile.in b/modules/printbackends/lpr/Makefile.in
---- a/modules/printbackends/lpr/Makefile.in 2009-03-02 16:04:22.000000000 -0300
-+++ b/modules/printbackends/lpr/Makefile.in 2009-03-02 19:33:06.000000000 -0300
-@@ -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,56 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(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
-+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)$(backenddir)"
-+backendLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(backend_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/gtk/$(gtktargetlib)
-+libprintbackend_lpr_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
-+am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo
-+libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS)
-+libprintbackend_lpr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(libprintbackend_lpr_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at 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 = $(libprintbackend_lpr_la_SOURCES)
-+DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES)
-+HEADERS = $(noinst_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 +93,17 @@
- 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,21 +118,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -137,8 +169,6 @@
- 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@
-@@ -149,98 +179,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -251,32 +203,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +227,6 @@
- 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@
-@@ -300,28 +238,10 @@
- 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@
-@@ -330,22 +250,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -367,8 +290,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -377,9 +300,12 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
-
-@@ -410,9 +336,7 @@
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- && DISPLAY=:$$XID && export DISPLAY
-
--
- @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
--
- INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/gtk \
-@@ -423,98 +347,85 @@
- $(GTK_DEP_CFLAGS) \
- $(GTK_DEBUG_FLAGS)
-
--
- LDADDS = \
- $(GTK_DEP_LIBS) \
- $(top_builddir)/gtk/$(gtktargetlib)
-
--
- backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
--
- backend_LTLIBRARIES = libprintbackend-lpr.la
--
- libprintbackend_lpr_la_SOURCES = \
- gtkprintbackendlpr.c
-
--
- noinst_HEADERS = \
- gtkprintbackendlpr.h
-
--
- libprintbackend_lpr_la_LDFLAGS = -avoid-version -module $(no_undefined)
- libprintbackend_lpr_la_LIBADD = $(LDADDS)
--subdir = modules/printbackends/lpr
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(backend_LTLIBRARIES)
--
--libprintbackend_lpr_la_DEPENDENCIES = \
-- $(top_builddir)/gtk/$(gtktargetlib)
--am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo
--libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkprintbackendlpr.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 = $(libprintbackend_lpr_la_SOURCES)
--HEADERS = $(noinst_HEADERS)
--
--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)/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/printbackends/lpr/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu modules/printbackends/lpr/Makefile
--Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--backendLTLIBRARIES_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-backendLTLIBRARIES: $(backend_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(backenddir)
-+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
- @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
-- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-backendLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
- done
-
- clean-backendLTLIBRARIES:
- -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
- @list='$(backend_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
- libprintbackend-lpr.la: $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_DEPENDENCIES)
-- $(LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_LDFLAGS) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS)
-+ $(libprintbackend_lpr_la_LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -522,37 +433,25 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtkprintbackendlpr.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -560,26 +459,15 @@
- 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)
-@@ -589,23 +477,23 @@
- 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
-@@ -617,29 +505,23 @@
-
- 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; \
-@@ -654,9 +536,10 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(backenddir)
-+ for dir in "$(DESTDIR)$(backenddir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -676,7 +559,7 @@
- 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"
-@@ -690,24 +573,34 @@
- -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-backendLTLIBRARIES
-
-+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
-@@ -728,20 +621,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
-+uninstall-am: uninstall-backendLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-
- .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 \
-- install-am install-backendLTLIBRARIES 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-backendLTLIBRARIES \
-- 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-backendLTLIBRARIES 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-backendLTLIBRARIES
-
- # call as: $(XVFB_START) && someprogram
-
-diff -urN a/modules/printbackends/Makefile.in b/modules/printbackends/Makefile.in
---- a/modules/printbackends/Makefile.in 2009-03-02 16:04:21.000000000 -0300
-+++ b/modules/printbackends/Makefile.in 2009-03-02 19:33:05.000000000 -0300
-@@ -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,12 +31,36 @@
- 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 at am__append_1 = cups
- @TEST_PRINT_BACKEND_TRUE at am__append_2 = test
-+subdir = modules/printbackends
-+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
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AS = @AS@
-@@ -53,22 +71,17 @@
- 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@
-@@ -83,21 +96,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -139,8 +147,6 @@
- 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,98 +157,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -253,32 +181,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -289,8 +205,6 @@
- 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@
-@@ -302,28 +216,10 @@
- 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@
-@@ -332,22 +228,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -369,8 +268,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -379,9 +278,12 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
-
-@@ -412,32 +314,40 @@
- || { 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
--subdir = modules/printbackends
--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
- 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/printbackends/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu modules/printbackends/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
-@@ -445,10 +355,6 @@
- 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,
-@@ -456,7 +362,13 @@
- # (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 \
-@@ -468,15 +380,20 @@
- 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)' ;; \
-@@ -497,7 +414,7 @@
- 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 \
-@@ -508,35 +425,30 @@
- 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; \
-@@ -544,23 +456,23 @@
- 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
-@@ -572,29 +484,23 @@
-
- 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; \
-@@ -607,13 +513,17 @@
- done
- 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; \
-@@ -624,7 +534,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -644,7 +553,7 @@
- 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"
-@@ -655,25 +564,34 @@
-
- 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
-@@ -692,26 +610,24 @@
-
- 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
-
-diff -urN a/modules/printbackends/test/Makefile.in b/modules/printbackends/test/Makefile.in
---- a/modules/printbackends/test/Makefile.in 2009-03-02 16:04:22.000000000 -0300
-+++ b/modules/printbackends/test/Makefile.in 2009-03-02 19:33:06.000000000 -0300
-@@ -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,58 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_triplet = @build@
- host_triplet = @host@
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(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
-+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)$(backenddir)"
-+backendLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(backend_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libprintbackend_test_la_DEPENDENCIES = \
-+ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1)
-+am_libprintbackend_test_la_OBJECTS = \
-+ libprintbackend_test_la-gtkprintbackendtest.lo
-+libprintbackend_test_la_OBJECTS = \
-+ $(am_libprintbackend_test_la_OBJECTS)
-+libprintbackend_test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+ $(libprintbackend_test_la_CFLAGS) $(CFLAGS) \
-+ $(libprintbackend_test_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at 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 = $(libprintbackend_test_la_SOURCES)
-+DIST_SOURCES = $(libprintbackend_test_la_SOURCES)
-+HEADERS = $(noinst_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 +95,17 @@
- 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,21 +120,16 @@
- 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@
--DUMPBIN = @DUMPBIN@
-+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@
--FGREP = @FGREP@
-+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@
-@@ -137,8 +171,6 @@
- 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@
-@@ -149,98 +181,20 @@
- 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@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBJASPER = @LIBJASPER@
- LIBJPEG = @LIBJPEG@
-@@ -251,32 +205,20 @@
- LIBTOOL = @LIBTOOL@
- LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
- LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
--LIPO = @LIPO@
- 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@
-+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@
--OTOOL = @OTOOL@
--OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +229,6 @@
- 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@
-@@ -300,28 +240,10 @@
- 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@
-@@ -330,22 +252,25 @@
- 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_DUMPBIN = @ac_ct_DUMPBIN@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+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@
-@@ -367,8 +292,8 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
-@@ -377,9 +302,12 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--
-+top_build_prefix = @top_build_prefix@
-+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
-
-@@ -410,17 +338,12 @@
- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- && DISPLAY=:$$XID && export DISPLAY
-
--
- @PLATFORM_WIN32_TRUE at no_undefined = -no-undefined
--
- backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
--
- backend_LTLIBRARIES = libprintbackend-test.la
--
- libprintbackend_test_la_SOURCES = \
- gtkprintbackendtest.c
-
--
- libprintbackend_test_la_CPPFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/gtk \
-@@ -430,98 +353,85 @@
- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
- $(AM_CPPFLAGS)
-
--
- libprintbackend_test_la_CFLAGS = \
- $(GTK_DEP_CFLAGS) \
- $(AM_CFLAGS)
-
--
- libprintbackend_test_la_LDFLAGS = \
- -avoid-version -module $(no_undefined)
-
--
- libprintbackend_test_la_LIBADD = \
- $(top_builddir)/gtk/$(gtktargetlib) \
- $(GTK_DEP_LIBS)
-
--
- noinst_HEADERS = \
- gtkprintbackendtest.h
-
--subdir = modules/printbackends/test
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--LTLIBRARIES = $(backend_LTLIBRARIES)
--
--libprintbackend_test_la_DEPENDENCIES = \
-- $(top_builddir)/gtk/$(gtktargetlib)
--am_libprintbackend_test_la_OBJECTS = \
-- libprintbackend_test_la-gtkprintbackendtest.lo
--libprintbackend_test_la_OBJECTS = $(am_libprintbackend_test_la_OBJECTS)
--
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
-- at AMDEP_TRUE@DEP_FILES = \
-- at AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.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 = $(libprintbackend_test_la_SOURCES)
--HEADERS = $(noinst_HEADERS)
--
--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)/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/printbackends/test/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu modules/printbackends/test/Makefile
--Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
--backendLTLIBRARIES_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-backendLTLIBRARIES: $(backend_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(backenddir)
-+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)"
- @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \
-- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \
- else :; fi; \
- done
-
- uninstall-backendLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(backend_LTLIBRARIES)'; for p in $$list; do \
-- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \
-- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \
- done
-
- clean-backendLTLIBRARIES:
- -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES)
- @list='$(backend_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
- libprintbackend-test.la: $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_DEPENDENCIES)
-- $(LINK) -rpath $(backenddir) $(libprintbackend_test_la_LDFLAGS) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS)
-+ $(libprintbackend_test_la_LINK) -rpath $(backenddir) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
-- -rm -f *.$(OBJEXT) core *.core
-+ -rm -f *.$(OBJEXT)
-
- distclean-compile:
- -rm -f *.tab.c
-@@ -529,70 +439,32 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
--
--libprintbackend_test_la-gtkprintbackendtest.o: gtkprintbackendtest.c
-- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.o -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
--
--libprintbackend_test_la-gtkprintbackendtest.obj: gtkprintbackendtest.c
-- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi`
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
- libprintbackend_test_la-gtkprintbackendtest.lo: gtkprintbackendtest.c
-- at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \
-- at am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo"; \
-- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \
-- at am__fastdepCC_TRUE@ fi
-+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPlo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -600,26 +472,15 @@
- 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)
-@@ -629,23 +490,23 @@
- 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
-@@ -657,29 +518,23 @@
-
- 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; \
-@@ -694,9 +549,10 @@
- $(MAKE) $(AM_MAKEFLAGS) check-local
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
--
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(backenddir)
-+ for dir in "$(DESTDIR)$(backenddir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -716,7 +572,7 @@
- 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"
-@@ -730,24 +586,34 @@
- -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-backendLTLIBRARIES
-
-+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
-@@ -768,20 +634,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am
-+uninstall-am: uninstall-backendLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-
- .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 \
-- install-am install-backendLTLIBRARIES 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-backendLTLIBRARIES \
-- 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-backendLTLIBRARIES 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-backendLTLIBRARIES
-
- # call as: $(XVFB_START) && someprogram
-
-diff -urN a/perf/Makefile.in b/perf/Makefile.in
---- a/perf/Makefile.in 2009-03-02 16:04:22.000000000 -0300
-+++ b/perf/Makefile.in 2009-03-02 19:33:06.000000000 -0300
+Index: gtk+2.0-2.15.5/perf/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/perf/Makefile.in 2009-03-02 16:04:22.000000000 -0300
++++ gtk+2.0-2.15.5/perf/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -105156,7 +105412,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -137,8 +155,6 @@
+@@ -119,6 +137,7 @@
+ 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@
+@@ -137,8 +156,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -105165,7 +105429,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -149,98 +165,20 @@
+@@ -149,98 +166,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -105265,7 +105529,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -251,32 +189,20 @@
+@@ -251,32 +190,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -105299,7 +105563,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -287,8 +213,6 @@
+@@ -287,8 +214,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -105308,7 +105572,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -300,28 +224,10 @@
+@@ -300,28 +225,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -105337,7 +105601,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -330,22 +236,25 @@
+@@ -330,22 +237,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -105368,7 +105632,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -367,8 +276,8 @@
+@@ -367,8 +277,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -105378,7 +105642,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -377,20 +286,18 @@
+@@ -377,20 +287,18 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -105405,7 +105669,7 @@
TEST_PROGS =
### testing rules
-@@ -416,7 +323,6 @@
+@@ -416,7 +324,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -105413,7 +105677,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -426,27 +332,18 @@
+@@ -426,27 +333,18 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -105441,7 +105705,7 @@
testperf_SOURCES = \
appwindow.c \
gtkwidgetprofiler.c \
-@@ -460,68 +357,54 @@
+@@ -460,68 +358,54 @@
typebuiltins.h \
widgets.h
@@ -105537,7 +105801,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -531,10 +414,10 @@
+@@ -531,10 +415,10 @@
done
testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES)
@rm -f testperf$(EXEEXT)
@@ -105550,7 +105814,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -548,37 +431,25 @@
+@@ -548,37 +432,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/typebuiltins.Po at am__quote@
.c.o:
@@ -105600,7 +105864,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -586,26 +457,15 @@
+@@ -586,26 +458,15 @@
clean-libtool:
-rm -rf .libs _libs
@@ -105630,7 +105894,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -615,23 +475,23 @@
+@@ -615,23 +476,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -105663,7 +105927,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -643,29 +503,23 @@
+@@ -643,29 +504,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -105706,7 +105970,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -681,7 +535,6 @@
+@@ -681,7 +536,6 @@
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS)
@@ -105714,7 +105978,7 @@
installdirs:
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -703,13 +556,13 @@
+@@ -703,13 +557,13 @@
clean-generic:
distclean-generic:
@@ -105730,7 +105994,7 @@
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-@@ -719,24 +572,34 @@
+@@ -719,24 +573,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -105766,7 +106030,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -757,18 +620,23 @@
+@@ -757,18 +621,23 @@
ps-am:
@@ -105799,9 +106063,10 @@
# call as: $(XVFB_START) && someprogram
-diff -urN a/tests/Makefile.in b/tests/Makefile.in
---- a/tests/Makefile.in 2009-03-02 16:04:22.000000000 -0300
-+++ b/tests/Makefile.in 2009-03-02 19:33:07.000000000 -0300
+Index: gtk+2.0-2.15.5/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.15.5.orig/tests/Makefile.in 2009-03-02 16:04:22.000000000 -0300
++++ gtk+2.0-2.15.5/tests/Makefile.in 2009-03-03 01:12:42.000000000 -0300
@@ -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.
@@ -106168,7 +106433,15 @@
GAIL_INET_LIBS = @GAIL_INET_LIBS@
GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@
GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@
-@@ -139,8 +397,6 @@
+@@ -121,6 +379,7 @@
+ 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 +398,6 @@
GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@
GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@
GTK_DEP_LIBS = @GTK_DEP_LIBS@
@@ -106177,7 +106450,7 @@
GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@
GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@
GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@
-@@ -151,98 +407,20 @@
+@@ -151,98 +408,20 @@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_VERSION = @GTK_VERSION@
GTK_XIM_FLAGS = @GTK_XIM_FLAGS@
@@ -106277,7 +106550,7 @@
LDFLAGS = @LDFLAGS@
LIBJASPER = @LIBJASPER@
LIBJPEG = @LIBJPEG@
-@@ -253,32 +431,20 @@
+@@ -253,32 +432,20 @@
LIBTOOL = @LIBTOOL@
LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
@@ -106311,7 +106584,7 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -289,8 +455,6 @@
+@@ -289,8 +456,6 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
@@ -106320,7 +106593,7 @@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-@@ -302,28 +466,10 @@
+@@ -302,28 +467,10 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -106349,7 +106622,7 @@
XMKMF = @XMKMF@
XMLCATALOG = @XMLCATALOG@
XML_CATALOG_FILE = @XML_CATALOG_FILE@
-@@ -332,22 +478,25 @@
+@@ -332,22 +479,25 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -106380,7 +106653,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -369,8 +518,8 @@
+@@ -369,8 +519,8 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
@@ -106390,7 +106663,7 @@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
-@@ -379,37 +528,22 @@
+@@ -379,37 +529,22 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -106437,7 +106710,7 @@
TEST_PROGS =
### testing rules
-@@ -435,7 +569,6 @@
+@@ -435,7 +570,6 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
@@ -106445,7 +106718,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-@@ -445,92 +578,21 @@
+@@ -445,92 +579,21 @@
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
@@ -106540,7 +106813,7 @@
simple_DEPENDENCIES = $(TEST_DEPS)
print_editor_DEPENDENCIES = $(TEST_DEPS)
testicontheme_DEPENDENCIES = $(TEST_DEPS)
-@@ -588,7 +650,6 @@
+@@ -588,7 +651,6 @@
testgrouping_DEPENDENCIES = $(TEST_DEPS)
testtooltips_DEPENDENCIES = $(TEST_DEPS)
testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
@@ -106548,7 +106821,7 @@
simple_LDADD = $(LDADDS)
print_editor_LDADD = $(LDADDS)
testaccel_LDADD = $(LDADDS)
-@@ -653,732 +714,129 @@
+@@ -653,732 +715,129 @@
testgrouping_LDADD = $(LDADDS)
testtooltips_LDADD = $(LDADDS)
testvolumebutton_LDADD = $(LDADDS)
@@ -107308,7 +107581,7 @@
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -1388,202 +846,202 @@
+@@ -1388,202 +847,202 @@
done
autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES)
@rm -f autotestkeywords$(EXEEXT)
@@ -107577,7 +107850,7 @@
distclean-compile:
-rm -f *.tab.c
-@@ -1658,130 +1116,76 @@
+@@ -1658,130 +1117,76 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/treestoretest.Po at am__quote@
.c.o:
@@ -107741,7 +108014,7 @@
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
-@@ -1791,23 +1195,23 @@
+@@ -1791,23 +1196,23 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -107774,7 +108047,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -1821,9 +1225,9 @@
+@@ -1821,9 +1226,9 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -107786,7 +108059,7 @@
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
-@@ -1832,25 +1236,25 @@
+@@ -1832,25 +1237,25 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -107822,7 +108095,7 @@
;; \
esac; \
else \
-@@ -1875,46 +1279,40 @@
+@@ -1875,46 +1280,40 @@
skipped=""; \
if test "$$skip" -ne 0; then \
skipped="($$skip tests were not run)"; \
@@ -107886,7 +108159,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -1929,7 +1327,6 @@
+@@ -1929,7 +1328,6 @@
$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
check: check-am
all-am: Makefile $(PROGRAMS)
@@ -107894,7 +108167,7 @@
installdirs:
install: install-am
install-exec: install-exec-am
-@@ -1950,7 +1347,7 @@
+@@ -1950,7 +1348,7 @@
clean-generic:
distclean-generic:
@@ -107903,7 +108176,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
-@@ -1964,24 +1361,34 @@
+@@ -1964,24 +1362,34 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -107939,7 +108212,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -2002,18 +1409,23 @@
+@@ -2002,18 +1410,23 @@
ps-am:
More information about the pkg-gnome-commits
mailing list